feat: add precise cut controls

Author: jely2002

src-tauri/src/models/download.rs

@@ -121,6 +121,7 @@ pub struct OutputOverrides {
   pub add_metadata: Option<bool>,
   pub add_thumbnail: Option<bool>,
   pub save_thumbnail: Option<bool>,
+  pub precise_cuts: Option<bool>,
   pub file_name_template: Option<String>,
   pub audio_file_name_template: Option<String>,
   pub restrict_filenames: Option<bool>,

src-tauri/src/runners/override_resolver.rs

@@ -74,6 +74,7 @@ impl ApplyPatch<OutputSettings> for OutputOverrides {
     apply_copy_patch!(self, target, add_metadata);
     apply_copy_patch!(self, target, add_thumbnail);
     apply_copy_patch!(self, target, save_thumbnail);
+    apply_copy_patch!(self, target, precise_cuts);
     apply_clone_patch!(self, target, file_name_template);
     apply_clone_patch!(self, target, audio_file_name_template);
     apply_copy_patch!(self, target, restrict_filenames);

src-tauri/src/runners/ytdlp_args.rs

@@ -365,8 +365,10 @@ pub fn build_output_args(
   if partial_download.is_some_and(|value| value.section.is_some()) {
     // Embedding chapters breaks the video when downloading a section, as the chapter metadata track is longer than the video.
     args.push("--no-embed-chapters".into());
-    // Ensure we don't get black screens or missing audio.
-    args.push("--force-keyframes-at-cuts".into());
+    if output_settings.precise_cuts {
+      // Ensure we don't get black screens or missing audio when precise cuts are explicitly requested.
+      args.push("--force-keyframes-at-cuts".into());
+    }
   }
 
   Ok(args)
@@ -1216,6 +1218,32 @@ mod tests {
 
     assert!(args.contains(&"--download-sections".to_string()));
     assert!(args.contains(&"--no-embed-chapters".to_string()));
+    assert!(!args.contains(&"--force-keyframes-at-cuts".to_string()));
+    assert_eq!(
+      args
+        .windows(2)
+        .filter(|pair| pair[0] == "--download-sections")
+        .map(|pair| pair[1].clone())
+        .collect::<Vec<_>>(),
+      vec!["*00:01:30-00:02:45".to_string()],
+    );
+  }
+
+  #[test]
+  fn partial_download_precise_cuts_add_force_keyframes_at_cuts() {
+    let format_options = make_video_format_options(Some(720), Some(60));
+    let mut settings = OutputSettings::default();
+    settings.precise_cuts = true;
+    let partial_download = PartialDownloadOverride {
+      section: Some(DownloadSection {
+        id: "a".into(),
+        start: "00:01:30".into(),
+        end: "00:02:45".into(),
+      }),
+    };
+
+    let args = build_output_args(&format_options, &settings, Some(&partial_download)).unwrap();
+
     assert!(args.contains(&"--force-keyframes-at-cuts".to_string()));
     assert_eq!(
       args

src-tauri/src/runners/ytdlp_runner.rs

@@ -160,7 +160,13 @@ impl<'a> YtdlpRunner<'a> {
       &self.cfg.sponsor_block,
       overrides.and_then(|value| value.sponsor_block.as_ref()),
     );
-    self.args.extend(build_sponsorblock_args(&sponsor_block));
+    let output_settings = resolve_with_patch(
+      &self.cfg.output,
+      overrides.and_then(|value| value.output.as_ref()),
+    );
+    self
+      .args
+      .extend(build_sponsorblock_args(&sponsor_block, output_settings.precise_cuts));
 
     self
   }
@@ -453,19 +459,18 @@ fn normalize_extractor_args(value: &str) -> Option<String> {
   }
 }
 
-fn build_sponsorblock_args(settings: &SponsorBlockSettings) -> Vec<String> {
+fn build_sponsorblock_args(settings: &SponsorBlockSettings, precise_cuts: bool) -> Vec<String> {
   let mut args = Vec::new();
 
   if let Some(api_url) = &settings.api_url {
     args.extend_from_slice(&["--sponsorblock-api".into(), api_url.clone()]);
   }
 
   if !settings.remove_parts.is_empty() {
-    args.extend_from_slice(&[
-      "--sponsorblock-remove".into(),
-      settings.remove_parts.join(","),
-      "--force-keyframes-at-cuts".into(),
-    ]);
+    args.extend_from_slice(&["--sponsorblock-remove".into(), settings.remove_parts.join(",")]);
+    if precise_cuts {
+      args.push("--force-keyframes-at-cuts".into());
+    }
   }
 
   if !settings.mark_parts.is_empty() {
@@ -702,19 +707,28 @@ mod tests {
   }
 
   #[test]
-  fn sponsorblock_remove_adds_force_keyframes_at_cuts() {
+  fn sponsorblock_remove_omits_force_keyframes_at_cuts_by_default() {
     let settings = SponsorBlockSettings {
       remove_parts: vec!["sponsor".into(), "intro".into()],
       ..Default::default()
     };
 
     assert_eq!(
-      build_sponsorblock_args(&settings),
-      vec![
-        "--sponsorblock-remove",
-        "sponsor,intro",
-        "--force-keyframes-at-cuts",
-      ]
+      build_sponsorblock_args(&settings, false),
+      vec!["--sponsorblock-remove", "sponsor,intro"]
+    );
+  }
+
+  #[test]
+  fn sponsorblock_remove_precise_cuts_add_force_keyframes_at_cuts() {
+    let settings = SponsorBlockSettings {
+      remove_parts: vec!["sponsor".into(), "intro".into()],
+      ..Default::default()
+    };
+
+    assert_eq!(
+      build_sponsorblock_args(&settings, true),
+      vec!["--sponsorblock-remove", "sponsor,intro", "--force-keyframes-at-cuts"]
     );
   }
 

src-tauri/src/state/config_models.rs

@@ -128,6 +128,7 @@ pub struct OutputSettings {
   pub add_metadata: bool,
   pub add_thumbnail: bool,
   pub save_thumbnail: bool,
+  pub precise_cuts: bool,
   pub download_dir: Option<String>,
   pub file_name_template: String,
   pub audio_file_name_template: String,
@@ -142,6 +143,7 @@ impl Default for OutputSettings {
       add_metadata: true,
       add_thumbnail: true,
       save_thumbnail: false,
+      precise_cuts: false,
       download_dir: None,
       file_name_template: "%(title).200s-(%(height)sp%(fps).0d).%(ext)s".into(),
       audio_file_name_template: "%(title).200s-(%(abr)dk).%(ext)s".into(),

src/components/media-view/TheOutputPreferences.vue

@@ -6,7 +6,7 @@
         :badge="t('media.preferences.badges.override')"
         :label="t('media.preferences.labels.output')"
       >
-        <output-settings-editor v-model="outputState" id-prefix="override">
+        <output-settings-editor v-model="outputState" id-prefix="override" :show-precise-cuts="false">
           <template #video-extra>
             <label class="mb-2 mt-4 font-semibold" for="video-file-template">
               {{ t('location.filename.outputFormat.label') }}
@@ -59,6 +59,20 @@
                 :duration-seconds="durationSeconds"
               />
             </base-fieldset>
+            <div class="flex max-w-xl flex-col gap-1">
+              <label class="font-semibold" for="override-precise-cuts">
+                {{ t('settings.output.preciseCuts.label') }}
+              </label>
+              <input
+                id="override-precise-cuts"
+                v-model="outputState.preciseCuts"
+                type="checkbox"
+                class="toggle toggle-primary my-1"
+              />
+              <p class="label whitespace-pre-line">
+                {{ t('settings.output.preciseCuts.hint') }}
+              </p>
+            </div>
           </template>
         </output-settings-editor>
       </base-fieldset>
@@ -133,6 +147,7 @@ const outputOverride = computed<DownloadOverrides['output'] | undefined>(() => {
       addThumbnail: outputState.value.addThumbnail,
       saveThumbnail: outputState.value.saveThumbnail,
       addMetadata: outputState.value.addMetadata,
+      preciseCuts: outputState.value.preciseCuts,
       restrictFilenames: outputState.value.restrictFilenames,
     },
     {
@@ -141,6 +156,7 @@ const outputOverride = computed<DownloadOverrides['output'] | undefined>(() => {
       addThumbnail: global.addThumbnail,
       saveThumbnail: global.saveThumbnail,
       addMetadata: global.addMetadata,
+      preciseCuts: global.preciseCuts,
       restrictFilenames: global.restrictFilenames,
     },
   );

src/components/output/OutputSettingsEditor.vue

@@ -179,6 +179,21 @@
       </p>
     </div>
 
+    <div v-if="showPreciseCuts" class="mb-4 flex flex-col gap-1">
+      <label class="font-semibold" :for="fieldId('precise-cuts')">
+        {{ t('settings.output.preciseCuts.label') }}
+      </label>
+      <input
+          :id="fieldId('precise-cuts')"
+          type="checkbox"
+          v-model="outputState.preciseCuts"
+          class="toggle toggle-primary my-1"
+      />
+      <p class="label whitespace-pre-line">
+        {{ t('settings.output.preciseCuts.hint') }}
+      </p>
+    </div>
+
     <slot name="after-common" />
   </div>
 </template>
@@ -206,6 +221,11 @@ const { idPrefix } = defineProps({
     required: false,
     default: '',
   },
+  showPreciseCuts: {
+    type: Boolean,
+    required: false,
+    default: true,
+  },
 });
 
 const { t } = useI18n();

src/components/settings/SettingsSponsorBlock.vue

@@ -54,6 +54,20 @@
         v-model="settings.sponsorBlock.apiUrl"
         placeholder="https://sponsor.ajay.app"
     />
+    <div class="mt-4 flex flex-col gap-1">
+      <label class="font-semibold" for="sponsorblockPreciseCuts">
+        {{ t('settings.sponsorBlock.preciseCuts.label') }}
+      </label>
+      <input
+          id="sponsorblockPreciseCuts"
+          v-model="settings.output.preciseCuts"
+          type="checkbox"
+          class="toggle toggle-primary my-1"
+      />
+      <p class="label whitespace-pre-line">
+        {{ t('settings.sponsorBlock.preciseCuts.hint') }}
+      </p>
+    </div>
   </base-fieldset>
 </template>
 

src/locales/en.json

@@ -518,6 +518,10 @@
         "label": "Add title & artist info:",
         "hint": "Save metadata such as title, uploader/artist and description inside the file."
       },
+      "preciseCuts": {
+        "label": "Precise cut:",
+        "hint": "Cuts at exact frames instead of nearby keyframes. Very slow.\nEnable only if normal cuts are wrong, garbled, or have black/missing segments."
+      },
       "partialDownload": {
         "legend": "Partial download",
         "hint": "Set timestamps or chapters to download only some parts.",
@@ -674,7 +678,11 @@
         "placeholder": "Select 1 or more parts to mark with a chapter."
       },
       "apiUrl": {
-        "label": "API URL"
+        "label": "API URL:"
+      },
+      "preciseCuts": {
+        "label": "Precise cut:",
+        "hint": "Makes SponsorBlock removals and partial downloads cut at exact frames. Very slow.\nEnable only if normal cuts are wrong, garbled, or have black/missing segments."
       },
       "parts": {
         "sponsor": {

src/tauri/types/config.ts

@@ -76,6 +76,7 @@ export interface OutputSettings {
   addMetadata: boolean;
   addThumbnail: boolean;
   saveThumbnail: boolean;
+  preciseCuts: boolean;
   downloadDir: string | null;
   fileNameTemplate: string;
   audioFileNameTemplate: string;
@@ -185,6 +186,7 @@ export const defaultOutputSettings: OutputSettings = {
   addMetadata: true,
   addThumbnail: true,
   saveThumbnail: false,
+  preciseCuts: false,
   downloadDir: null,
   fileNameTemplate: '%(title).200s-(%(height)sp%(fps).0d).%(ext)s',
   audioFileNameTemplate: '%(title).200s-(%(abr)dk).%(ext)s',