Merge pull request #16 from nickzana/fix-tests-no-auth

Fix Examples to support configuration with no authentication
This commit is contained in:
Aleksandr 2021-03-14 17:20:03 +01:00 committed by GitHub
commit 7a50ac33ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 46 additions and 39 deletions

View File

@ -10,11 +10,12 @@ async fn main() -> Result<()> {
dotenv().ok(); dotenv().ok();
env_logger::init(); env_logger::init();
let url = env::var("TURL")?; let url = env::var("TURL")?;
let basic_auth = BasicAuth { let client;
user: env::var("TUSER")?, if let (Ok(user), Ok(password)) = (env::var("TUSER"), env::var("TPWD")) {
password: env::var("TPWD")?, client = TransClient::with_auth(&url, BasicAuth {user, password});
}; } else {
let client = TransClient::with_auth(&url, basic_auth); client = TransClient::new(&url);
}
let response: Result<RpcResponse<SessionGet>> = client.session_get().await; let response: Result<RpcResponse<SessionGet>> = client.session_get().await;
match response { match response {
Ok(_) => println!("Yay!"), Ok(_) => println!("Yay!"),

View File

@ -11,11 +11,12 @@ async fn main() -> Result<()> {
dotenv().ok(); dotenv().ok();
env_logger::init(); env_logger::init();
let url = env::var("TURL")?; let url = env::var("TURL")?;
let basic_auth = BasicAuth { let client;
user: env::var("TUSER")?, if let (Ok(user), Ok(password)) = (env::var("TUSER"), env::var("TPWD")) {
password: env::var("TPWD")?, client = TransClient::with_auth(&url, BasicAuth {user, password});
}; } else {
let client = TransClient::with_auth(&url, basic_auth); client = TransClient::new(&url);
}
let res1: RpcResponse<Nothing> = client.torrent_action(TorrentAction::Start, vec![Id::Id(1)]).await?; let res1: RpcResponse<Nothing> = client.torrent_action(TorrentAction::Start, vec![Id::Id(1)]).await?;
println!("Start result: {:?}", &res1.is_ok()); println!("Start result: {:?}", &res1.is_ok());
let res2: RpcResponse<Nothing> = client.torrent_action(TorrentAction::Stop, vec![Id::Id(1)]).await?; let res2: RpcResponse<Nothing> = client.torrent_action(TorrentAction::Stop, vec![Id::Id(1)]).await?;

View File

@ -11,11 +11,12 @@ async fn main() -> Result<()> {
dotenv().ok(); dotenv().ok();
env_logger::init(); env_logger::init();
let url = env::var("TURL")?; let url = env::var("TURL")?;
let basic_auth = BasicAuth { let client;
user: env::var("TUSER")?, if let (Ok(user), Ok(password)) = (env::var("TUSER"), env::var("TPWD")) {
password: env::var("TPWD")?, client = TransClient::with_auth(&url, BasicAuth {user, password});
}; } else {
let client = TransClient::with_auth(&url, basic_auth); client = TransClient::new(&url);
}
let add: TorrentAddArgs = TorrentAddArgs { let add: TorrentAddArgs = TorrentAddArgs {
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()

View File

@ -11,11 +11,12 @@ async fn main() -> Result<()> {
dotenv().ok(); dotenv().ok();
env_logger::init(); env_logger::init();
let url = env::var("TURL")?; let url = env::var("TURL")?;
let basic_auth = BasicAuth { let client;
user: env::var("TUSER")?, if let (Ok(user), Ok(password)) = (env::var("TUSER"), env::var("TPWD")) {
password: env::var("TPWD")?, client = TransClient::with_auth(&url, BasicAuth {user, password});
}; } else {
let client = TransClient::with_auth(&url, basic_auth); client = TransClient::new(&url);
}
let res: RpcResponse<Torrents<Torrent>> = client.torrent_get(None, None).await?; let res: RpcResponse<Torrents<Torrent>> = client.torrent_get(None, None).await?;
let names: Vec<&String> = res let names: Vec<&String> = res

View File

@ -11,11 +11,12 @@ async fn main() -> Result<()> {
dotenv().ok(); dotenv().ok();
env_logger::init(); env_logger::init();
let url = env::var("TURL")?; let url = env::var("TURL")?;
let basic_auth = BasicAuth { let client;
user: env::var("TUSER")?, if let (Ok(user), Ok(password)) = (env::var("TUSER"), env::var("TPWD")) {
password: env::var("TPWD")?, client = TransClient::with_auth(&url, BasicAuth {user, password});
}; } else {
let client = TransClient::with_auth(&url, basic_auth); client = TransClient::new(&url);
}
let res: RpcResponse<Nothing> = client.torrent_remove(vec![Id::Id(1)], false).await?; let res: RpcResponse<Nothing> = client.torrent_remove(vec![Id::Id(1)], false).await?;
println!("Remove result: {:?}", &res.is_ok()); println!("Remove result: {:?}", &res.is_ok());

View File

@ -11,11 +11,12 @@ async fn main() -> Result<()> {
dotenv().ok(); dotenv().ok();
env_logger::init(); env_logger::init();
let url = env::var("TURL")?; let url = env::var("TURL")?;
let basic_auth = BasicAuth { let client;
user: env::var("TUSER")?, if let (Ok(user), Ok(password)) = (env::var("TUSER"), env::var("TPWD")) {
password: env::var("TPWD")?, client = TransClient::with_auth(&url, BasicAuth {user, password});
}; } else {
let client = TransClient::with_auth(&url, basic_auth); client = TransClient::new(&url);
}
let res: RpcResponse<Nothing> = client.torrent_set_location( let res: RpcResponse<Nothing> = client.torrent_set_location(
vec![Id::Id(1)], vec![Id::Id(1)],
String::from("/new/location"), String::from("/new/location"),

View File

@ -380,11 +380,12 @@ mod tests {
dotenv().ok(); dotenv().ok();
env_logger::init(); env_logger::init();
let url = env::var("TURL")?; let url = env::var("TURL")?;
let basic_auth = BasicAuth { let client;
user: env::var("TUSER")?, if let (Ok(user), Ok(password)) = (env::var("TUSER"), env::var("TPWD")) {
password: env::var("TPWD")?, client = TransClient::with_auth(&url, BasicAuth {user, password});
}; } else {
let client = TransClient::with_auth(&url, basic_auth); client = TransClient::new(&url);
}
info!("Client is ready!"); info!("Client is ready!");
let add: TorrentAddArgs = TorrentAddArgs { let add: TorrentAddArgs = TorrentAddArgs {
filename: Some( filename: Some(