kristoferssolo/transmission-rpc
1
0
Fork 0
mirror of https://github.com/kristoferssolo/transmission-rpc.git synced 2025-10-21 20:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle adding duplicated torrent.

Browse Source 
Starting from Transmission 2.80 (rpc-version-semver 5.1.0, rpc-version:
15) 'torrent-add' could return 'torrent-duplicated' from torrent-add if
the torrent already exists. Replace 'TorrentAdded' with
'TorrentAddedOrDuplicate'.
This commit is contained in:
Aleksei Fedotov 2022-07-03 21:09:22 +02:00 committed by Aleksandr
parent 2eafef4fe1
commit e71bc1c665
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/torrent-add.rs
View File

@ -3,7 +3,7 @@ extern crate transmission_rpc;
use dotenv::dotenv; use dotenv::dotenv;
use std::env; use std::env;
use transmission_rpc::types::{BasicAuth, Result, RpcResponse}; use transmission_rpc::types::{BasicAuth, Result, RpcResponse};
use transmission_rpc::types::{TorrentAddArgs, TorrentAdded}; use transmission_rpc::types::{TorrentAddArgs, TorrentAddedOrDuplicate};
use transmission_rpc::TransClient; use transmission_rpc::TransClient;
#[tokio::main] #[tokio::main]
@ -21,7 +21,7 @@ async fn main() -> Result<()> {
filename: Some("https://releases.ubuntu.com/20.04/ubuntu-20.04.2.0-desktop-amd64.iso.torrent".to_string()), filename: Some("https://releases.ubuntu.com/20.04/ubuntu-20.04.2.0-desktop-amd64.iso.torrent".to_string()),
..TorrentAddArgs::default() ..TorrentAddArgs::default()
}; };
let res: RpcResponse<TorrentAdded> = client.torrent_add(add).await?; let res: RpcResponse<TorrentAddedOrDuplicate> = client.torrent_add(add).await?;
println!("Add result: {:?}", &res.is_ok()); println!("Add result: {:?}", &res.is_ok());
println!("response: {:?}", &res); println!("response: {:?}", &res);

6
src/lib.rs
View File

@ -19,7 +19,7 @@ use types::FreeSpace;
use types::TorrentAction; use types::TorrentAction;
use types::{Id, Torrent, TorrentGetField, Torrents}; use types::{Id, Torrent, TorrentGetField, Torrents};
use types::{Nothing, Result, RpcRequest, RpcResponse, RpcResponseArgument, TorrentRenamePath}; use types::{Nothing, Result, RpcRequest, RpcResponse, RpcResponseArgument, TorrentRenamePath};
use types::{TorrentAddArgs, TorrentAdded}; use types::{TorrentAddArgs, TorrentAddedOrDuplicate};
const MAX_RETRIES: usize = 5; const MAX_RETRIES: usize = 5;
@ -527,7 +527,7 @@ impl TransClient {
/// use dotenv::dotenv; /// use dotenv::dotenv;
/// use transmission_rpc::TransClient; /// use transmission_rpc::TransClient;
/// use transmission_rpc::types::{Result, RpcResponse, BasicAuth}; /// use transmission_rpc::types::{Result, RpcResponse, BasicAuth};
/// use transmission_rpc::types::{TorrentAddArgs, TorrentAdded}; /// use transmission_rpc::types::{TorrentAddArgs, TorrentAddedOrDuplicate};
/// ///
/// #[tokio::main] /// #[tokio::main]
/// async fn main() -> Result<()> { /// async fn main() -> Result<()> {
@ -540,7 +540,7 @@ impl TransClient {
/// filename: Some("https://releases.ubuntu.com/20.04/ubuntu-20.04-desktop-amd64.iso.torrent".to_string()), /// filename: Some("https://releases.ubuntu.com/20.04/ubuntu-20.04-desktop-amd64.iso.torrent".to_string()),
/// ..TorrentAddArgs::default() /// ..TorrentAddArgs::default()
/// }; /// };
/// let res: RpcResponse<TorrentAdded> = client.torrent_add(add).await?; /// let res: RpcResponse<TorrentAddedOrDuplicate> = client.torrent_add(add).await?;
/// println!("Add result: {:?}", &res.is_ok()); /// println!("Add result: {:?}", &res.is_ok());
/// println!("response: {:?}", &res); /// println!("response: {:?}", &res);
/// ///

2
src/types/mod.rs
View File

@ -27,6 +27,6 @@ pub use self::response::BlocklistUpdate;
pub use self::response::PortTest; pub use self::response::PortTest;
pub use self::response::FreeSpace; pub use self::response::FreeSpace;
pub use self::response::Torrent; pub use self::response::Torrent;
pub use self::response::TorrentAdded; pub use self::response::TorrentAddedOrDuplicate;
pub use self::response::Torrents; pub use self::response::Torrents;
pub use self::response::TorrentRenamePath; pub use self::response::TorrentRenamePath;

9
src/types/response.rs
View File

@ -179,11 +179,12 @@ pub struct Nothing {}
impl RpcResponseArgument for Nothing {} impl RpcResponseArgument for Nothing {}
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
pub struct TorrentAdded { #[serde(rename_all="kebab-case")]
#[serde(rename = "torrent-added")] pub enum TorrentAddedOrDuplicate {
pub torrent_added: Option<Torrent>, TorrentDuplicate(Torrent),
TorrentAdded(Torrent),
} }
impl RpcResponseArgument for TorrentAdded {} impl RpcResponseArgument for TorrentAddedOrDuplicate {}
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
pub struct TorrentRenamePath{ pub struct TorrentRenamePath{