Merge branch 'master' of https://github.com/stratumadev/multi-downloa…

…der-nx
anidl · Jan 7, 2025 · d0e1850 · d0e1850
2 parents 57b3daa + 104b3a4
commit d0e1850
Show file tree

Hide file tree

Showing 3 changed files with 4,142 additions and 5,137 deletions.
diff --git a/crunchy.ts b/crunchy.ts
@@ -2055,8 +2055,8 @@ export default class Crunchy implements ServiceClass {
         options.skipsubs = true;
       }
 
-      if(!options.skipsubs && options.dlsubs.indexOf('none') == -1){
-        if(pbData.meta.subtitles && Object.values(pbData.meta.subtitles).length > 0){
+      if (!options.skipsubs && options.dlsubs.indexOf('none') == -1){
+        if ((pbData.meta.subtitles && Object.values(pbData.meta.subtitles).length) || (pbData.meta.closed_captions && Object.values(pbData.meta.closed_captions).length > 0)) {
           const subsData = Object.values(pbData.meta.subtitles);
           const capsData = Object.values(pbData.meta.closed_captions);
           const subsDataMapped = subsData.map((s) => {

diff --git a/modules/module.merger.ts b/modules/module.merger.ts
@@ -168,7 +168,7 @@ class Merger {
       if (this.options.fonts) {
         let fontIndex = 0;
         for (const font of this.options.fonts) {
-          args.push(`-attach ${font.path} -metadata:s:t:${fontIndex} mimetype=${font.mime}`);
+          args.push(`-attach ${font.path} -metadata:s:t:${fontIndex} mimetype=${font.mime} -metadata:s:t:${fontIndex} filename=${font.name}`);
           fontIndex++;
         }
       }