diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml index edd3ed4..f1071ba 100644 --- a/mediarepo-api/Cargo.toml +++ b/mediarepo-api/Cargo.toml @@ -9,7 +9,6 @@ license = "gpl-3" [dependencies] tracing = "0.1.29" thiserror = "1.0.30" -chrono = "0.4.19" rmp-ipc = {version = "0.7.2", optional=true} tauri = {version = "1.0.0-beta.8", optional=true} @@ -17,5 +16,10 @@ tauri = {version = "1.0.0-beta.8", optional=true} version = "1.0.130" features = ["serde_derive"] +[dependencies.chrono] +version = "0.4.19" +features = ["serde"] + [features] -tauri-plugin = ["tauri", "rmp-ipc"] \ No newline at end of file +tauri-plugin = ["client-api","tauri", "rmp-ipc"] +client-api = ["rmp-ipc"] \ No newline at end of file diff --git a/mediarepo-api/src/client_api/error.rs b/mediarepo-api/src/client_api/error.rs new file mode 100644 index 0000000..bd8f8df --- /dev/null +++ b/mediarepo-api/src/client_api/error.rs @@ -0,0 +1,9 @@ +use thiserror::Error; + +pub type ApiResult = Result; + +#[derive(Debug, Error)] +pub enum ApiError { + #[error(transparent)] + IPC(#[from] rmp_ipc::error::Error) +} \ No newline at end of file diff --git a/mediarepo-api/src/client_api/mod.rs b/mediarepo-api/src/client_api/mod.rs new file mode 100644 index 0000000..a6d7b95 --- /dev/null +++ b/mediarepo-api/src/client_api/mod.rs @@ -0,0 +1,24 @@ +pub mod error; + +use rmp_ipc::ipc::context::Context; +use rmp_ipc::IPCBuilder; +use crate::client_api::error::ApiResult; + +#[derive(Clone)] +pub struct ApiClient { + ctx: Context, +} + +impl ApiClient { + /// Creates a new client from an existing ipc context + pub fn new(ctx: Context) -> Self { + Self {ctx} + } + + /// Connects to the ipc Socket + pub async fn connect(address: &str) -> ApiResult { + let ctx = IPCBuilder::new().address(address).build_client().await?; + + Ok(Self::new(ctx)) + } +} \ No newline at end of file diff --git a/mediarepo-api/src/lib.rs b/mediarepo-api/src/lib.rs index 56ce163..1c1dbbe 100644 --- a/mediarepo-api/src/lib.rs +++ b/mediarepo-api/src/lib.rs @@ -1,4 +1,7 @@ pub mod types; +#[cfg(feature = "client-api")] +pub mod client_api; + #[cfg(feature = "tauri-plugin")] pub mod tauri_plugin; diff --git a/mediarepo-api/src/types/files.rs b/mediarepo-api/src/types/files.rs index 4c121b0..e80e67a 100644 --- a/mediarepo-api/src/types/files.rs +++ b/mediarepo-api/src/types/files.rs @@ -1,3 +1,4 @@ +use serde::{Serialize, Deserialize}; use chrono::NaiveDateTime; use crate::types::identifier::FileIdentifier; @@ -48,7 +49,7 @@ pub struct FileMetadataResponse { #[derive(Clone, Debug, Serialize, Deserialize)] pub struct ThumbnailMetadataResponse { pub id: i64, - pub hash: Strin, + pub hash: String, pub height: i32, pub width: i32, pub mime_type: Option, diff --git a/mediarepo-api/src/types/identifier.rs b/mediarepo-api/src/types/identifier.rs index 8617373..b8df84e 100644 --- a/mediarepo-api/src/types/identifier.rs +++ b/mediarepo-api/src/types/identifier.rs @@ -1,3 +1,5 @@ +use serde::{Serialize, Deserialize}; + #[derive(Clone, Debug, Serialize, Deserialize)] pub enum FileIdentifier { ID(i64), diff --git a/mediarepo-api/src/types/misc.rs b/mediarepo-api/src/types/misc.rs index 77307cf..137524f 100644 --- a/mediarepo-api/src/types/misc.rs +++ b/mediarepo-api/src/types/misc.rs @@ -1,3 +1,5 @@ +use serde::{Serialize, Deserialize}; + #[derive(Clone, Debug, Serialize, Deserialize)] pub struct InfoResponse { pub name: String, diff --git a/mediarepo-api/src/types/tags.rs b/mediarepo-api/src/types/tags.rs index 252b3d0..4917af8 100644 --- a/mediarepo-api/src/types/tags.rs +++ b/mediarepo-api/src/types/tags.rs @@ -1,3 +1,5 @@ +use serde::{Serialize, Deserialize}; + #[derive(Clone, Debug, Serialize, Deserialize)] pub struct TagResponse { pub id: i64,