Creepso/multi-downloader-nx_mirror
1
0
Fork 0
mirror of https://github.com/anidl/multi-downloader-nx.git synced 2026-01-11 20:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

added new styles to CCC fix and added new var to disable all subfixes

Browse source
This commit is contained in:
stratumadev 2025-10-01 00:04:36 +02:00
parent 3fb4392b39
commit 33148eaf6d
4 changed files with 80 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
@types/crunchyTypes.d.ts vendored
View file

@ -44,6 +44,7 @@ export type CrunchyDownloadOptions = {
fontSize: number;
dubLang: string[];
// Subtitle Fix Options
noSubFix: boolean;
srtAssFix: boolean;
layoutResFix: boolean;
scaledBorderAndShadowFix: boolean;

78
crunchy.ts
View file

@ -2663,7 +2663,7 @@ export default class Crunchy implements ServiceClass {
let playResY = Number(mY?.[1]);
// Fix for Crunchyroll CCC SRT ASS
if (sBody.includes('www.closedcaptionconverter.com') && options.srtAssFix) {
if (sBody.includes('www.closedcaptionconverter.com') && options.srtAssFix && !options.noSubFix) {
playResX = 640;
playResY = 360;
@ -2671,14 +2671,68 @@ export default class Crunchy implements ServiceClass {
sBody = sBody.replace(/,,,,25.00,,/g, ',,0,0,0,,').replace('PlayDepth: 0\n', '');
// Fix fonts
if (langItem.language === 'German') {
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Arial,23,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,-1,0,0,0,100,100,0,0,1,2,0,${align},0,0,20,1`;
});
} else {
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Trebuchet MS,24,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,1,${align},0010,0010,0018,0`;
});
switch (langItem.cr_locale) {
case 'de-DE':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Arial,23,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,-1,0,0,0,100,100,0,0,1,2,0,${align},0,0,20,1`;
});
break;
case 'id-ID':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Arial,20,&H00FFFFFF,&H0000FFFF,&H00000000,&H7F404040,-1,0,0,0,100,100,0,0,1,2,1,${align},0020,0020,0022,0`;
});
break;
case 'vi-VN':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Arial Unicode MS,20,&H00FFFFFF,&H0000FFFF,&H00000000,&H7F404040,-1,0,0,0,100,100,0,0,1,2,1,${align},0020,0020,0022,0`;
});
break;
case 'ms-MY':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Arial,20,&H00FFFFFF,&H0000FFFF,&H00000000,&H7F404040,-1,0,0,0,100,100,0,0,1,2,1,${align},0020,0020,0022,0`;
});
break;
case 'th-TH':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Noto Sans Thai,30,&H00FFFFFF,&H0000FFFF,&H00000000,&H7F404040,-1,0,0,0,100,100,0,0,1,2,1,${align},0020,0020,0022,0`;
});
break;
case 'zh-CN':
case 'zh-HK':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Arial Unicode MS,20,&H00FFFFFF,&H0000FFFF,&H00000000,&H7F404040,-1,0,0,0,100,100,0,0,1,2,1,${align},0020,0020,0022,0`;
});
break;
case 'ru-RU':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Tahoma,22,&H00FFFFFF,&H000000FF,&H00000000,&H96000000,0,0,0,0,100,100,0,0,1,2,1,${align},0010,0010,0025,204`;
});
break;
case 'it-IT':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Trebuchet MS,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,0,${align},0010,0010,0015,1`;
});
break;
case 'ar-SA':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Adobe Arabic,26,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,-1,0,0,0,100,100,0,0,1,1,0,${align},0010,0010,0018,0`;
});
break;
case 'fr-FR':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Trebuchet MS,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,-1,0,0,0,100,100,0,0,1,1,1,${align},0002,0002,0025,1`;
});
break;
case 'pt-BR':
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Trebuchet MS,22,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,-1,0,0,0,100,100,0,0,1,2,1,${align},0040,0040,0015,0`;
});
break;
default:
sBody = sBody.replace(/^Style:\s*([^,]+),.*?,(\d+),0,0,0,0$/gm, (match, name, align) => {
return `Style: ${name},Trebuchet MS,24,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,1,${align},0010,0010,0018,0`;
});
break;
}
// Removing CCC credits
@ -2697,17 +2751,17 @@ export default class Crunchy implements ServiceClass {
if (!sBody.includes('www.closedcaptionconverter.com')) {
// LayoutRes Fix
if (options.layoutResFix) {
if (options.layoutResFix && !options.noSubFix) {
sBody = sBody.replace(/^(PlayResY:\s*\d+)/m, `$1\nLayoutResX: ${playResX}\nLayoutResY: ${playResY}`);
}
// ScaleBorderAndShadow Fix
if (options.scaledBorderAndShadowFix) {
if (options.scaledBorderAndShadowFix && !options.noSubFix) {
sBody = sBody.replace(/^(WrapStyle:.*)$/m, `$1\nScaledBorderAndShadow: ${options.scaledBorderAndShadow}`);
}
// Fix VLC wrong parsing if URL not avaiable
if (options.originalScriptFix) {
if (options.originalScriptFix && !options.noSubFix) {
sBody = sBody.replace(/^Original Script:.*$/gm, 'Original Script: Crunchyroll');
}
}

1
modules/module.app-args.ts
View file

@ -89,6 +89,7 @@ let argvC: {
syncTiming: boolean;
callbackMaker?: (data: DownloadInfo) => HLSCallback;
// Subtitle Fix Options
noSubFix: boolean;
srtAssFix: boolean;
layoutResFix: boolean;
scaledBorderAndShadowFix: boolean;

12
modules/module.args.ts
View file

@ -372,6 +372,18 @@ const args: TAppArg<boolean | number | string | unknown[]>[] = [
},
usage: '${sub1} ${sub2}'
},
{
name: 'noSubFix',
group: 'dl',
describe: 'Disables all subtitle fixes and downloads raw subtitles.',
docDescribe: true,
service: ['crunchy'],
type: 'boolean',
usage: '',
default: {
default: false
}
},
{
name: 'srtAssFix',
group: 'dl',