Creepso/multi-downloader-nx
1
0
Fork 0
Code Issues 38 Pull requests 10 Projects Releases 70 Packages Wiki Activity Actions

CC for Crunchyroll

Browse source
This commit is contained in:
Izuco 2022-07-05 23:03:19 +02:00
parent b8432270b6
commit 7e67a8f61a
No known key found for this signature in database
GPG key ID: E9CBE9E4EF3A1BFA
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,8 @@ export type DownloadedMedia = {
lang: LanguageItem,
path: string
} | ({
type: 'Subtitle'
type: 'Subtitle',
cc: boolean
} & sxItem )
export type ParseItem = {

12
crunchy.ts
View file

@ -1185,7 +1185,6 @@ export default class Crunchy implements ServiceClass {
options.skipsubs = true;
}
if(!options.skipsubs && options.dlsubs.indexOf('none') == -1){
if(pbData.subtitles && Object.values(pbData.subtitles).length > 0){
const subsData = Object.values(pbData.subtitles);
@ -1203,9 +1202,10 @@ export default class Crunchy implements ServiceClass {
const langItem = subsItem.locale;
const sxData: Partial<sxItem> = {};
sxData.language = langItem;
sxData.file = langsData.subsFile(fileName as string, subsIndex, langItem);
const isCC = langItem.code === audDub
sxData.file = langsData.subsFile(fileName as string, subsIndex, langItem, isCC);
sxData.path = path.join(this.cfg.dir.content, sxData.file);
if (files.some(a => a.type === 'Subtitle' && (a.language.cr_locale == langItem.cr_locale || a.language.locale == langItem.locale)))
if (files.some(a => a.type === 'Subtitle' && (a.language.cr_locale == langItem.cr_locale || a.language.locale == langItem.locale) && a.cc === isCC))
continue;
if(options.dlsubs.includes('all') || options.dlsubs.includes(langItem.locale)){
const subsAssReq = await this.req.getData(subsItem.url);
@ -1221,7 +1221,8 @@ export default class Crunchy implements ServiceClass {
console.log(`[INFO] Subtitle downloaded: ${sxData.file}`);
files.push({
type: 'Subtitle',
...sxData as sxItem
...sxData as sxItem,
cc: isCC
});
}
else{
@ -1259,7 +1260,8 @@ export default class Crunchy implements ServiceClass {
throw new Error('Never');
return {
file: a.path,
language: a.language
language: a.language,
closedCaption: a.cc
};
}),
simul: false,

4
modules/module.langsData.ts
View file

@ -130,9 +130,9 @@ const sortTags = (data: string[]) => {
return sort.map(e => e.locale as string);
};
const subsFile = (fnOutput:string, subsIndex: string, langItem: LanguageItem) => {
const subsFile = (fnOutput:string, subsIndex: string, langItem: LanguageItem, isCC: boolean) => {
subsIndex = (parseInt(subsIndex) + 1).toString().padStart(2, '0');
return `${fnOutput}.${subsIndex}.${langItem.code}.${langItem.language}.ass`;
return `${fnOutput}.${subsIndex}.${langItem.code}.${langItem.language}${isCC ? '.cc' : ''}.ass`;
};
// construct dub langs const