From 445df0962fed62f6e445eadeb665e90df3e4d62e Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 27 Dec 2021 13:40:33 +0100 Subject: [PATCH 01/13] Update dependencies Signed-off-by: Trivernis --- mediarepo-api/Cargo.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml index 96e1387..69901d2 100644 --- a/mediarepo-api/Cargo.toml +++ b/mediarepo-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mediarepo-api" -version = "0.16.0" +version = "0.16.1" edition = "2018" license = "gpl-3" @@ -9,42 +9,42 @@ license = "gpl-3" [dependencies] tracing = "0.1.29" thiserror = "1.0.30" -async-trait = {version = "0.1.51", optional=true} +async-trait = {version = "0.1.52", optional=true} parking_lot = {version="0.11.2", optional=true} -serde_json = {version="1.0.68", optional=true} +serde_json = {version="1.0.73", optional=true} directories = {version="4.0.1", optional=true} mime_guess = {version = "2.0.3", optional=true} serde_piecewise_default = "0.2.0" -futures = {version = "0.3.17", optional=true} +futures = {version = "0.3.19", optional=true} url = {version = "2.2.2", optional=true } pathsearch = {version="0.2.0", optional=true} [dependencies.bromine] -version = "0.16.1" +version = "^0.16.2" optional = true features = ["serialize_bincode"] [dependencies.serde] -version = "1.0.130" +version = "^1.0.132" features = ["serde_derive"] [dependencies.chrono] -version = "0.4.19" +version = "^0.4.19" features = ["serde"] [dependencies.tauri] -version = "1.0.0-beta.8" +version = "^1.0.0-beta.8" optional=true default-features = false features = [] [dependencies.tokio] -version = "1.12.0" +version = "^1.15.0" optional = true features = ["sync", "fs", "net", "io-util", "io-std", "time", "rt", "process"] [dependencies.toml] -version = "0.5.8" +version = "^0.5.8" optional = true [features] From a723ebab95a7b11d51ea44d0e9d395e4681de7f6 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 27 Dec 2021 13:48:07 +0100 Subject: [PATCH 02/13] Add custom timeouts to events Signed-off-by: Trivernis --- mediarepo-api/src/client_api/file.rs | 15 +++++++++------ mediarepo-api/src/client_api/mod.rs | 11 ++++++++--- mediarepo-api/src/client_api/repo.rs | 3 ++- mediarepo-api/src/client_api/tag.rs | 10 ++++++---- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/mediarepo-api/src/client_api/file.rs b/mediarepo-api/src/client_api/file.rs index 419289f..3ef6d4c 100644 --- a/mediarepo-api/src/client_api/file.rs +++ b/mediarepo-api/src/client_api/file.rs @@ -10,6 +10,7 @@ use async_trait::async_trait; use bromine::context::{PoolGuard, PooledContext}; use bromine::payload::BytePayload; use bromine::prelude::*; +use tokio::time::Duration; pub struct FileApi { ctx: PooledContext, @@ -43,12 +44,12 @@ impl FileApi { /// Returns all known files #[tracing::instrument(level = "debug", skip(self))] pub async fn all_files(&self) -> ApiResult> { - self.emit_and_get("all_files", ()).await + self.emit_and_get("all_files", (), Some(Duration::from_secs(30))).await } /// Returns a file by identifier pub async fn get_file(&self, id: FileIdentifier) -> ApiResult { - self.emit_and_get("get_file", id).await + self.emit_and_get("get_file", id, Some(Duration::from_secs(2))).await } /// Searches for a file by a list of tags @@ -64,6 +65,7 @@ impl FileApi { filters, sort_expression, }, + Some(Duration::from_secs(20)) ) .await } @@ -72,7 +74,7 @@ impl FileApi { #[tracing::instrument(level = "debug", skip(self))] pub async fn read_file(&self, id: FileIdentifier) -> ApiResult> { let payload: BytePayload = self - .emit_and_get("read_file", ReadFileRequest { id }) + .emit_and_get("read_file", ReadFileRequest { id }, Some(Duration::from_secs(10))) .await?; Ok(payload.into_inner()) @@ -84,7 +86,7 @@ impl FileApi { &self, id: FileIdentifier, ) -> ApiResult> { - self.emit_and_get("get_thumbnails", GetFileThumbnailsRequest { id }) + self.emit_and_get("get_thumbnails", GetFileThumbnailsRequest { id }, Some(Duration::from_secs(2))) .await } @@ -104,6 +106,7 @@ impl FileApi { min_size, max_size, }, + Some(Duration::from_secs(2)) ) .await?; let (metadata, bytes) = payload.into_inner(); @@ -118,7 +121,7 @@ impl FileApi { file_id: FileIdentifier, name: String, ) -> ApiResult { - self.emit_and_get("update_file_name", UpdateFileNameRequest { file_id, name }) + self.emit_and_get("update_file_name", UpdateFileNameRequest { file_id, name }, Some(Duration::from_secs(1))) .await } @@ -135,7 +138,7 @@ impl FileApi { BytePayload::new(bytes), ); - self.emit_and_get("add_file", payload).await + self.emit_and_get("add_file", payload, Some(Duration::from_secs(5))).await } /// Deletes all thumbnails of a file to regenerate them when requested diff --git a/mediarepo-api/src/client_api/mod.rs b/mediarepo-api/src/client_api/mod.rs index d6969a4..0bc1564 100644 --- a/mediarepo-api/src/client_api/mod.rs +++ b/mediarepo-api/src/client_api/mod.rs @@ -12,7 +12,7 @@ use crate::types::misc::{check_apis_compatible, get_api_version, InfoResponse}; use async_trait::async_trait; use bromine::ipc::stream_emitter::EmitMetadata; use bromine::prelude::*; -use std::time::Duration; +use tokio::time::Duration; #[async_trait] pub trait IPCApi { @@ -34,8 +34,13 @@ pub trait IPCApi { &self, event_name: &str, data: T, + timeout: Option, ) -> ApiResult { - let meta = self.emit(event_name, data).await?; + let mut meta = self.emit(event_name, data).await?; + + if let Some(timeout) = timeout { + meta = meta.with_timeout(timeout); + } let response = meta.await_reply(&self.ctx()).await?; Ok(response.payload()?) @@ -77,7 +82,7 @@ impl ApiClient { ) -> ApiResult { let ctx = IPCBuilder::::new() .address(address) - .timeout(Duration::from_secs(30)) + .timeout(Duration::from_secs(10)) .build_pooled_client(8) .await?; let client = Self::new(ctx); diff --git a/mediarepo-api/src/client_api/repo.rs b/mediarepo-api/src/client_api/repo.rs index 03a0812..45e234f 100644 --- a/mediarepo-api/src/client_api/repo.rs +++ b/mediarepo-api/src/client_api/repo.rs @@ -2,6 +2,7 @@ use crate::client_api::error::ApiResult; use crate::client_api::IPCApi; use crate::types::repo::FrontendState; use bromine::prelude::*; +use tokio::time::Duration; #[derive(Clone)] pub struct RepoApi { @@ -26,7 +27,7 @@ impl RepoApi { /// Returns the state of the frontend that is stored in the repo #[tracing::instrument(level = "debug", skip(self))] pub async fn get_frontend_state(&self) -> ApiResult { - let state = self.emit_and_get("frontend_state", ()).await?; + let state = self.emit_and_get("frontend_state", (), Some(Duration::from_secs(5))).await?; Ok(state) } diff --git a/mediarepo-api/src/client_api/tag.rs b/mediarepo-api/src/client_api/tag.rs index 6541b6a..ec030da 100644 --- a/mediarepo-api/src/client_api/tag.rs +++ b/mediarepo-api/src/client_api/tag.rs @@ -1,3 +1,4 @@ +use std::time::Duration; use crate::client_api::error::ApiResult; use crate::client_api::IPCApi; use crate::types::files::{GetFileTagsRequest, GetFilesTagsRequest}; @@ -38,27 +39,27 @@ impl TagApi { /// Returns a list of all tags stored in the repo #[tracing::instrument(level = "debug", skip(self))] pub async fn get_all_tags(&self) -> ApiResult> { - self.emit_and_get("all_tags", ()).await + self.emit_and_get("all_tags", (), Some(Duration::from_secs(2))).await } /// Returns a list of all tags for a file #[tracing::instrument(level = "debug", skip(self))] pub async fn get_tags_for_file(&self, id: FileIdentifier) -> ApiResult> { - self.emit_and_get("tags_for_file", GetFileTagsRequest { id }) + self.emit_and_get("tags_for_file", GetFileTagsRequest { id }, Some(Duration::from_secs(1))) .await } /// Returns a list of all tags that are assigned to the list of files #[tracing::instrument(level = "debug", skip_all)] pub async fn get_tags_for_files(&self, hashes: Vec) -> ApiResult> { - self.emit_and_get("tags_for_files", GetFilesTagsRequest { hashes }) + self.emit_and_get("tags_for_files", GetFilesTagsRequest { hashes }, Some(Duration::from_secs(10))) .await } /// Creates a new tag and returns the created tag object #[tracing::instrument(level = "debug", skip(self))] pub async fn create_tags(&self, tags: Vec) -> ApiResult> { - self.emit_and_get("create_tags", tags).await + self.emit_and_get("create_tags", tags, Some(Duration::from_secs(10))).await } /// Changes the tags of a file @@ -76,6 +77,7 @@ impl TagApi { added_tags, removed_tags, }, + Some(Duration::from_secs(10)) ) .await } From 73c98e44a2eb63afef60ced97b4914a5f897dc6a Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 27 Dec 2021 13:53:09 +0100 Subject: [PATCH 03/13] Add more api calls Add api to get a list of files by identifiers. Add api to get all namespaces stored in the repo. Signed-off-by: Trivernis --- mediarepo-api/Cargo.toml | 2 +- mediarepo-api/src/client_api/file.rs | 7 +++++++ mediarepo-api/src/client_api/tag.rs | 8 +++++++- mediarepo-api/src/types/tags.rs | 6 ++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml index 69901d2..a78db67 100644 --- a/mediarepo-api/Cargo.toml +++ b/mediarepo-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mediarepo-api" -version = "0.16.1" +version = "0.17.0" edition = "2018" license = "gpl-3" diff --git a/mediarepo-api/src/client_api/file.rs b/mediarepo-api/src/client_api/file.rs index 3ef6d4c..323fd06 100644 --- a/mediarepo-api/src/client_api/file.rs +++ b/mediarepo-api/src/client_api/file.rs @@ -48,10 +48,17 @@ impl FileApi { } /// Returns a file by identifier + #[tracing::instrument(level = "debug", skip(self))] pub async fn get_file(&self, id: FileIdentifier) -> ApiResult { self.emit_and_get("get_file", id, Some(Duration::from_secs(2))).await } + /// Returns metadata for a range of files + #[tracing::instrument(level = "debug", skip(self, ids))] + pub async fn get_files(&self, ids: Vec) -> ApiResult> { + self.emit_and_get("get_files", ids, Some(Duration::from_secs(10))).await + } + /// Searches for a file by a list of tags #[tracing::instrument(level = "debug", skip(self))] pub async fn find_files( diff --git a/mediarepo-api/src/client_api/tag.rs b/mediarepo-api/src/client_api/tag.rs index ec030da..6f7870c 100644 --- a/mediarepo-api/src/client_api/tag.rs +++ b/mediarepo-api/src/client_api/tag.rs @@ -3,7 +3,7 @@ use crate::client_api::error::ApiResult; use crate::client_api::IPCApi; use crate::types::files::{GetFileTagsRequest, GetFilesTagsRequest}; use crate::types::identifier::FileIdentifier; -use crate::types::tags::{ChangeFileTagsRequest, TagResponse}; +use crate::types::tags::{ChangeFileTagsRequest, NamespaceResponse, TagResponse}; use async_trait::async_trait; use bromine::context::{PoolGuard, PooledContext}; use bromine::ipc::context::Context; @@ -42,6 +42,12 @@ impl TagApi { self.emit_and_get("all_tags", (), Some(Duration::from_secs(2))).await } + /// Returns a list of all namespaces stored in the repo + #[tracing::instrument(level = "debug", skip(self))] + pub async fn get_all_namespaces(&self) -> ApiResult> { + self.emit_and_get("all_namespaces", (), Some(Duration::from_secs(2))).await + } + /// Returns a list of all tags for a file #[tracing::instrument(level = "debug", skip(self))] pub async fn get_tags_for_file(&self, id: FileIdentifier) -> ApiResult> { diff --git a/mediarepo-api/src/types/tags.rs b/mediarepo-api/src/types/tags.rs index ecb7281..ba34d59 100644 --- a/mediarepo-api/src/types/tags.rs +++ b/mediarepo-api/src/types/tags.rs @@ -8,6 +8,12 @@ pub struct TagResponse { pub name: String, } +#[derive(Clone, Debug, Serialize, Deserialize)] +pub struct NamespaceResponse { + pub id: i64, + pub name: String, +} + #[derive(Clone, Debug, Serialize, Deserialize)] pub struct ChangeFileTagsRequest { pub file_id: FileIdentifier, From e56c7b04eced0730fb265eac1f7f11b13ed56ccb Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 27 Dec 2021 14:52:49 +0100 Subject: [PATCH 04/13] Downgrade futures to solve conflict with tauri version Signed-off-by: Trivernis --- mediarepo-api/Cargo.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml index a78db67..d62fa6c 100644 --- a/mediarepo-api/Cargo.toml +++ b/mediarepo-api/Cargo.toml @@ -7,17 +7,17 @@ license = "gpl-3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tracing = "0.1.29" -thiserror = "1.0.30" -async-trait = {version = "0.1.52", optional=true} -parking_lot = {version="0.11.2", optional=true} -serde_json = {version="1.0.73", optional=true} -directories = {version="4.0.1", optional=true} -mime_guess = {version = "2.0.3", optional=true} -serde_piecewise_default = "0.2.0" -futures = {version = "0.3.19", optional=true} -url = {version = "2.2.2", optional=true } -pathsearch = {version="0.2.0", optional=true} +tracing = "^0.1.29" +thiserror = "^1.0.30" +async-trait = {version = "^0.1.52", optional=true} +parking_lot = {version="^0.11.2", optional=true} +serde_json = {version="^1.0.73", optional=true} +directories = {version="^4.0.1", optional=true} +mime_guess = {version = "^2.0.3", optional=true} +serde_piecewise_default = "^0.2.0" +futures = {version = "^0.3.17", optional=true} +url = {version = "^2.2.2", optional=true } +pathsearch = {version="^0.2.0", optional=true} [dependencies.bromine] version = "^0.16.2" From b9a0935631f663bda596177db326a4fb330cfffe Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 27 Dec 2021 14:56:15 +0100 Subject: [PATCH 05/13] Upgrade futures again Signed-off-by: Trivernis --- mediarepo-api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml index d62fa6c..e2135e9 100644 --- a/mediarepo-api/Cargo.toml +++ b/mediarepo-api/Cargo.toml @@ -15,7 +15,7 @@ serde_json = {version="^1.0.73", optional=true} directories = {version="^4.0.1", optional=true} mime_guess = {version = "^2.0.3", optional=true} serde_piecewise_default = "^0.2.0" -futures = {version = "^0.3.17", optional=true} +futures = {version = "^0.3.19", optional=true} url = {version = "^2.2.2", optional=true } pathsearch = {version="^0.2.0", optional=true} From 60140fcd97b31770e0b3c2edca6bb9ec98510dc7 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 27 Dec 2021 16:16:18 +0100 Subject: [PATCH 06/13] Add missing tauri commands Signed-off-by: Trivernis --- mediarepo-api/src/tauri_plugin/commands/file.rs | 9 +++++++++ mediarepo-api/src/tauri_plugin/commands/tag.rs | 10 +++++++++- mediarepo-api/src/tauri_plugin/mod.rs | 4 +++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/mediarepo-api/src/tauri_plugin/commands/file.rs b/mediarepo-api/src/tauri_plugin/commands/file.rs index f3d1c20..86121aa 100644 --- a/mediarepo-api/src/tauri_plugin/commands/file.rs +++ b/mediarepo-api/src/tauri_plugin/commands/file.rs @@ -25,6 +25,15 @@ pub async fn get_all_files(api_state: ApiAccess<'_>) -> PluginResult, ids: Vec) -> PluginResult> { + let api = api_state.api().await?; + let ids = ids.into_iter().map(|id| FileIdentifier::ID(id)).collect(); + let files = api.file.get_files(ids).await?; + + Ok(files) +} + #[tauri::command] pub async fn add_local_file( api_state: ApiAccess<'_>, diff --git a/mediarepo-api/src/tauri_plugin/commands/tag.rs b/mediarepo-api/src/tauri_plugin/commands/tag.rs index d54bfa7..dbd2bdd 100644 --- a/mediarepo-api/src/tauri_plugin/commands/tag.rs +++ b/mediarepo-api/src/tauri_plugin/commands/tag.rs @@ -1,7 +1,7 @@ use crate::tauri_plugin::commands::ApiAccess; use crate::tauri_plugin::error::PluginResult; use crate::types::identifier::FileIdentifier; -use crate::types::tags::TagResponse; +use crate::types::tags::{NamespaceResponse, TagResponse}; #[tauri::command] pub async fn get_all_tags(api_state: ApiAccess<'_>) -> PluginResult> { @@ -11,6 +11,14 @@ pub async fn get_all_tags(api_state: ApiAccess<'_>) -> PluginResult) -> PluginResult> { + let api = api_state.api().await?; + let all_namespaces = api.tag.get_all_namespaces().await?; + + Ok(all_namespaces) +} + #[tauri::command] pub async fn get_tags_for_file( id: i64, diff --git a/mediarepo-api/src/tauri_plugin/mod.rs b/mediarepo-api/src/tauri_plugin/mod.rs index 3254f3a..574408e 100644 --- a/mediarepo-api/src/tauri_plugin/mod.rs +++ b/mediarepo-api/src/tauri_plugin/mod.rs @@ -61,7 +61,9 @@ impl MediarepoPlugin { delete_repository, has_executable, get_frontend_state, - set_frontend_state + set_frontend_state, + get_all_namespaces, + get_files ]), } } From d8560a180c9e35bf846b5ea8ec8cc7abb8113e6c Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 27 Dec 2021 16:58:27 +0100 Subject: [PATCH 07/13] Add api to get repository metadata Signed-off-by: Trivernis --- mediarepo-api/src/client_api/repo.rs | 15 ++++++++++++--- mediarepo-api/src/tauri_plugin/commands/repo.rs | 10 +++++++++- mediarepo-api/src/tauri_plugin/mod.rs | 3 ++- mediarepo-api/src/types/repo.rs | 12 ++++++++++++ 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/mediarepo-api/src/client_api/repo.rs b/mediarepo-api/src/client_api/repo.rs index 45e234f..6abd233 100644 --- a/mediarepo-api/src/client_api/repo.rs +++ b/mediarepo-api/src/client_api/repo.rs @@ -1,9 +1,10 @@ -use crate::client_api::error::ApiResult; -use crate::client_api::IPCApi; -use crate::types::repo::FrontendState; use bromine::prelude::*; use tokio::time::Duration; +use crate::client_api::error::ApiResult; +use crate::client_api::IPCApi; +use crate::types::repo::{FrontendState, RepositoryMetadata}; + #[derive(Clone)] pub struct RepoApi { ctx: PooledContext, @@ -24,6 +25,14 @@ impl RepoApi { Self { ctx } } + /// Returns metadata about the repository + #[tracing::instrument(level = "debug", skip(self))] + pub async fn get_repo_metadata(&self) -> ApiResult { + let metadata = self.emit_and_get("repository_metadata", (), Some(Duration::from_secs(2))).await?; + + Ok(metadata) + } + /// Returns the state of the frontend that is stored in the repo #[tracing::instrument(level = "debug", skip(self))] pub async fn get_frontend_state(&self) -> ApiResult { diff --git a/mediarepo-api/src/tauri_plugin/commands/repo.rs b/mediarepo-api/src/tauri_plugin/commands/repo.rs index 1912de4..3545b64 100644 --- a/mediarepo-api/src/tauri_plugin/commands/repo.rs +++ b/mediarepo-api/src/tauri_plugin/commands/repo.rs @@ -3,7 +3,7 @@ use crate::client_api::ApiClient; use crate::tauri_plugin::commands::{ApiAccess, AppAccess, BufferAccess}; use crate::tauri_plugin::error::{PluginError, PluginResult}; use crate::tauri_plugin::settings::{save_settings, Repository}; -use crate::types::repo::FrontendState; +use crate::types::repo::{FrontendState, RepositoryMetadata}; use serde::{Deserialize, Serialize}; use std::mem; use std::path::PathBuf; @@ -190,6 +190,14 @@ pub async fn select_repository( Ok(()) } +#[tauri::command] +pub async fn get_repo_metadata(api_state: ApiAccess<'_>) -> PluginResult { + let api = api_state.api().await?; + let metadata = api.repo.get_repo_metadata().await?; + + Ok(metadata) +} + #[tauri::command] pub async fn get_frontend_state(api_state: ApiAccess<'_>) -> PluginResult> { let api = api_state.api().await?; diff --git a/mediarepo-api/src/tauri_plugin/mod.rs b/mediarepo-api/src/tauri_plugin/mod.rs index 574408e..4f012fc 100644 --- a/mediarepo-api/src/tauri_plugin/mod.rs +++ b/mediarepo-api/src/tauri_plugin/mod.rs @@ -63,7 +63,8 @@ impl MediarepoPlugin { get_frontend_state, set_frontend_state, get_all_namespaces, - get_files + get_files, + get_repo_metadata ]), } } diff --git a/mediarepo-api/src/types/repo.rs b/mediarepo-api/src/types/repo.rs index 9a7139f..c17c751 100644 --- a/mediarepo-api/src/types/repo.rs +++ b/mediarepo-api/src/types/repo.rs @@ -4,3 +4,15 @@ use serde::{Deserialize, Serialize}; pub struct FrontendState { pub state: Option, } + +#[derive(Serialize, Deserialize, Clone, Debug)] +pub struct RepositoryMetadata { + pub version: String, + pub file_count: u64, + pub tag_count: u64, + pub namespace_count: u64, + pub total_size: u64, + pub image_size: u64, + pub database_size: u64, + pub thumbnail_size: u64, +} \ No newline at end of file From 33ceb24972e0369c85011e23f30ac9536b187d26 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 27 Dec 2021 17:36:52 +0100 Subject: [PATCH 08/13] Add missing fields for repo metadata Signed-off-by: Trivernis --- mediarepo-api/Cargo.toml | 2 +- mediarepo-api/src/types/repo.rs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml index e2135e9..94d78ce 100644 --- a/mediarepo-api/Cargo.toml +++ b/mediarepo-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mediarepo-api" -version = "0.17.0" +version = "0.18.0" edition = "2018" license = "gpl-3" diff --git a/mediarepo-api/src/types/repo.rs b/mediarepo-api/src/types/repo.rs index c17c751..d00ded5 100644 --- a/mediarepo-api/src/types/repo.rs +++ b/mediarepo-api/src/types/repo.rs @@ -11,8 +11,10 @@ pub struct RepositoryMetadata { pub file_count: u64, pub tag_count: u64, pub namespace_count: u64, + pub mapping_count: u64, + pub hash_count: u64, pub total_size: u64, - pub image_size: u64, + pub file_size: u64, pub database_size: u64, pub thumbnail_size: u64, } \ No newline at end of file From d7e12ebff7de1f1a81d8f843acd7d60721fa082c Mon Sep 17 00:00:00 2001 From: Trivernis Date: Mon, 27 Dec 2021 19:11:58 +0100 Subject: [PATCH 09/13] Increase timeout for fetching repository metadata Signed-off-by: Trivernis --- mediarepo-api/src/client_api/repo.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediarepo-api/src/client_api/repo.rs b/mediarepo-api/src/client_api/repo.rs index 6abd233..1cb17d0 100644 --- a/mediarepo-api/src/client_api/repo.rs +++ b/mediarepo-api/src/client_api/repo.rs @@ -28,7 +28,7 @@ impl RepoApi { /// Returns metadata about the repository #[tracing::instrument(level = "debug", skip(self))] pub async fn get_repo_metadata(&self) -> ApiResult { - let metadata = self.emit_and_get("repository_metadata", (), Some(Duration::from_secs(2))).await?; + let metadata = self.emit_and_get("repository_metadata", (), Some(Duration::from_secs(30))).await?; Ok(metadata) } From bb667a345d0549004608f629b18cbcc7db63e9d8 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Tue, 28 Dec 2021 12:50:40 +0100 Subject: [PATCH 10/13] Move size calculation to different api Signed-off-by: Trivernis --- mediarepo-api/Cargo.toml | 2 +- mediarepo-api/src/client_api/repo.rs | 14 ++++++++------ .../src/tauri_plugin/commands/repo.rs | 10 +++++++++- mediarepo-api/src/tauri_plugin/mod.rs | 3 ++- mediarepo-api/src/types/repo.rs | 18 ++++++++++++++---- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml index 94d78ce..76667f1 100644 --- a/mediarepo-api/Cargo.toml +++ b/mediarepo-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mediarepo-api" -version = "0.18.0" +version = "0.19.0" edition = "2018" license = "gpl-3" diff --git a/mediarepo-api/src/client_api/repo.rs b/mediarepo-api/src/client_api/repo.rs index 1cb17d0..4344323 100644 --- a/mediarepo-api/src/client_api/repo.rs +++ b/mediarepo-api/src/client_api/repo.rs @@ -3,7 +3,7 @@ use tokio::time::Duration; use crate::client_api::error::ApiResult; use crate::client_api::IPCApi; -use crate::types::repo::{FrontendState, RepositoryMetadata}; +use crate::types::repo::{FrontendState, RepositoryMetadata, SizeMetadata, SizeType}; #[derive(Clone)] pub struct RepoApi { @@ -28,17 +28,19 @@ impl RepoApi { /// Returns metadata about the repository #[tracing::instrument(level = "debug", skip(self))] pub async fn get_repo_metadata(&self) -> ApiResult { - let metadata = self.emit_and_get("repository_metadata", (), Some(Duration::from_secs(30))).await?; + self.emit_and_get("repository_metadata", (), Some(Duration::from_secs(3))).await + } - Ok(metadata) + /// Returns the size of a given type + #[tracing::instrument(level = "debug", skip(self))] + pub async fn get_size(&self, size_type: SizeType) -> ApiResult { + self.emit_and_get("size_metadata", (), Some(Duration::from_secs(30))).await } /// Returns the state of the frontend that is stored in the repo #[tracing::instrument(level = "debug", skip(self))] pub async fn get_frontend_state(&self) -> ApiResult { - let state = self.emit_and_get("frontend_state", (), Some(Duration::from_secs(5))).await?; - - Ok(state) + self.emit_and_get("frontend_state", (), Some(Duration::from_secs(5))).await } /// Sets the state of the frontend diff --git a/mediarepo-api/src/tauri_plugin/commands/repo.rs b/mediarepo-api/src/tauri_plugin/commands/repo.rs index 3545b64..956b0c3 100644 --- a/mediarepo-api/src/tauri_plugin/commands/repo.rs +++ b/mediarepo-api/src/tauri_plugin/commands/repo.rs @@ -3,7 +3,7 @@ use crate::client_api::ApiClient; use crate::tauri_plugin::commands::{ApiAccess, AppAccess, BufferAccess}; use crate::tauri_plugin::error::{PluginError, PluginResult}; use crate::tauri_plugin::settings::{save_settings, Repository}; -use crate::types::repo::{FrontendState, RepositoryMetadata}; +use crate::types::repo::{FrontendState, RepositoryMetadata, SizeMetadata, SizeType}; use serde::{Deserialize, Serialize}; use std::mem; use std::path::PathBuf; @@ -198,6 +198,14 @@ pub async fn get_repo_metadata(api_state: ApiAccess<'_>) -> PluginResult, size_type: SizeType) -> PluginResult { + let api = api_state.api().await?; + let size = api.repo.get_size(size_type).await?; + + Ok(size) +} + #[tauri::command] pub async fn get_frontend_state(api_state: ApiAccess<'_>) -> PluginResult> { let api = api_state.api().await?; diff --git a/mediarepo-api/src/tauri_plugin/mod.rs b/mediarepo-api/src/tauri_plugin/mod.rs index 4f012fc..b4c37e2 100644 --- a/mediarepo-api/src/tauri_plugin/mod.rs +++ b/mediarepo-api/src/tauri_plugin/mod.rs @@ -64,7 +64,8 @@ impl MediarepoPlugin { set_frontend_state, get_all_namespaces, get_files, - get_repo_metadata + get_repo_metadata, + get_size ]), } } diff --git a/mediarepo-api/src/types/repo.rs b/mediarepo-api/src/types/repo.rs index d00ded5..6fad584 100644 --- a/mediarepo-api/src/types/repo.rs +++ b/mediarepo-api/src/types/repo.rs @@ -13,8 +13,18 @@ pub struct RepositoryMetadata { pub namespace_count: u64, pub mapping_count: u64, pub hash_count: u64, - pub total_size: u64, - pub file_size: u64, - pub database_size: u64, - pub thumbnail_size: u64, +} + +#[derive(Serialize, Deserialize, Clone, Debug)] +pub struct SizeMetadata { + pub size_type: SizeType, + pub size: u64, +} + +#[derive(Serialize, Deserialize, Clone, Debug)] +pub enum SizeType { + Total, + FileFolder, + ThumbFolder, + DatabaseFile, } \ No newline at end of file From 60fdcb5d74d1454d38e4a4004e9313b0a87746d1 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Tue, 28 Dec 2021 13:28:31 +0100 Subject: [PATCH 11/13] Fix missing request data for size_metadata request Signed-off-by: Trivernis --- mediarepo-api/src/client_api/repo.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediarepo-api/src/client_api/repo.rs b/mediarepo-api/src/client_api/repo.rs index 4344323..51e71a8 100644 --- a/mediarepo-api/src/client_api/repo.rs +++ b/mediarepo-api/src/client_api/repo.rs @@ -34,7 +34,7 @@ impl RepoApi { /// Returns the size of a given type #[tracing::instrument(level = "debug", skip(self))] pub async fn get_size(&self, size_type: SizeType) -> ApiResult { - self.emit_and_get("size_metadata", (), Some(Duration::from_secs(30))).await + self.emit_and_get("size_metadata", size_type, Some(Duration::from_secs(30))).await } /// Returns the state of the frontend that is stored in the repo From 996d6babefa0b75baf723266dd7153414cedcff9 Mon Sep 17 00:00:00 2001 From: Julius Riegel Date: Tue, 28 Dec 2021 12:54:08 +0000 Subject: [PATCH 12/13] Create LICENSE --- mediarepo-api/LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 mediarepo-api/LICENSE diff --git a/mediarepo-api/LICENSE b/mediarepo-api/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/mediarepo-api/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From ac3bc9cffd66c869fdab72d8b5e32d10bd118626 Mon Sep 17 00:00:00 2001 From: Trivernis Date: Wed, 29 Dec 2021 15:23:14 +0100 Subject: [PATCH 13/13] Update bromine version Signed-off-by: Trivernis --- mediarepo-api/Cargo.toml | 4 ++-- mediarepo-api/src/client_api/mod.rs | 18 ++++++------------ .../src/tauri_plugin/commands/daemon.rs | 2 +- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml index 76667f1..61f9c52 100644 --- a/mediarepo-api/Cargo.toml +++ b/mediarepo-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mediarepo-api" -version = "0.19.0" +version = "0.20.0" edition = "2018" license = "gpl-3" @@ -20,7 +20,7 @@ url = {version = "^2.2.2", optional=true } pathsearch = {version="^0.2.0", optional=true} [dependencies.bromine] -version = "^0.16.2" +version = "^0.17.1" optional = true features = ["serialize_bincode"] diff --git a/mediarepo-api/src/client_api/mod.rs b/mediarepo-api/src/client_api/mod.rs index 0bc1564..62b8f93 100644 --- a/mediarepo-api/src/client_api/mod.rs +++ b/mediarepo-api/src/client_api/mod.rs @@ -19,29 +19,23 @@ pub trait IPCApi { fn namespace() -> &'static str; fn ctx(&self) -> PoolGuard; - async fn emit( - &self, - event_name: &str, - data: T, - ) -> ApiResult { + fn emit(&self, event_name: &str, data: T) -> EmitMetadata { let ctx = self.ctx(); - let meta = ctx.emit_to(Self::namespace(), event_name, data).await?; - - Ok(meta) + ctx.emit_to(Self::namespace(), event_name, data) } - async fn emit_and_get( + async fn emit_and_get( &self, event_name: &str, data: T, timeout: Option, ) -> ApiResult { - let mut meta = self.emit(event_name, data).await?; + let mut meta = self.emit(event_name, data).await_reply(); if let Some(timeout) = timeout { meta = meta.with_timeout(timeout); } - let response = meta.await_reply(&self.ctx()).await?; + let response = meta.await?; Ok(response.payload()?) } @@ -108,7 +102,7 @@ impl ApiClient { #[tracing::instrument(level = "debug", skip(self))] pub async fn info(&self) -> ApiResult { let ctx = self.ctx.acquire(); - let res = ctx.emit("info", ()).await?.await_reply(&ctx).await?; + let res = ctx.emit("info", ()).await_reply().await?; Ok(res.payload::()?) } diff --git a/mediarepo-api/src/tauri_plugin/commands/daemon.rs b/mediarepo-api/src/tauri_plugin/commands/daemon.rs index 01bff9d..6d908cd 100644 --- a/mediarepo-api/src/tauri_plugin/commands/daemon.rs +++ b/mediarepo-api/src/tauri_plugin/commands/daemon.rs @@ -57,7 +57,7 @@ async fn try_connect_daemon(address: String) -> IPCResult<()> { .address(address) .build_client() .await?; - ctx.emit("info", ()).await?.await_reply(&ctx).await?; + ctx.emit("info", ()).await_reply().await?; ctx.stop().await?; Ok(()) }