Fix Eslint errors, logic error, and add combineLines argument

hidive.ts

@@ -1424,7 +1424,7 @@ export default class Hidive implements ServiceClass {
             if (getVttContent.ok && getVttContent.res) {
               console.info(`Subtitle Downloaded: ${sub.url}`);
               //vttConvert(getVttContent.res.body, false, subLang.name, fontSize);
-              const sBody = vtt2ass(undefined, chosenFontSize, getVttContent.res.body, '', subsMargin, options.fontName);
+              const sBody = vtt2ass(undefined, chosenFontSize, getVttContent.res.body, '', subsMargin, options.fontName, options.combineLines);
               sxData.title = `${subLang.language} / ${sxData.title}`;
               sxData.fonts = fontsData.assFonts(sBody) as Font[];
               fs.writeFileSync(sxData.path, sBody);
@@ -1678,7 +1678,7 @@ export default class Hidive implements ServiceClass {
             if (getCssContent.ok && getVttContent.ok && getCssContent.res && getVttContent.res) {
               console.info(`Subtitle Downloaded: ${await this.genSubsUrl('vtt', subsXUrl)}`);
               //vttConvert(getVttContent.res.body, false, subLang.name, fontSize);
-              const sBody = vtt2ass(undefined, chosenFontSize, getVttContent.res.body, getCssContent.res.body, subsMargin, options.fontName);
+              const sBody = vtt2ass(undefined, chosenFontSize, getVttContent.res.body, getCssContent.res.body, subsMargin, options.fontName, options.combineLines);
               sxData.title = `${subLang.language} / ${sxData.title}`;
               sxData.fonts = fontsData.assFonts(sBody) as Font[];
               fs.writeFileSync(sxData.path, sBody);

modules/module.app-args.ts

@@ -48,6 +48,7 @@ let argvC: {
   dubLang: string[]; 
   all: boolean; 
   fontSize: number; 
+  combineLines: boolean;
   allDubs: boolean; 
   timeout: number; 
   waittime: number;

modules/module.args.ts

@@ -391,6 +391,15 @@ const args: TAppArg<boolean|number|string|unknown[]>[] = [
     type: 'number',
     usage: '${fontSize}'
   },
+  {
+    name: 'combineLines',
+    describe: 'Merge adjacent lines with same style and text',
+    docDescribe: 'If selected, will prevent a line from shifting downwards',
+    group: 'dl',
+    service: ['hidive'],
+    type: 'boolean',
+    usage: ''
+  },
   {
     name: 'allDubs',
     describe: 'If selected, all available dubs will get downloaded',

modules/module.vtt2ass.ts

@@ -13,6 +13,7 @@ let relGroup = '';
 let fontSize = 0;
 let tmMrg = 0;
 let rFont = '';
+let doCombineLines = false;
 
 type Css = Record<string, {
   params: string;
@@ -240,6 +241,9 @@ function timestampToCentiseconds(timestamp: string) {
 }
 
 function combineLines(events: string[]): string[] {
+  if (!doCombineLines) {
+    return events;
+  }
   // This function is for combining adjacent lines with same information
   const newLines: string[] = [];
   for (const currentLine of events) {
@@ -247,17 +251,17 @@ function combineLines(events: string[]): string[] {
     // Check previous 7 elements, arbritary lookback amount 
     for (let j = 1; j < 8 && j < newLines.length; j++) {
       const checkLine = newLines[newLines.length - j];
-      let checkLineSplit = checkLine.split(',');
-      let currentLineSplit = currentLine.split(',');
+      const checkLineSplit = checkLine.split(',');
+      const currentLineSplit = currentLine.split(',');
       // 1 = start, 2 = end, 3 = style, 9+ = text
       if (checkLineSplit.slice(9).join(',') == currentLineSplit.slice(9).join(',') &&
           checkLineSplit[3] == currentLineSplit[3] &&
           checkLineSplit[2] == currentLineSplit[1]
       ) {
-          checkLineSplit[2] = currentLineSplit[2];
-          newLines[newLines.length - j] = checkLineSplit.join(',');
-          hasCombined = true;
-          break;
+        checkLineSplit[2] = currentLineSplit[2];
+        newLines[newLines.length - j] = checkLineSplit.join(',');
+        hasCombined = true;
+        break;
       } 
     }
     if (!hasCombined) {
@@ -345,11 +349,10 @@ function convert(css: Css, vtt: Vtt[]) {
       const currentStart = timestampToCentiseconds(x.start);
       events['subtitle'].pop();
       if ((currentStart - previousStart) <= 2) {
+        x.start = previousBufferLine.start;
         if (previousBufferLine.style == x.style) {
           buffer.pop();
           x.text = previousBufferLine.text + '\\N' + x.text;
-        } else {
-          x.start = previousBufferLine.start;
         }
       } else {
         pushBuffer(buffer, events['subtitle']);
@@ -481,11 +484,12 @@ function toSubTime(str: string) {
   return n.slice(0, 3).join(':') + '.' + n[3];
 }
 
-export default function vtt2ass(group: string | undefined, xFontSize: number | undefined, vttStr: string, cssStr: string, timeMargin?: number, replaceFont?: string) {
+export default function vtt2ass(group: string | undefined, xFontSize: number | undefined, vttStr: string, cssStr: string, timeMargin?: number, replaceFont?: string, combineLines?: boolean) {
   relGroup = group ?? '';
   fontSize = xFontSize && xFontSize > 0 ? xFontSize : 34; // 1em to pix
   tmMrg = timeMargin ? timeMargin : 0; //
   rFont = replaceFont ? replaceFont : rFont;
+  doCombineLines = combineLines ? combineLines : doCombineLines;
   if (vttStr.match(/::cue(?:.(.+)\) *)?{([^}]+)}/g)) {
     const cssLines = [];
     let defaultCss = '';