Develop

.github/workflows/check.yml

@@ -36,7 +36,15 @@ jobs:
 
  - name: Check daemon
  working-directory: mediarepo-daemon
- run: cargo check --no-default-features
+ run: cargo check
+
+ - name: Lint api
+ working-directory: mediarepo-api
+ run: cargo clippy -- -D warnings
+
+ - name: Lint daemon
+ working-directory: mediarepo-daemon
+ run: cargo clippy -- -D warnings
 
  - name: Install UI dependencies
  working-directory: mediarepo-ui
@@ -47,4 +55,4 @@ jobs:
 
  - name: Lint ui frontend
  working-directory: mediarepo-ui
- run: yarn lint
+ run: yarn lint

mediarepo-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mediarepo-api"
-version = "0.32.0"
+version = "0.32.1"
 edition = "2018"
 license = "gpl-3"
 

mediarepo-api/src/client_api/job.rs

@@ -34,4 +34,10 @@ impl JobApi {
 
  Ok(())
  }
+
+ /// Checks if a particular job is already running
+ #[tracing::instrument(level = "debug", skip(self))]
+ pub async fn is_job_running(&self, job_type: JobType) -> ApiResult<bool> {
+ self.emit_and_get("is_job_running", job_type, None).await
+ }
 }

mediarepo-api/src/tauri_plugin/commands/job.rs

@@ -9,3 +9,11 @@ pub async fn run_job(api_state: ApiAccess<'_>, job_type: JobType, sync: bool) ->
 
  Ok(())
 }
+
+#[tauri::command]
+pub async fn is_job_running(api_state: ApiAccess<'_>, job_type: JobType) -> PluginResult<bool> {
+ let api = api_state.api().await?;
+ let running = api.job.is_job_running(job_type).await?;
+
+ Ok(running)
+}

mediarepo-api/src/tauri_plugin/mod.rs

@@ -75,7 +75,8 @@ impl<R: Runtime> MediarepoPlugin<R> {
  get_file_tag_map,
  all_sorting_presets,
  add_sorting_preset,
- delete_sorting_preset
+ delete_sorting_preset,
+ is_job_running
  ]),
  }
  }

mediarepo-daemon/Cargo.toml

@@ -4,7 +4,7 @@ default-members = ["mediarepo-core", "mediarepo-database", "mediarepo-logic", "m
 
 [package]
 name = "mediarepo-daemon"
-version = "1.0.3"
+version = "1.0.4"
 edition = "2018"
 license = "gpl-3"
 repository = "https://github.com/Trivernis/mediarepo-daemon"
@@ -30,6 +30,7 @@ log = "0.4.16"
 opentelemetry = { version = "0.17.0", features = ["rt-tokio"] }
 opentelemetry-jaeger = { version = "0.16.0", features = ["rt-tokio"] }
 tracing-opentelemetry = "0.17.2"
+human-panic = "1.0.3"
 
 [dependencies.mediarepo-core]
 path = "./mediarepo-core"

mediarepo-daemon/mediarepo-core/src/fs/thumbnail_store.rs

@@ -71,7 +71,7 @@ impl ThumbnailStore {
  let name = file_name.to_string_lossy();
 
  let (height, width) = name
- .split_once("-")
+ .split_once('-')
  .and_then(|(height, width)| {
  Some((height.parse::<u32>().ok()?, width.parse::<u32>().ok()?))
  })

mediarepo-daemon/mediarepo-core/src/settings/logging.rs

@@ -34,6 +34,7 @@ pub enum LogLevel {
  Trace,
 }
 
+#[allow(clippy::from_over_into)]
 impl Into<Option<Level>> for LogLevel {
  fn into(self) -> Option<Level> {
  match self {

mediarepo-daemon/mediarepo-core/src/settings/mod.rs

@@ -1,5 +1,5 @@
 use std::fs;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use config::{Config, FileFormat};
 use serde::{Deserialize, Serialize};
@@ -24,7 +24,7 @@ pub struct Settings {
 }
 
 impl Settings {
- pub fn read(root: &PathBuf) -> RepoResult<Self> {
+ pub fn read(root: &Path) -> RepoResult<Self> {
  let settings = Config::builder()
  .add_source(config::File::from_str(
  &*Settings::default().to_toml_string()?,
@@ -44,7 +44,7 @@ impl Settings {
  settings_main.server.tcp.enabled = true;
  settings_main.server.tcp.port = PortSetting::Range(settings_v1.port_range);
  settings_main.server.tcp.listen_address = settings_v1.listen_address;
- settings_main.paths.thumbnail_directory = settings_v1.thumbnail_store.into();
+ settings_main.paths.thumbnail_directory = settings_v1.thumbnail_store;
  settings_main.paths.database_directory = PathBuf::from(settings_v1.database_path)
  .parent()
  .map(|p| p.to_string_lossy().to_string())
@@ -69,7 +69,7 @@ impl Settings {
  Ok(string)
  }
 
- pub fn save(&self, root: &PathBuf) -> RepoResult<()> {
+ pub fn save(&self, root: &Path) -> RepoResult<()> {
  let string = toml::to_string_pretty(&self)?;
  fs::write(root.join("repo.toml"), string.into_bytes())?;
 

mediarepo-daemon/mediarepo-core/src/settings/paths.rs

@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use serde::{Deserialize, Serialize};
 
@@ -21,27 +21,27 @@ impl Default for PathSettings {
 
 impl PathSettings {
  #[inline]
- pub fn database_dir(&self, root: &PathBuf) -> PathBuf {
+ pub fn database_dir(&self, root: &Path) -> PathBuf {
  root.join(&self.database_directory)
  }
 
  #[inline]
- pub fn files_dir(&self, root: &PathBuf) -> PathBuf {
+ pub fn files_dir(&self, root: &Path) -> PathBuf {
  root.join(&self.files_directory)
  }
 
  #[inline]
- pub fn thumbs_dir(&self, root: &PathBuf) -> PathBuf {
+ pub fn thumbs_dir(&self, root: &Path) -> PathBuf {
  root.join(&self.thumbnail_directory)
  }
 
  #[inline]
- pub fn db_file_path(&self, root: &PathBuf) -> PathBuf {
+ pub fn db_file_path(&self, root: &Path) -> PathBuf {
  self.database_dir(root).join("repo.db")
  }
 
  #[inline]
- pub fn frontend_state_file_path(&self, root: &PathBuf) -> PathBuf {
+ pub fn frontend_state_file_path(&self, root: &Path) -> PathBuf {
  self.database_dir(root).join("frontend-state.json")
  }
 }

mediarepo-daemon/mediarepo-core/src/tracing_layer_list.rs

@@ -7,9 +7,15 @@ use tracing_subscriber::Layer;
 
 pub struct DynLayerList<S>(Vec<Box<dyn Layer<S> + Send + Sync + 'static>>);
 
+impl<S> Default for DynLayerList<S> {
+ fn default() -> Self {
+ Self(Vec::new())
+ }
+}
+
 impl<S> DynLayerList<S> {
  pub fn new() -> Self {
- Self(Vec::new())
+ Self::default()
  }
 
  pub fn iter(&self) -> Iter<'_, Box<dyn Layer<S> + Send + Sync>> {