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

Merge pull request #5 from j0rsa/panic_free_request_to_unknown_url

Browse Source 
Panic free request to unknown url
This commit is contained in:
keyridan 2020-11-01 14:15:53 +01:00 committed by GitHub
commit 8d07f2be84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "transmission-rpc"
version = "0.3.0"
version = "0.3.1"
authors = ["red <red.avtovo@gmail.com>"]
edition = "2018"
repository = "https://github.com/j0rsa/transmission-rpc"

25
src/lib.rs
View File

@ -56,20 +56,21 @@ impl TransClient {
///
/// # Errors
///
/// Panics if any IO error happens
/// If response is impossible to unwrap then it will return an empty session_id
async fn get_session_id(&self) -> String {
info!("Requesting session id info");
let response: reqwest::Response = self.rpc_request()
let response: reqwest::Result<reqwest::Response> = self.rpc_request()
.json(&RpcRequest::session_get())
.send()
.await
.unwrap();
let session_id = response.headers()
.get("x-transmission-session-id")
.expect("Unable to get session id")
.to_str()
.unwrap()
.to_owned();
.await;
let session_id = match response {
Ok(ref resp) =>
match resp.headers().get("x-transmission-session-id") {
Some(res) => res.to_str().expect("header value should be a string"),
_ => ""
}
_ => ""
}.to_owned();
info!("Received session id: {}", session_id);
session_id
}
@ -288,7 +289,9 @@ impl TransClient {
let rq: reqwest::RequestBuilder = self.rpc_request()
.header("X-Transmission-Session-Id", self.get_session_id().await)
.json(&request);
info!("Request body: {:?}", rq.try_clone().unwrap().body_string()?);
info!("Request body: {:?}", rq.try_clone()
.expect("Unable to get the request body")
.body_string()?);
let resp: reqwest::Response = rq.send().await?;
let rpc_response: RpcResponse<RS> = resp.json().await?;
info!("Response body: {:#?}", rpc_response);