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

vtt2ass: Fix reverse ordering of subtitles

Browse source
This commit is contained in:
AnimeDL 2024-03-29 16:23:43 -07:00
parent c82197a585
commit 25cf19f65d
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/module.vtt2ass.ts
View file

@ -228,6 +228,17 @@ function loadVTT(vttStr: string): Vtt[] {
return data; return data;
} }
function timestampToCentiseconds(timestamp: string) {
const timestamp_split = timestamp.split(':');
const timestamp_sec_split = timestamp_split[2].split('.');
const hour = parseInt(timestamp_split[0]);
const minute = parseInt(timestamp_split[1]);
const second = parseInt(timestamp_sec_split[0]);
const centisecond = parseInt(timestamp_sec_split[1]);
return 360000 * hour + 6000 * minute + 100 * second + centisecond;
}
function convert(css: Css, vtt: Vtt[]) { function convert(css: Css, vtt: Vtt[]) {
const stylesMap: Record<string, string> = {}; const stylesMap: Record<string, string> = {};
let ass = [ let ass = [
@ -264,6 +275,7 @@ function convert(css: Css, vtt: Vtt[]) {
}; };
const linesMap: Record<string, number> = {}; const linesMap: Record<string, number> = {};
let previousLine: ReturnType<typeof convertLine> | undefined = undefined; let previousLine: ReturnType<typeof convertLine> | undefined = undefined;
const buffer: string[] = [];
for (const l in vtt) { for (const l in vtt) {
const x = convertLine(stylesMap, vtt[l]); const x = convertLine(stylesMap, vtt[l]);
if (x.ind !== '' && linesMap[x.ind] !== undefined) { if (x.ind !== '' && linesMap[x.ind] !== undefined) {
@ -287,8 +299,8 @@ function convert(css: Css, vtt: Vtt[]) {
* subtitle and the previous subtitle, and merges them into a single subtitle. * subtitle and the previous subtitle, and merges them into a single subtitle.
*/ */
if (previousLine) { if (previousLine) {
const previousStart = parseFloat(previousLine.start.split(':').join('').split('.').join('')); const previousStart = timestampToCentiseconds(previousLine.start);
const currentStart = parseFloat(x.start.split(':').join('').split('.').join('')); const currentStart = timestampToCentiseconds(x.start);
if ( if (
(currentStart - previousStart) <= 2 && (currentStart - previousStart) <= 2 &&
previousLine.type == x.type && previousLine.type == x.type &&
@ -299,18 +311,18 @@ function convert(css: Css, vtt: Vtt[]) {
events[x.type as keyof typeof events].pop(); events[x.type as keyof typeof events].pop();
const previousLinePop = events[x.type as keyof typeof events].pop(); const previousLinePop = events[x.type as keyof typeof events].pop();
events[x.type as keyof typeof events].push(previousLinePop + '\\N'+x.text); events[x.type as keyof typeof events].push(previousLinePop + '\\N'+x.text);
}/* else if ((currentStart - previousStart) <= 3) { } else if ((currentStart - previousStart) <= 3) {
const currentLinePop = events[x.type as keyof typeof events].pop(); const currentLinePop = events[x.type as keyof typeof events].pop();
const previousLinePop = events[previousLine.type as keyof typeof events].pop(); const previousLinePop = events[previousLine.type as keyof typeof events].pop();
events[x.type as keyof typeof events].push(currentLinePop as string, previousLinePop as string); buffer.push(previousLinePop as string, currentLinePop as string);
}*/ } else if ((currentStart - previousStart) >= 3 && buffer.length > 0) {
events[x.type as keyof typeof events].push(...buffer.reverse());
buffer.splice(0,buffer.length);
}
} }
previousLine = x; previousLine = x;
} }
events.subtitle.reverse();
events.caption.reverse();
events.capt_pos.reverse();
events.song_cap.reverse();
if (events.subtitle.length > 0) { if (events.subtitle.length > 0) {
ass = ass.concat( ass = ass.concat(
//`Comment: 0,0:00:00.00,0:00:00.00,${defaultStyleName},,0,0,0,,** Subtitles **`, //`Comment: 0,0:00:00.00,0:00:00.00,${defaultStyleName},,0,0,0,,** Subtitles **`,