Merge pull request #20 from nanashi-1/add-parallelism

Add parallelism
nanashi-1 · May 7, 2024 · 9e386ac · 9e386ac
2 parents 27e0c0a + d111e08
commit 9e386ac
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 16 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,6 +17,7 @@ path = "src/cli/main.rs"
 
 [dependencies]
 clap = { version = "4.4.10", features = ["derive"] }
+rayon = "1.10.0"
 rsubs-lib = "0.1.8"
 serde = "1.0.188"
 serde_json = "1.0.105"

diff --git a/src/cli/compiler.rs b/src/cli/compiler.rs
@@ -4,6 +4,7 @@ use bilibili_extractor_lib::combiner::Combinable;
 use bilibili_extractor_lib::error::Result;
 use bilibili_extractor_lib::metadata::{EpisodeId, EpisodeMetadata, SeasonMetadata};
 use bilibili_extractor_lib::subtitle::{JsonSubtitle, SubtitleFormat};
+use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use rsubs_lib::srt::SRTFile;
 use rsubs_lib::vtt::VTTFile;
 use std::fs::{read_to_string, rename};
@@ -54,17 +55,27 @@ impl Compiler {
     }
 
     pub fn compile_normal_episodes(&self, episodes: Vec<&EpisodeMetadata>) -> Result<()> {
-        episodes
-            .iter()
-            .try_for_each(|e| self.compile_normal_episode(e))?;
+        match self.context.is_parallel {
+            true => episodes
+                .par_iter()
+                .try_for_each(|e| self.compile_normal_episode(e))?,
+            false => episodes
+                .iter()
+                .try_for_each(|e| self.compile_normal_episode(e))?,
+        };
 
         Ok(())
     }
 
     pub fn compile_special_episodes(&self, episodes: Vec<&EpisodeMetadata>) -> Result<()> {
-        episodes
-            .iter()
-            .try_for_each(|e| self.compile_special_episode(e))?;
+        match self.context.is_parallel {
+            true => episodes
+                .par_iter()
+                .try_for_each(|e| self.compile_special_episode(e))?,
+            false => episodes
+                .iter()
+                .try_for_each(|e| self.compile_special_episode(e))?,
+        };
 
         Ok(())
     }
@@ -79,10 +90,13 @@ impl Compiler {
             SubtitleFormat::get_episode_subtitle_type(episode, &self.context.language)?
         );
 
-        let mut spinner = create_spinner(&format!(
-            "Compiling {} EP{:0>2}...",
-            episode.title, episode.episode
-        ));
+        let mut spinner = match self.context.is_parallel {
+            true => create_spinner("Compiling episodes in parallel..."),
+            false => create_spinner(&format!(
+                "Compiling {} EP{:0>2}...",
+                episode.title, episode.episode
+            )),
+        };
 
         let subtitle_path = episode.get_subtitle_path(&self.context.language)?;
         let binding = episode.path.join("subtitle.ass");
@@ -128,10 +142,10 @@ impl Compiler {
             SubtitleFormat::get_episode_subtitle_type(episode, &self.context.language)?
         );
 
-        let mut spinner = create_spinner(&format!(
-            "Compiling {} {}...",
-            episode.title, episode.episode
-        ));
+        let mut spinner = match self.context.is_parallel {
+            true => create_spinner("Compiling episodes in parallel..."),
+            false => create_spinner(&format!("Compiling {} {}", episode.title, episode.episode)),
+        };
 
         let subtitle_path = episode.get_subtitle_path(&self.context.language)?;
         let binding = episode.path.join("subtitle.ass");

diff --git a/src/cli/lister.rs b/src/cli/lister.rs
@@ -60,7 +60,7 @@ impl Lister {
         #[cfg(not(debug_assertions))]
         episodes
             .iter()
-            .for_each(|e| println!("        {} EP{:0>2}", e.title, e.episode));
+            .for_each(|e| println!("        {} {}", e.title, e.episode.get_full_display()));
 
         #[cfg(debug_assertions)]
         episodes.iter().for_each(|e| {
@@ -77,7 +77,7 @@ impl Lister {
         #[cfg(not(debug_assertions))]
         episodes
             .iter()
-            .for_each(|e| println!("        {} {}", e.title, e.episode_name));
+            .for_each(|e| println!("        {} {}", e.title, e.episode.get_full_display()));
 
         #[cfg(debug_assertions)]
         episodes.iter().for_each(|e| {

diff --git a/src/cli/main.rs b/src/cli/main.rs
@@ -20,6 +20,7 @@ pub struct Context {
     pub subtitle_type: SubtitleType,
     pub packager: Packager,
     pub input_path: String,
+    pub is_parallel: bool,
 }
 
 #[derive(Parser)]
@@ -52,6 +53,9 @@ enum SubCommands {
 
         #[clap(long, help = "Set language for the subtitle.")]
         use_hard_subtitle: bool,
+
+        #[clap(long, short, help = "Compile episodes in parallel.")]
+        parallel: bool,
     },
 }
 
@@ -110,6 +114,7 @@ fn main() {
             copy,
             language,
             use_hard_subtitle,
+            parallel,
         } => {
             let context = Context {
                 language,
@@ -122,6 +127,7 @@ fn main() {
                     config: PackagerConfig { copy },
                 },
                 input_path: input,
+                is_parallel: parallel,
             };
 
             #[cfg(debug_assertions)]