Skip to content

refactor: Improve MagnetUri field types for spec compliance #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artrixdotdev merged 2 commits into from
Oct 26, 2025
Merged

refactor: Improve MagnetUri field types for spec compliance #171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2c8b33
refactor: Improve `MagnetUri` field types for spec compliance
artrixdotdev Oct 26, 2025
89453f8
test: Add test coverage for multi-valued magnet parameters
artrixdotdev Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions crates/libtortillas/src/metainfo/magnet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ pub struct MagnetUri {
pub name: String,

#[serde(rename = "xl")]
pub length: Option<u32>,
pub length: Option<usize>,

#[serde(rename = "tr")]
pub announce_list: Option<Vec<Tracker>>,

#[serde(rename = "ws", default)]
pub web_seed: Vec<String>,

#[serde(rename = "as")]
pub source: Option<String>,
#[serde(rename = "as", default)]
pub source: Vec<String>,

#[serde(rename = "xs")]
pub exact_source: Option<String>,
#[serde(rename = "xs", default)]
pub exact_source: Vec<String>,

#[serde(rename = "kt")]
pub keywords: Option<Vec<String>>,
Expand All @@ -42,8 +42,8 @@ pub struct MagnetUri {
#[serde(rename = "so")]
pub select_only: Option<Vec<String>>,

#[serde(rename = "x.pe")]
pub peer: Option<String>,
#[serde(rename = "x.pe", default)]
pub peer: Vec<String>,

#[serde(skip)]
uri: String,
Expand Down Expand Up @@ -127,4 +127,15 @@ mod tests {
_ => panic!("Expected Torrent"),
}
}

#[tokio::test]
#[traced_test]
async fn test_parse_magnet_uri_multi_valued_params() {
let uri = "magnet:?xt=urn:btih:xyz&as=seed1&as=seed2&xs=exact1&xs=exact2&x.pe=peer1&x.pe=peer2&dn=name";
let magnet = MagnetUri::try_from(uri.to_string()).unwrap();

assert_eq!(magnet.source.len(), 2);
assert_eq!(magnet.exact_source.len(), 2);
assert_eq!(magnet.peer.len(), 2);
}
}