refactor: replace magic indices with RtorrentField enum for type-safe parsing

Cargo.lock

@@ -310,6 +310,7 @@ dependencies = [
  "serde_json",
  "shared",
  "sqlx",
+ "strum",
  "thiserror 2.0.18",
  "time",
  "tokio",
@@ -544,7 +545,7 @@ version = "4.5.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.114",
@@ -1536,6 +1537,12 @@ dependencies = [
  "hashbrown 0.15.5",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -3703,7 +3710,7 @@ checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
 dependencies = [
  "dotenvy",
  "either",
- "heck",
+ "heck 0.5.0",
  "hex",
  "once_cell",
  "proc-macro2",
@@ -3846,6 +3853,28 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
+[[package]]
+name = "strum"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.114",
+]
+
 [[package]]
 name = "subtle"
 version = "2.6.1"

backend/Cargo.toml

@@ -42,3 +42,4 @@ anyhow = "1.0.101"
 time = { version = "0.3.47", features = ["serde", "formatting", "parsing"] }
 tower_governor = "0.8.0"
 governor = "0.10.4"
+strum = { version = "0.25", features = ["derive", "strum_macros"] }

backend/src/handlers/mod.rs

@@ -11,12 +11,10 @@ use axum::{
     BoxError,
 };
 use rust_embed::RustEmbed;
-use serde::Deserialize;
 use shared::{
-    GlobalLimitRequest, SetFilePriorityRequest, SetLabelRequest, TorrentActionRequest, TorrentFile,
+    AddTorrentRequest, GlobalLimitRequest, SetFilePriorityRequest, SetLabelRequest, TorrentActionRequest,
-    TorrentPeer, TorrentTracker,
+    TorrentFile,     TorrentPeer, TorrentTracker,
 };
-use utoipa::ToSchema;
 
 pub mod auth;
 pub mod setup;
@@ -25,13 +23,6 @@ pub mod setup;
 #[folder = "../frontend/dist"]
 pub struct Asset;
 
-#[derive(Deserialize, ToSchema)]
-pub struct AddTorrentRequest {
-    /// Magnet link or Torrent file URL
-    #[schema(example = "magnet:?xt=urn:btih:...")]
-    uri: String,
-}
-
 pub async fn static_handler(uri: Uri) -> impl IntoResponse {
     let mut path = uri.path().trim_start_matches('/').to_string();
 

backend/src/main.rs

@@ -125,7 +125,7 @@ struct Args {
     ),
     components(
         schemas(
-            handlers::AddTorrentRequest,
+            shared::AddTorrentRequest,
             shared::TorrentActionRequest,
             shared::Torrent,
             shared::TorrentStatus,
@@ -172,7 +172,7 @@ struct ApiDoc;
     ),
     components(
         schemas(
-            handlers::AddTorrentRequest,
+            shared::AddTorrentRequest,
             shared::TorrentActionRequest,
             shared::Torrent,
             shared::TorrentStatus,

backend/src/sse.rs

@@ -7,95 +7,80 @@ use axum::response::sse::{Event, Sse};
 use futures::stream::{self, Stream};
 use shared::{AppEvent, GlobalStats, Torrent, TorrentStatus};
 use std::convert::Infallible;
+use strum::{Display, EnumString};
 use tokio_stream::StreamExt;
 
-// Field definitions to keep query and parser in sync
+#[derive(Debug, Clone, Copy, EnumString, Display, PartialEq)]
-mod fields {
+enum RtorrentField {
-    pub const IDX_HASH: usize = 0;
+    #[strum(serialize = "d.hash=")]
-    pub const CMD_HASH: &str = "d.hash=";
+    Hash,
-
+    #[strum(serialize = "d.name=")]
-    pub const IDX_NAME: usize = 1;
+    Name,
-    pub const CMD_NAME: &str = "d.name=";
+    #[strum(serialize = "d.size_bytes=")]
-
+    Size,
-    pub const IDX_SIZE: usize = 2;
+    #[strum(serialize = "d.bytes_done=")]
-    pub const CMD_SIZE: &str = "d.size_bytes=";
+    Completed,
-
+    #[strum(serialize = "d.down.rate=")]
-    pub const IDX_COMPLETED: usize = 3;
+    DownRate,
-    pub const CMD_COMPLETED: &str = "d.bytes_done=";
+    #[strum(serialize = "d.up.rate=")]
-
+    UpRate,
-    pub const IDX_DOWN_RATE: usize = 4;
+    #[strum(serialize = "d.state=")]
-    pub const CMD_DOWN_RATE: &str = "d.down.rate=";
+    State,
-
+    #[strum(serialize = "d.complete=")]
-    pub const IDX_UP_RATE: usize = 5;
+    Complete,
-    pub const CMD_UP_RATE: &str = "d.up.rate=";
+    #[strum(serialize = "d.message=")]
-
+    Message,
-    pub const IDX_STATE: usize = 6;
+    #[strum(serialize = "d.left_bytes=")]
-    pub const CMD_STATE: &str = "d.state=";
+    LeftBytes,
-
+    #[strum(serialize = "d.creation_date=")]
-    pub const IDX_COMPLETE: usize = 7;
+    CreationDate,
-    pub const CMD_COMPLETE: &str = "d.complete=";
+    #[strum(serialize = "d.hashing=")]
-
+    Hashing,
-    pub const IDX_MESSAGE: usize = 8;
+    #[strum(serialize = "d.custom1=")]
-    pub const CMD_MESSAGE: &str = "d.message=";
+    Label,
-
-    pub const IDX_LEFT_BYTES: usize = 9;
-    pub const CMD_LEFT_BYTES: &str = "d.left_bytes=";
-
-    pub const IDX_CREATION_DATE: usize = 10;
-    pub const CMD_CREATION_DATE: &str = "d.creation_date=";
-
-    pub const IDX_HASHING: usize = 11;
-    pub const CMD_HASHING: &str = "d.hashing=";
-
-    pub const IDX_LABEL: usize = 12;
-    pub const CMD_LABEL: &str = "d.custom1=";
 }
 
-use fields::*;
+const RTORRENT_FIELDS: &[RtorrentField] = &[
-
+    RtorrentField::Hash,
-// Constants for rTorrent fields to ensure query and parser stay in sync
+    RtorrentField::Name,
-const RTORRENT_FIELDS: &[&str] = &[
+    RtorrentField::Size,
-    "",     // Ignored by multicall pattern
+    RtorrentField::Completed,
-    "main", // View
+    RtorrentField::DownRate,
-    CMD_HASH,
+    RtorrentField::UpRate,
-    CMD_NAME,
+    RtorrentField::State,
-    CMD_SIZE,
+    RtorrentField::Complete,
-    CMD_COMPLETED,
+    RtorrentField::Message,
-    CMD_DOWN_RATE,
+    RtorrentField::LeftBytes,
-    CMD_UP_RATE,
+    RtorrentField::CreationDate,
-    CMD_STATE,
+    RtorrentField::Hashing,
-    CMD_COMPLETE,
+    RtorrentField::Label,
-    CMD_MESSAGE,
-    CMD_LEFT_BYTES,
-    CMD_CREATION_DATE,
-    CMD_HASHING,
-    CMD_LABEL,
 ];
 
-fn parse_long(s: Option<&String>) -> i64 {
+fn get_field_value(row: &Vec<String>, field: RtorrentField) -> String {
-    s.map(|v| v.parse().unwrap_or(0)).unwrap_or(0)
+    let idx = RTORRENT_FIELDS.iter().position(|&f| f == field).unwrap_or(0);
+    row.get(idx).cloned().unwrap_or_default()
 }
 
-fn parse_string(s: Option<&String>) -> String {
+fn parse_long(s: &str) -> i64 {
-    s.cloned().unwrap_or_default()
+    s.parse().unwrap_or(0)
 }
 
 /// Converts a raw row of strings from rTorrent XML-RPC into a generic Torrent struct
-fn from_rtorrent_row(row: Vec<String>) -> Torrent {
+fn from_rtorrent_row(row: &Vec<String>) -> Torrent {
-    let hash = parse_string(row.get(IDX_HASH));
+    let hash = get_field_value(row, RtorrentField::Hash);
-    let name = parse_string(row.get(IDX_NAME));
+    let name = get_field_value(row, RtorrentField::Name);
-    let size = parse_long(row.get(IDX_SIZE));
+    let size = parse_long(&get_field_value(row, RtorrentField::Size));
-    let completed = parse_long(row.get(IDX_COMPLETED));
+    let completed = parse_long(&get_field_value(row, RtorrentField::Completed));
-    let down_rate = parse_long(row.get(IDX_DOWN_RATE));
+    let down_rate = parse_long(&get_field_value(row, RtorrentField::DownRate));
-    let up_rate = parse_long(row.get(IDX_UP_RATE));
+    let up_rate = parse_long(&get_field_value(row, RtorrentField::UpRate));
 
-    let state = parse_long(row.get(IDX_STATE));
+    let state = parse_long(&get_field_value(row, RtorrentField::State));
-    let is_complete = parse_long(row.get(IDX_COMPLETE));
+    let is_complete = parse_long(&get_field_value(row, RtorrentField::Complete));
-    let message = parse_string(row.get(IDX_MESSAGE));
+    let message = get_field_value(row, RtorrentField::Message);
-    let left_bytes = parse_long(row.get(IDX_LEFT_BYTES));
+    let left_bytes = parse_long(&get_field_value(row, RtorrentField::LeftBytes));
-    let added_date = parse_long(row.get(IDX_CREATION_DATE));
+    let added_date = parse_long(&get_field_value(row, RtorrentField::CreationDate));
-    let is_hashing = parse_long(row.get(IDX_HASHING));
+    let is_hashing = parse_long(&get_field_value(row, RtorrentField::Hashing));
-    let label_raw = parse_string(row.get(IDX_LABEL));
+    let label_raw = get_field_value(row, RtorrentField::Label);
 
     let label = if label_raw.is_empty() {
         None
@@ -146,7 +131,10 @@ fn from_rtorrent_row(row: Vec<String>) -> Torrent {
 }
 
 pub async fn fetch_torrents(client: &RtorrentClient) -> Result<Vec<Torrent>, XmlRpcError> {
-    let params: Vec<RpcParam> = RTORRENT_FIELDS.iter().map(|s| RpcParam::from(*s)).collect();
+    let params: Vec<RpcParam> = RTORRENT_FIELDS
+        .iter()
+        .map(|&f| RpcParam::from(f.to_string()))
+        .collect();
     let xml = client.call("d.multicall2", &params).await?;
 
     if xml.trim().is_empty() {
@@ -155,7 +143,7 @@ pub async fn fetch_torrents(client: &RtorrentClient) -> Result<Vec<Torrent>, Xml
 
     let rows = parse_multicall_response(&xml)?;
 
-    let torrents = rows.into_iter().map(from_rtorrent_row).collect();
+    let torrents = rows.iter().map(from_rtorrent_row).collect();
 
     Ok(torrents)
 }

frontend/src/components/torrent/add_torrent.rs

@@ -1,7 +1,7 @@
 use leptos::*;
 use leptos::html::Dialog;
 use crate::store::{show_toast_with_signal, TorrentStore};
-use shared::NotificationLevel;
+use shared::{AddTorrentRequest, NotificationLevel};
 
 
 #[component]
@@ -36,9 +36,7 @@ pub fn AddTorrentModal(
         set_error_msg.set(None);
 
         spawn_local(async move {
-            let req_body = serde_json::json!({
+            let req_body = AddTorrentRequest { uri: uri_val };
-                "uri": uri_val
-            });
 
             match gloo_net::http::Request::post("/api/torrents/add")
                 .json(&req_body)

shared/src/lib.rs

@@ -130,3 +130,9 @@ pub struct SetLabelRequest {
     pub hash: String,
     pub label: String,
 }
+
+#[derive(Debug, Serialize, Deserialize, Clone, ToSchema)]
+pub struct AddTorrentRequest {
+    #[schema(example = "magnet:?xt=urn:btih:...")]
+    pub uri: String,
+}