diff --git a/scanner/scanner/__init__.py b/scanner/scanner/__init__.py index 6ced183d..c13d1108 100644 --- a/scanner/scanner/__init__.py +++ b/scanner/scanner/__init__.py @@ -30,9 +30,9 @@ async def main(): logging.basicConfig(level=logging.INFO) if len(sys.argv) > 1 and sys.argv[1] == "-vv": logging.basicConfig(level=logging.DEBUG) - logging.getLogger('watchfiles').setLevel(logging.WARNING) + logging.getLogger("watchfiles").setLevel(logging.WARNING) - jsons.set_serializer(lambda x, **_: format_date(x), Optional[date | int]) # type: ignore + jsons.set_serializer(lambda x, **_: format_date(x), Optional[date | int]) # type: ignore async with ClientSession( json_serialize=lambda *args, **kwargs: jsons.dumps( *args, key_transformer=jsons.KEY_TRANSFORMER_CAMELCASE, **kwargs diff --git a/scanner/scanner/monitor.py b/scanner/scanner/monitor.py index b0485b9a..c9a5f753 100644 --- a/scanner/scanner/monitor.py +++ b/scanner/scanner/monitor.py @@ -11,7 +11,7 @@ async def monitor(path: str, scanner: Scanner): if event == Change.added: await scanner.identify(file) elif event == Change.deleted: - await scanner.delete(file); + await scanner.delete(file) elif event == Change.modified: pass else: diff --git a/scanner/scanner/scanner.py b/scanner/scanner/scanner.py index 8921cd87..e7a3e432 100644 --- a/scanner/scanner/scanner.py +++ b/scanner/scanner/scanner.py @@ -21,7 +21,9 @@ class Scanner: self._api_key = api_key self._url = os.environ.get("KYOO_URL", "http://back:5000") try: - self._ignore_pattern = re.compile(os.environ.get("LIBRARY_IGNORE_PATTERN", "")) + self._ignore_pattern = re.compile( + os.environ.get("LIBRARY_IGNORE_PATTERN", "") + ) except Exception as e: self._ignore_pattern = re.compile("") logging.error(f"Invalid ignore pattern. Ignoring. Error: {e}") diff --git a/transcoder/src/identify.rs b/transcoder/src/identify.rs index 2ce4a6f6..8994f98f 100644 --- a/transcoder/src/identify.rs +++ b/transcoder/src/identify.rs @@ -1,11 +1,11 @@ use json::JsonValue; use serde::Serialize; -use sha1::{Sha1, Digest}; +use sha1::{Digest, Sha1}; use std::{ - fs, + fs, io, path::PathBuf, process::Stdio, - str::{self, FromStr}, io, + str::{self, FromStr}, }; use tokio::process::Command; use utoipa::ToSchema; @@ -138,7 +138,6 @@ pub async fn identify(path: String) -> Result { io::copy(&mut file, &mut hasher)?; let sha = format!("{:x}", hasher.finalize()); - let general = output["media"]["track"] .members() .find(|x| x["@type"] == "General") diff --git a/transcoder/src/main.rs b/transcoder/src/main.rs index 521182be..e334d8b7 100644 --- a/transcoder/src/main.rs +++ b/transcoder/src/main.rs @@ -11,7 +11,7 @@ use utoipa::OpenApi; use crate::{ audio::*, - identify::{identify, Chapter, MediaInfo, Video, Audio, Subtitle}, + identify::{identify, Audio, Chapter, MediaInfo, Subtitle, Video}, state::Transcoder, video::*, }; @@ -104,16 +104,13 @@ async fn identify_resource( .await .map_err(|_| ApiError::NotFound)?; - identify(path) - .await - .map(|info| Json(info)) - .map_err(|e| { - eprintln!( - "Unhandled error occured while identifing the resource: {}", - e - ); - ApiError::InternalError - }) + identify(path).await.map(|info| Json(info)).map_err(|e| { + eprintln!( + "Unhandled error occured while identifing the resource: {}", + e + ); + ApiError::InternalError + }) } /// Get attachments