diff --git a/hidive.ts b/hidive.ts index ff3cd64..32f8efd 100644 --- a/hidive.ts +++ b/hidive.ts @@ -18,7 +18,7 @@ import * as langsData from './modules/module.langsData'; import * as yamlCfg from './modules/module.cfg-loader'; import * as yargs from './modules/module.app-args'; import Merger, { Font, MergerInput, SubtitleInput } from './modules/module.merger'; -import { vtt } from './modules/module.vtt2ass'; +import vtt2ass from './modules/module.vtt2ass'; // load req import { domain, api } from './modules/module.api-urls'; @@ -1410,7 +1410,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 = vtt(undefined, chosenFontSize, getVttContent.res.body, '', subsMargin, options.fontName); + const sBody = vtt2ass(undefined, chosenFontSize, getVttContent.res.body, '', subsMargin, options.fontName); sxData.title = `${subLang.language} / ${sxData.title}`; sxData.fonts = fontsData.assFonts(sBody) as Font[]; fs.writeFileSync(sxData.path, sBody); @@ -1664,7 +1664,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 = vtt(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); sxData.title = `${subLang.language} / ${sxData.title}`; sxData.fonts = fontsData.assFonts(sBody) as Font[]; fs.writeFileSync(sxData.path, sBody); diff --git a/modules/module.vtt2ass.ts b/modules/module.vtt2ass.ts index 9c5f7ea..25d2fe3 100644 --- a/modules/module.vtt2ass.ts +++ b/modules/module.vtt2ass.ts @@ -405,7 +405,7 @@ function toSubTime(str: string) { return n.slice(0, 3).join(':') + '.' + n[3]; } -function vtt(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) { relGroup = group ?? ''; fontSize = xFontSize && xFontSize > 0 ? xFontSize : 34; // 1em to pix tmMrg = timeMargin ? timeMargin : 0; // @@ -432,5 +432,3 @@ function vtt(group: string | undefined, xFontSize: number | undefined, vttStr: s loadVTT(vttStr) ); } - -export { vtt };