improve command line utility (#119)

* improve commandline utility

* dont put priority for wasm

* Update src/main.rs

Co-authored-by: Ivan Siutsou <[email protected]>
Signed-off-by: Kristof Roomp <[email protected]>

* update rust.yml

* fix platform cross compile

* add max file size as configurable

---------

Signed-off-by: Kristof Roomp <[email protected]>
Co-authored-by: Ivan Siutsou <[email protected]>

.github/workflows/rust.yml

@@ -18,19 +18,21 @@ jobs:
     - uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: stable
-        targets: wasm32-wasi,aarch64-unknown-linux-musl,x86_64-pc-windows-msvc,x86_64-unknown-linux-gnu
+        targets: wasm32-wasip1,aarch64-unknown-linux-musl,x86_64-pc-windows-msvc,x86_64-unknown-linux-gnu
         components: rustfmt,clippy
 
     - name: Build default target
       run: cargo build --locked 
-    - name: Build wasm32-wasi
-      run: cargo build --locked --target wasm32-wasi --lib
+    - name: Build wasm32-wasip1
+      run: cargo build --locked --target wasm32-wasip1 --lib
     - name: Build aarch64-unknown-linux-musl
       run: cargo build --locked --target aarch64-unknown-linux-musl --lib
     - name: Build x86_64-pc-windows-msvc
       run: cargo build --locked --target x86_64-pc-windows-msvc --lib
     - name: Run tests
       run: cargo test --locked
+    - name: Run tests (use_rayon)
+      run: cargo test --locked --features use_rayon
     - name: Check formatting
       run: cargo fmt --check
 

Cargo.toml

@@ -38,10 +38,15 @@ simple_logger ="5.0"
 unroll = "0.1"
 rayon-core = { version = "1", optional = true }
 git-version = "0.3"
+pico-args = "0.5"
 
-[target.'cfg(windows)'.dependencies]
+[target.'cfg(target_os = "windows")'.dependencies]
 cpu-time = "1.0"
-thread-priority = "1.0.0"
+thread-priority = "1.0"
+
+[target.'cfg(target_os = "linux")'.dependencies]
+cpu-time = "1.0"
+thread-priority = "1.0"
 
 [dev-dependencies]
 rstest = "0.22"

src/consts.rs

@@ -78,7 +78,7 @@ pub const MAX_THREADS: usize = 8;
 pub const RESIDUAL_NOISE_FLOOR: usize = 7;
 
 pub const LEPTON_VERSION: u8 = 1; // Lepton version, same as used by Lepton C++ since we support the same format
-pub const MAX_FILE_SIZE_BYTES: i32 = 128 * 1024 * 1024;
+
 //pub const LogMaxNumerator : i32 = 18;
 //pub const DefaultEncodingThreads : usize = 8;
 pub const SMALL_FILE_BYTES_PER_ENCDOING_THREAD: usize = 125000;

src/enabled_features.rs

@@ -24,6 +24,9 @@ pub struct EnabledFeatures {
 
     /// number of threads used for encoding/decoding
     pub max_threads: u32,
+
+    /// maximum size of a jpeg file
+    pub max_jpeg_file_size: u32,
 }
 
 impl EnabledFeatures {
@@ -39,6 +42,7 @@ impl EnabledFeatures {
             use_16bit_adv_predict: true,
             accept_invalid_dht: false,
             max_threads: 8,
+            max_jpeg_file_size: 128 * 1024 * 1024,
         }
     }
 
@@ -55,6 +59,7 @@ impl EnabledFeatures {
             use_16bit_adv_predict: false,
             accept_invalid_dht: true,
             max_threads: 8,
+            max_jpeg_file_size: 128 * 1024 * 1024,
         }
     }
 
@@ -71,6 +76,7 @@ impl EnabledFeatures {
             use_16bit_adv_predict: true,
             accept_invalid_dht: true,
             max_threads: 8,
+            max_jpeg_file_size: 128 * 1024 * 1024,
         }
     }
 }

src/lepton_error.rs

@@ -157,6 +157,15 @@ impl From<TryFromIntError> for LeptonError {
     }
 }
 
+impl From<pico_args::Error> for LeptonError {
+    #[track_caller]
+    fn from(e: pico_args::Error) -> Self {
+        let mut e = LeptonError::new(ExitCode::SyntaxError, e.to_string().as_str());
+        e.add_context();
+        e
+    }
+}
+
 impl<T> From<std::sync::mpsc::SendError<T>> for LeptonError {
     #[track_caller]
     fn from(e: std::sync::mpsc::SendError<T>) -> Self {

src/lib.rs

@@ -22,6 +22,21 @@ pub use metrics::Metrics;
 
 use crate::lepton_error::{AddContext, Result};
 
+#[cfg(not(feature = "use_rayon"))]
+pub fn set_thread_priority(priority: i32) {
+    #[cfg(any(target_os = "windows", target_os = "linux"))]
+    {
+        let p = match priority {
+            100 => thread_priority::ThreadPriority::Max,
+            0 => thread_priority::ThreadPriority::Min,
+            _ => panic!("Unsupported thread priority value: {}", priority),
+        };
+
+        thread_priority::set_current_thread_priority(p).unwrap();
+        crate::structs::simple_threadpool::set_thread_priority(p);
+    }
+}
+
 /// Decodes Lepton container and recreates the original JPEG file
 pub fn decode_lepton<R: BufRead, W: Write>(
     reader: &mut R,