move logging to separate crate

Cargo.toml

@@ -8,11 +8,12 @@ members = [
     "av1an-output",
     "av1an-input",
     "av1an-cli",
+    "av1an-logging",
 ]
 resolver = "2"
 
 [workspace.package]
-version = "0.4.4"
+version = "0.4.5"
 rust-version = "1.83"
 edition = "2021"
 authors = ["Zen <[email protected]>"]

av1an-core/Cargo.toml

@@ -4,19 +4,14 @@ rust-version.workspace = true
 edition.workspace = true
 version.workspace = true
 authors.workspace = true
-description = """
-Cross-platform command-line AV1 / VP9 / HEVC / H264 encoding framework with per scene quality encoding [Core library]
-"""
+description = "Cross-platform command-line AV1 / VP9 / HEVC / H264 encoding framework with per scene quality encoding [Core library]"
 repository.workspace = true
 keywords = ["video"]
 categories = ["command-line-utilities"]
 license = "GPL-3.0"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-tracing-appender.workspace = true
-tracing.workspace = true
+av1an-logging = { path = "../av1an-logging", version = "0.4.5" }
 log = "0.4.14"
 arrayvec = "0.7.2"
 av-format = "0.7.0"
@@ -52,14 +47,10 @@ simdutf8 = "0.1.3"
 parking_lot = "0.12.0"
 cfg-if = "1.0.0"
 nom = "7.1.1"
-# TODO: move all of this CLI stuff to av1an-cli
 ansi_term = "0.12.1"
-
 tokio = { version = "1.28", features = ["full"] }
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing = { workspace = true }
 
-# TODO: https://github.com/elast0ny/affinity/issues/2
-# update this when macos support is implemented
 [target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies]
 affinity = "0.1.2"
 
@@ -73,7 +64,6 @@ package = "ffmpeg-the-third"
 version = "2.0.1"
 features = ["serialize"]
 
-
 [dependencies.vapoursynth]
 version = "0.4.0"
 features = ["vsscript-functions", "vapoursynth-functions"]

av1an-core/src/context.rs

@@ -1245,7 +1245,7 @@ impl Av1anContext {
 
         let num_frames = num_frames(Path::new(file))?;
 
-        let mut chunk = Chunk {
+        let chunk = Chunk {
             temp: self.args.temp.clone(),
             input: Input::Video {
                 path: PathBuf::from(file)

av1an-core/src/encoder.rs

@@ -7,10 +7,7 @@ use itertools::chain;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
-use crate::{
-    into_array,
-    into_vec,
-};
+use crate::{into_array, into_vec};
 
 const NULL: &str = if cfg!(windows) { "nul" } else { "/dev/null" };
 
@@ -65,7 +62,6 @@ impl Display for Encoder {
 }
 
 impl Encoder {
-    /// Composes 1st pass command for 1 pass encoding
     pub fn compose_1_1_pass(
         self,
         params: Vec<String>,

av1an-core/src/lib.rs

@@ -52,7 +52,6 @@ pub mod concat;
 pub mod context;
 pub mod encoder;
 pub mod ffmpeg;
-pub mod logging;
 pub(crate) mod parse;
 pub mod progress_bar;
 pub mod scene_detect;

av1an-logging/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "av1an-logging"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+description = "Logging functionality for av1an video encoder"
+repository.workspace = true
+
+[dependencies]
+tracing = { workspace = true }
+tracing-appender = { workspace = true }
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+once_cell = "1.8.0"

av1an-core/src/logging.rs → av1an-logging/src/lib.rs

@@ -105,37 +105,37 @@ pub fn init_logging() {
 
     // Create our subscriber with correctly ordered layers
     let subscriber = tracing_subscriber::registry()
-    // Console output layer
-    .with(
-      fmt::Layer::new()
-        // First configure all formatting
-        .with_ansi(std::io::stderr().is_terminal())
-        .with_target(true)
-        .with_thread_ids(false)
-        .with_file(false)
-        .with_line_number(false)
-        .with_level(true)
-        // Set the writer
-        .with_writer(std::io::stdout)
-        // Apply the filter last
-        .with_filter(console_filter),
-    )
-    // File output layer
-    .with(
-      fmt::Layer::new()
-        // First configure all formatting
-        .with_ansi(false)
-        .with_target(true)
-        .with_thread_ids(true)
-        .with_thread_names(true)
-        .with_file(true)
-        .with_line_number(true)
-        .with_level(true)
-        // Set the writer
-        .with_writer(non_blocking)
-        // Apply the filter last
-        .with_filter(file_filter),
-    );
+        // Console output layer
+        .with(
+            fmt::Layer::new()
+                // First configure all formatting
+                .with_ansi(std::io::stderr().is_terminal())
+                .with_target(true)
+                .with_thread_ids(false)
+                .with_file(false)
+                .with_line_number(false)
+                .with_level(true)
+                // Set the writer
+                .with_writer(std::io::stdout)
+                // Apply the filter last
+                .with_filter(console_filter),
+        )
+        // File output layer
+        .with(
+            fmt::Layer::new()
+                // First configure all formatting
+                .with_ansi(false)
+                .with_target(true)
+                .with_thread_ids(true)
+                .with_thread_names(true)
+                .with_file(true)
+                .with_line_number(true)
+                .with_level(true)
+                // Set the writer
+                .with_writer(non_blocking)
+                // Apply the filter last
+                .with_filter(file_filter),
+        );
 
     // Set as global default
     tracing::subscriber::set_global_default(subscriber)

av1an/Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 name = "av1an"
+
 authors.workspace = true
 version.workspace = true
 description = """
@@ -18,7 +19,7 @@ name = "av1an"
 path = "src/main.rs"
 
 [dependencies]
-
+av1an-logging = { path = "../av1an-logging" }
 shlex = "1.3.0"
 path_abs = "0.5.1"
 anyhow = "1.0.42"

av1an/src/main.rs

@@ -15,7 +15,6 @@ use av1an_core::{
     ffmpeg,
     hash_path,
     into_vec,
-    logging::init_logging,
     settings::{EncodeArgs, InputPixelFormat, PixelFormat},
     util::read_in_dir,
     vapoursynth,
@@ -26,6 +25,7 @@ use av1an_core::{
     SplitMethod,
     Verbosity,
 };
+use av1an_logging::init_logging;
 use clap::{value_parser, Parser};
 use path_abs::{PathAbs, PathInfo};
 use tracing::{instrument, warn};