Json

Author: qarmin

czkawka_core/i18n/en/czkawka_core.ftl

@@ -106,4 +106,5 @@ core_invalid_extension_contains_space = { $extension } is not a valid extension
 core_invalid_extension_contains_dot = { $extension } is not a valid extension because it contains dot inside
 core_ffmpeg_unknown_encoder = Cannot encode { $file } using the { $encoder } encoder. The current FFmpeg build does not support this encoder. Use a different FFmpeg version with the required codec support or select another encoder.
 core_ffmpeg_error = FFmpeg error while processing { $file }, status code { $code }, reason { $reason }
-core_custom_command_missing_path_placeholder = Custom FFmpeg command must contain {"{PATH}"} as input file placeholder
+core_custom_command_missing_path_placeholder = Custom FFmpeg command must contain {"{PATH}"} as input file placeholder
+core_custom_command_empty = Custom FFmpeg command cannot be empty

czkawka_core/src/tools/video_optimizer/core.rs

@@ -386,7 +386,7 @@ impl VideoOptimizer {
                             return None;
                         }
 
-                        match process_video(stop_flag, &entry.path.to_string_lossy(), entry.size, video_transcode_params.clone()) {
+                        match process_video(stop_flag, &entry.path.to_string_lossy(), entry.size, &video_transcode_params) {
                             Ok(_new_size) => Some(None),
                             Err(e) => Some(Some(flc!("core_failed_to_optimize_video", file = entry.path.to_string_lossy(), reason = e))),
                         }

czkawka_core/src/tools/video_optimizer/core/video_converter.rs

@@ -46,13 +46,13 @@ pub fn check_video(mut entry: VideoTranscodeEntry) -> VideoTranscodeEntry {
     entry
 }
 
-pub fn process_video(stop_flag: &Arc<AtomicBool>, video_path: &str, original_size: u64, params: VideoTranscodeFixParams) -> Result<(), String> {
+pub fn process_video(stop_flag: &Arc<AtomicBool>, video_path: &str, original_size: u64, params: &VideoTranscodeFixParams) -> Result<(), String> {
     let temp_output = Path::new(video_path).with_extension("czkawka_optimized.mp4");
 
     if let Some(ref cmd) = params.custom_ffmpeg_command {
         run_custom_command(cmd, video_path, &temp_output, stop_flag)?;
     } else {
-        run_standard_command(&params, video_path, &temp_output, stop_flag)?;
+        run_standard_command(params, video_path, &temp_output, stop_flag)?;
     }
 
     let metadata = fs::metadata(&temp_output).map_err(|e| {
@@ -124,8 +124,15 @@ fn run_custom_command(cmd: &str, video_path: &str, temp_output: &Path, stop_flag
 
     let args: Vec<String> = cmd.split_whitespace().map(|t| if t == "{PATH}" { video_path.to_string() } else { t.to_string() }).collect();
 
-    let mut command = Command::new(&args[0]);
-    command.args(&args[1..]).arg("-y").arg(temp_output);
+    let Some(first_arg) = args.first() else {
+        return Err(flc!("core_custom_command_empty"));
+    };
+    let Some(next_args) = args.get(1..) else {
+        return Err(flc!("core_custom_command_empty"));
+    };
+
+    let mut command = Command::new(first_arg);
+    command.args(next_args).arg("-y").arg(temp_output);
 
     run_ffmpeg_command(command, video_path, "custom", stop_flag, temp_output)
 }

krokiet/src/connect_row_selection.rs

@@ -999,7 +999,7 @@ mod context_menu {
                 return;
             }
             let path = row.val_str.iter().nth(path_idx).expect("path_idx out of bounds").to_string();
-            add_excluded_paths(&app.global::<Settings>(), &[path.clone()]);
+            add_excluded_paths(&app.global::<Settings>(), std::slice::from_ref(&path));
 
             // Also remove matching rows from results, keeping reference-group items.
             let mut in_reference_group = false;

krokiet/src/file_actions/connect_optimize_video.rs

@@ -177,7 +177,7 @@ impl ModelProcessor {
                     &stop_flag_clone,
                     &full_path,
                     original_size,
-                    VideoTranscodeFixParams {
+                    &VideoTranscodeFixParams {
                         codec: requested_video_codec,
                         quality: target_quality,
                         fail_if_not_smaller: fail_if_bigger,
@@ -270,12 +270,12 @@ impl ModelProcessor {
 }
 
 #[cfg(not(test))]
-fn optimize_single_video(stop_flag: &Arc<AtomicBool>, video_path: &str, original_size: u64, transcode_params: VideoTranscodeFixParams) -> Result<(), String> {
+fn optimize_single_video(stop_flag: &Arc<AtomicBool>, video_path: &str, original_size: u64, transcode_params: &VideoTranscodeFixParams) -> Result<(), String> {
     czkawka_core::tools::video_optimizer::core::process_video(stop_flag, video_path, original_size, transcode_params)
 }
 
 #[cfg(test)]
-fn optimize_single_video(_stop_flag: &Arc<AtomicBool>, video_path: &str, _original_size: u64, _transcode_params: VideoTranscodeFixParams) -> Result<(), String> {
+fn optimize_single_video(_stop_flag: &Arc<AtomicBool>, video_path: &str, _original_size: u64, _transcode_params: &VideoTranscodeFixParams) -> Result<(), String> {
     if video_path.contains("test_error") {
         return Err(format!("Test error for item: {video_path}"));
     }