Refactor --keep into Args::Sample

src/command/args.rs

@@ -63,6 +63,10 @@ pub struct Sample {
     #[arg(long)]
     pub min_samples: Option<u64>,
 
+    /// Keep temporary files after exiting.
+    #[arg(long)]
+    pub keep: bool,
+
     /// Directory to store temporary sample data in.
     /// Defaults to using the input's directory.
     #[arg(long, env = "AB_AV1_TEMP_DIR")]

src/command/crf_search.rs

@@ -67,11 +67,6 @@ pub struct Args {
     #[arg(long)]
     pub crf_increment: Option<f32>,
 
-    // TODO refactor into Samples ArgGroup
-    /// Keep temporary files after exiting.
-    #[arg(long)]
-    pub keep: bool,
-
     /// Enable sample-encode caching.
     #[arg(
         long,
@@ -130,7 +125,6 @@ pub async fn run(
         thorough,
         sample,
         quiet,
-        keep,
         cache,
         vmaf,
     }: &Args,
@@ -152,7 +146,6 @@ pub async fn run(
         args: args.clone(),
         crf: 0.0,
         sample: sample.clone(),
-        keep: *keep,
         cache: *cache,
         stdout_format: sample_encode::StdoutFormat::Json,
         vmaf: vmaf.clone(),

src/command/sample_encode.rs

@@ -46,10 +46,6 @@ pub struct Args {
     #[clap(flatten)]
     pub sample: args::Sample,
 
-    /// Keep temporary files after exiting.
-    #[arg(long)]
-    pub keep: bool,
-
     /// Enable sample-encode caching.
     #[arg(
         long,
@@ -87,7 +83,6 @@ pub async fn run(
         args,
         crf,
         sample: sample_args,
-        keep,
         cache,
         stdout_format,
         vmaf,
@@ -103,6 +98,7 @@ pub async fn run(
     let duration = input_probe.duration.clone()?;
     let input_fps = input_probe.fps.clone()?;
     let samples = sample_args.sample_count(duration).max(1);
+    let keep = sample_args.keep;
     let temp_dir = sample_args.temp_dir;
 
     let (samples, sample_duration, full_pass) = {

src/main.rs

@@ -56,11 +56,16 @@ async fn main() -> anyhow::Result<()> {
 }
 
 impl Command {
+    // IMPORTANT: All clauses mentioned explicitly to enforce keeping this
+    // in sync with the list of commands that expose args::Sample.
     fn keep_temp_files(&self) -> bool {
         match self {
-            Self::SampleEncode(args) => args.keep,
-            Self::CrfSearch(args) => args.keep,
-            _ => false,
+            Self::SampleEncode(args) => args.sample.keep,
+            Self::CrfSearch(args) => args.sample.keep,
+            Self::AutoEncode(args) => args.search.sample.keep,
+            Self::Vmaf(_) => false,
+            Self::Encode(_) => false,
+            Self::PrintCompletions(_) => false,
         }
     }
 }