Take closed_captions api field for subtitles into account (#297)

crunchy-labs · Jan 28, 2024 · 7cf7a8e · 7cf7a8e
1 parent 3b9fc52
commit 7cf7a8e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/crunchy-cli-core/src/archive/command.rs b/crunchy-cli-core/src/archive/command.rs
@@ -301,8 +301,8 @@ async fn get_format(
         let subtitles: Vec<(Subtitle, bool)> = archive
             .subtitle
             .iter()
-            .filter_map(|s| {
-                stream
+            .flat_map(|s| {
+                let subtitles = stream
                     .subtitles
                     .get(s)
                     .cloned()
@@ -313,7 +313,13 @@ async fn get_format(
                             l,
                             single_format.audio == Locale::ja_JP || stream.subtitles.len() > 1,
                         )
-                    })
+                    });
+                let cc = stream.closed_captions.get(s).cloned().map(|l| (l, false));
+
+                subtitles
+                    .into_iter()
+                    .chain(cc.into_iter())
+                    .collect::<Vec<(Subtitle, bool)>>()
             })
             .collect();
 

diff --git a/crunchy-cli-core/src/download/command.rs b/crunchy-cli-core/src/download/command.rs
@@ -317,7 +317,12 @@ async fn get_format(
     let subtitle = if contains_hardsub {
         None
     } else if let Some(subtitle_locale) = &download.subtitle {
-        stream.subtitles.get(subtitle_locale).cloned()
+        stream
+            .subtitles
+            .get(subtitle_locale)
+            .cloned()
+            // use closed captions as fallback if no actual subtitles are found
+            .or_else(|| stream.closed_captions.get(subtitle_locale).cloned())
     } else {
         None
     };