simplify progress bar finish and consolidate dec_bar function

Author: master-of-zen

av1an-core/src/broker.rs

@@ -10,15 +10,14 @@ use cfg_if::cfg_if;
 use smallvec::SmallVec;
 use thiserror::Error;
 
-use crate::progress_bar::{dec_bar, dec_mp_bar, update_progress_bar_estimates};
+use crate::progress_bar::{dec_bar, update_progress_bar_estimates};
 use crate::settings::EncodeArgs;
 use crate::util::printable_base10_digits;
 use crate::{
-  finish_multi_progress_bar, finish_progress_bar, get_done, Chunk, DoneChunk, Instant, Verbosity,
+  finish_progress_bar, get_done, Chunk, DoneChunk, Instant,
 };
 
 pub struct Broker<'a> {
-  pub max_tries: usize,
   pub chunk_queue: Vec<Chunk>,
   pub project: &'a EncodeArgs,
 }
@@ -169,11 +168,7 @@ impl<'a> Broker<'a> {
       })
       .unwrap();
 
-      if self.project.verbosity == Verbosity::Normal {
-        finish_progress_bar();
-      } else if self.project.verbosity == Verbosity::Verbose {
-        finish_multi_progress_bar();
-      }
+      finish_progress_bar();
     }
   }
 
@@ -196,21 +191,17 @@ impl<'a> Broker<'a> {
 
     let passes = chunk.passes;
     for current_pass in 1..=passes {
-      for r#try in 1..=self.max_tries {
+      for r#try in 1..=self.project.max_tries {
         let res = self
           .project
           .create_pipes(chunk, current_pass, worker_id, padding);
         if let Err((e, frames)) = res {
-          if self.project.verbosity == Verbosity::Normal {
             dec_bar(frames);
-          } else if self.project.verbosity == Verbosity::Verbose {
-            dec_mp_bar(frames);
-          }
 
-          if r#try == self.max_tries {
+          if r#try == self.project.max_tries {
             error!(
               "[chunk {}] encoder failed {} times, shutting down worker",
-              chunk.index, self.max_tries
+              chunk.index, self.project.max_tries
             );
             return Err(e);
           }

av1an-core/src/lib.rs

@@ -44,7 +44,7 @@ use strum::{Display, EnumString, IntoStaticStr};
 use sysinfo::SystemExt;
 
 use crate::encoder::Encoder;
-use crate::progress_bar::{finish_multi_progress_bar, finish_progress_bar};
+use crate::progress_bar::finish_progress_bar;
 use crate::target_quality::TargetQuality;
 
 pub mod broker;

av1an-core/src/progress_bar.rs

@@ -145,6 +145,11 @@ pub fn dec_bar(dec: u64) {
   if let Some(pb) = PROGRESS_BAR.get() {
     pb.set_position(pb.position().saturating_sub(dec));
   }
+
+  if let Some((_, pbs)) = MULTI_PROGRESS_BAR.get() {
+    let pb = pbs.last().unwrap();
+    pb.set_position(pb.position().saturating_sub(dec));
+  }
 }
 
 pub fn update_bar_info(kbps: f64, est_size: HumanBytes) {
@@ -159,10 +164,17 @@ pub fn set_pos(pos: u64) {
   }
 }
 
+
 pub fn finish_progress_bar() {
   if let Some(pb) = PROGRESS_BAR.get() {
     pb.finish();
   }
+
+  if let Some((_, pbs)) = MULTI_PROGRESS_BAR.get() {
+    for pb in pbs.iter() {
+      pb.finish();
+    }
+  }
 }
 
 static MULTI_PROGRESS_BAR: OnceCell<(MultiProgress, Vec<ProgressBar>)> = OnceCell::new();
@@ -258,13 +270,6 @@ pub fn inc_mp_bar(inc: u64) {
   }
 }
 
-pub fn dec_mp_bar(dec: u64) {
-  if let Some((_, pbs)) = MULTI_PROGRESS_BAR.get() {
-    let pb = pbs.last().unwrap();
-    pb.set_position(pb.position().saturating_sub(dec));
-  }
-}
-
 pub fn update_mp_bar_info(kbps: f64, est_size: HumanBytes) {
   if let Some((_, pbs)) = MULTI_PROGRESS_BAR.get() {
     pbs
@@ -274,14 +279,6 @@ pub fn update_mp_bar_info(kbps: f64, est_size: HumanBytes) {
   }
 }
 
-pub fn finish_multi_progress_bar() {
-  if let Some((_, pbs)) = MULTI_PROGRESS_BAR.get() {
-    for pb in pbs.iter() {
-      pb.finish();
-    }
-  }
-}
-
 pub fn update_progress_bar_estimates(frame_rate: f64, total_frames: usize, verbosity: Verbosity) {
   let completed_frames: usize = get_done()
     .done

av1an-core/src/settings.rs

@@ -30,17 +30,17 @@ use crate::concat::{self, ConcatMethod};
 use crate::ffmpeg::{compose_ffmpeg_pipe, num_frames};
 use crate::parse::valid_params;
 use crate::progress_bar::{
-  finish_progress_bar, inc_bar, inc_mp_bar, init_multi_progress_bar, init_progress_bar,
+  inc_bar, inc_mp_bar, init_multi_progress_bar, init_progress_bar,
   reset_bar_at, reset_mp_bar_at, set_audio_size, update_mp_chunk, update_mp_msg,
-  update_progress_bar_estimates,
+  update_progress_bar_estimates, finish_progress_bar,
 };
 use crate::scene_detect::av_scenechange_detect;
 use crate::scenes::{Scene, ZoneOptions};
 use crate::split::{extra_splits, segment, write_scenes_to_file};
 use crate::vapoursynth::{create_vs_file, is_ffms2_installed, is_lsmash_installed};
 use crate::vmaf::{self, validate_libvmaf};
 use crate::{
-  create_dir, determine_workers, finish_multi_progress_bar, get_done, init_done, into_vec,
+  create_dir, determine_workers, get_done, init_done, into_vec,
   read_chunk_queue, save_chunk_queue, ChunkMethod, ChunkOrdering, DashMap, DoneJson, Encoder,
   Input, ScenecutMethod, SplitMethod, TargetQuality, Verbosity,
 };
@@ -1295,7 +1295,6 @@ properly into a mkv file. Specify mkvmerge as the concatenation method by settin
       let broker = Broker {
         chunk_queue,
         project: self,
-        max_tries: self.max_tries,
       };
 
       let (tx, rx) = mpsc::channel();
@@ -1311,11 +1310,7 @@ properly into a mkv file. Specify mkvmerge as the concatenation method by settin
 
       handle.join().unwrap();
 
-      if self.verbosity == Verbosity::Normal {
-        finish_progress_bar();
-      } else if self.verbosity == Verbosity::Verbose {
-        finish_multi_progress_bar();
-      }
+      finish_progress_bar();
 
       // TODO add explicit parameter to concatenation functions to control whether audio is also muxed in
       let _audio_output_exists =