From 5187775550dee2a2719339564c778df64a8538eb Mon Sep 17 00:00:00 2001 From: jakka Date: Wed, 17 Sep 2025 21:41:59 +0300 Subject: separated client functions into different traits - trait per section in api documentation --- src/client.rs | 71 ++++++++++++++++++++++++++++++++--------------------------- src/lib.rs | 1 + src/tests.rs | 2 +- src/traits.rs | 37 +++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 33 deletions(-) create mode 100644 src/traits.rs (limited to 'src') diff --git a/src/client.rs b/src/client.rs index c323714..d9b2ed5 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1,9 +1,10 @@ -use std::path::Path; +use std::path::PathBuf; +use async_trait::async_trait; use reqwest::{Body, RequestBuilder}; use tokio_util::codec::{BytesCodec, FramedRead}; -use crate::types::*; +use crate::{traits::*, types::*}; type Result = std::result::Result; @@ -32,7 +33,32 @@ impl HydrusClient { self.sessionkey = Some(key.to_owned()) } - pub async fn request_new_permissions( + fn set_get_request_key(&self, url: &str) -> Result { + let request = self.client.get(url); + if let Some(key) = &self.sessionkey { + Ok(request.header("Hydrus-Client-API-Access-Key", key)) + } else if let Some(key) = &self.apikey { + Ok(request.header("Hydrus-Client-API-Access-Key", key)) + } else { + Err(HydrusError::KeyNotSupplied) + } + } + + fn set_post_request_key(&self, url: &str) -> Result { + let request = self.client.post(url); + if let Some(key) = &self.sessionkey { + Ok(request.header("Hydrus-Client-API-Access-Key", key)) + } else if let Some(key) = &self.apikey { + Ok(request.header("Hydrus-Client-API-Access-Key", key)) + } else { + Err(HydrusError::KeyNotSupplied) + } + } +} + +#[async_trait] +impl AccessManagement for HydrusClient { + async fn request_new_permissions( &self, name: &str, permissions: &[HydrusPermissions], @@ -60,7 +86,7 @@ impl HydrusClient { .access_key) } - pub async fn get_session_key(&self) -> Result { + async fn get_session_key(&self) -> Result { let mut req_url = self.url.to_owned(); req_url.push_str("session_key"); @@ -78,7 +104,7 @@ impl HydrusClient { .session_key) } - pub async fn verify_access_key(&self, key: &str) -> Result { + async fn verify_access_key(&self, key: &str) -> Result { let mut req_url = self.url.to_owned(); req_url.push_str("verify_access_key"); @@ -92,29 +118,7 @@ impl HydrusClient { .await?) } - fn set_get_request_key(&self, url: &str) -> Result { - let request = self.client.get(url); - if let Some(key) = &self.sessionkey { - Ok(request.header("Hydrus-Client-API-Access-Key", key)) - } else if let Some(key) = &self.apikey { - Ok(request.header("Hydrus-Client-API-Access-Key", key)) - } else { - Err(HydrusError::KeyNotSupplied) - } - } - - fn set_post_request_key(&self, url: &str) -> Result { - let request = self.client.post(url); - if let Some(key) = &self.sessionkey { - Ok(request.header("Hydrus-Client-API-Access-Key", key)) - } else if let Some(key) = &self.apikey { - Ok(request.header("Hydrus-Client-API-Access-Key", key)) - } else { - Err(HydrusError::KeyNotSupplied) - } - } - - pub async fn get_service_name(&self, name: &str) -> Result { + async fn get_service_name(&self, name: &str) -> Result { let mut req_url = self.url.to_owned(); req_url.push_str("get_service?service_name="); req_url.push_str(&urlencoding::encode(name)); @@ -127,7 +131,7 @@ impl HydrusClient { .await?) } - pub async fn get_service_key(&self, key: &str) -> Result { + async fn get_service_key(&self, key: &str) -> Result { let mut req_url = self.url.to_owned(); req_url.push_str("get_service?service_key="); req_url.push_str(&urlencoding::encode(key)); @@ -140,7 +144,7 @@ impl HydrusClient { .await?) } - pub async fn get_services(&self) -> Result> { + async fn get_services(&self) -> Result> { let mut req_url = self.url.to_owned(); req_url.push_str("get_services"); @@ -152,8 +156,11 @@ impl HydrusClient { .await? .service_vec()) } +} - pub async fn add_file_via_path( +#[async_trait] +impl ImportingAndDeletingFiles for HydrusClient { + async fn add_file_via_path( &self, path: &str, delete: Option, @@ -189,7 +196,7 @@ impl HydrusClient { .await?) } - pub async fn add_file_via_file(&self, file: impl AsRef) -> Result { + async fn add_file_via_file(&self, file: PathBuf) -> Result { let mut req_url = self.url.to_owned(); req_url.push_str("add_files/add_file"); diff --git a/src/lib.rs b/src/lib.rs index 6d0b411..6d5ae50 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,5 @@ pub mod client; +pub mod traits; pub mod types; #[cfg(test)] diff --git a/src/tests.rs b/src/tests.rs index 0ce410e..c98d59a 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -1,5 +1,5 @@ use crate::client::HydrusClient; -use crate::types::*; +use crate::{traits::*, types::*}; #[tokio::test] async fn test_service_info() { diff --git a/src/traits.rs b/src/traits.rs new file mode 100644 index 0000000..3855c50 --- /dev/null +++ b/src/traits.rs @@ -0,0 +1,37 @@ +use std::path::PathBuf; + +use crate::types::*; +use async_trait::async_trait; + +type Result = std::result::Result; + +#[async_trait] +pub trait AccessManagement { + async fn request_new_permissions( + &self, + name: &str, + permissions: &[HydrusPermissions], + ) -> Result; + + async fn get_session_key(&self) -> Result; + + async fn verify_access_key(&self, key: &str) -> Result; + + async fn get_service_name(&self, name: &str) -> Result; + + async fn get_service_key(&self, key: &str) -> Result; + + async fn get_services(&self) -> Result>; +} + +#[async_trait] +pub trait ImportingAndDeletingFiles { + async fn add_file_via_path( + &self, + path: &str, + delete: Option, + domains: Option, + ) -> Result; + + async fn add_file_via_file(&self, file: PathBuf) -> Result; +} -- cgit v1.3.1