fix: hardsubx erros

CCExtractor · Aug 9, 2023 · af70420 · af70420
1 parent 66bdb81
commit af70420
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/rust/src/main.rs b/src/rust/src/main.rs
@@ -527,31 +527,31 @@ fn main() {
             }
 
             if let Some(ref value) = args.min_sub_duration {
-                if value == 0.0 {
+                if *value == 0.0 {
                     println!("Invalid minimum subtitle duration");
                     std::process::exit(ExitCode::MalformedParameter as i32);
                 }
-                opt.hardsubx_min_sub_duration = Some(value);
+                opt.hardsubx_min_sub_duration = Some(*value);
             }
 
             if args.detect_italics {
                 opt.hardsubx_detect_italics = true;
             }
 
             if let Some(ref value) = args.conf_thresh {
-                if !(0.0..=100.0).contains(&value) {
+                if !(0.0..=100.0).contains(value) {
                     println!("Invalid confidence threshold, valid values are between 0 & 100");
                     std::process::exit(ExitCode::MalformedParameter as i32);
                 }
-                opt.hardsubx_conf_thresh = Some(value);
+                opt.hardsubx_conf_thresh = Some(*value);
             }
 
             if let Some(ref value) = args.whiteness_thresh {
-                if !(0.0..=100.0).contains(&value) {
+                if !(0.0..=100.0).contains(value) {
                     println!("Invalid whiteness threshold, valid values are between 0 & 100");
                     std::process::exit(ExitCode::MalformedParameter as i32);
                 }
-                opt.hardsubx_lum_thresh = Some(value);
+                opt.hardsubx_lum_thresh = Some(*value);
             }
         }
     } // END OF HARDSUBX

diff --git a/src/rust/src/structs.rs b/src/rust/src/structs.rs
@@ -436,8 +436,8 @@ pub struct CcxSOptions {
     pub append_mode: bool,
     pub ucla: bool,
     pub tickertext: bool,
-    pub hardsubx: Option<i32>,
-    pub hardsubx_and_common: Option<i32>,
+    pub hardsubx: bool,
+    pub hardsubx_and_common: bool,
     pub dvblang: Option<String>,
     pub ocrlang: Option<String>,
     pub ocr_oem: Option<i32>,
@@ -447,7 +447,7 @@ pub struct CcxSOptions {
     pub hardsubx_ocr_mode: Option<i32>,
     pub hardsubx_subcolor: Option<i32>,
     pub hardsubx_min_sub_duration: Option<f32>,
-    pub hardsubx_detect_italics: Option<i32>,
+    pub hardsubx_detect_italics: bool,
     pub hardsubx_conf_thresh: Option<f32>,
     pub hardsubx_hue: Option<f32>,
     pub hardsubx_lum_thresh: Option<f32>,