arona/destreamer-mirror
1
0
Fork 0
mirror of https://github.com/snobu/destreamer.git synced 2026-01-17 05:22:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix passing arguments to Utils.ts (#137)

Browse Source
This commit is contained in:
Adrian Calinescu
2020-05-18 20:15:22 +03:00
committed by GitHub
parent d9617df5ed
commit 3cf49c5d1c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Utils.ts
View File

@@ -4,7 +4,6 @@ import { execSync } from 'child_process';
import colors from 'colors'; import colors from 'colors';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import { argv } from './CommandLineParser';
function sanitizeUrls(urls: string[]) { function sanitizeUrls(urls: string[]) {
const rex = new RegExp(/(?:https:\/\/)?.*\/video\/[a-z0-9]{8}-(?:[a-z0-9]{4}\-){3}[a-z0-9]{12}$/, 'i'); const rex = new RegExp(/(?:https:\/\/)?.*\/video\/[a-z0-9]{8}-(?:[a-z0-9]{4}\-){3}[a-z0-9]{12}$/, 'i');
@@ -123,11 +122,11 @@ export function checkRequirements() {
} }
export function makeUniqueTitle(title: string, outDir: string) { export function makeUniqueTitle(title: string, outDir: string, skip?: boolean, format?: string) {
let ntitle = title; let ntitle = title;
let k = 0; let k = 0;
while (!argv.skip && fs.existsSync(outDir + path.sep + ntitle + '.' + argv.format)) while (!skip && fs.existsSync(outDir + path.sep + ntitle + '.' + format))
ntitle = title + ' - ' + (++k).toString(); ntitle = title + ' - ' + (++k).toString();
return ntitle; return ntitle;

2
src/destreamer.ts
View File

@@ -173,7 +173,7 @@ async function downloadVideo(videoUrls: string[], outputDirectories: string[], s
console.log(colors.yellow(`\nDownloading Video: ${video.title}\n`)); console.log(colors.yellow(`\nDownloading Video: ${video.title}\n`));
video.title = makeUniqueTitle(sanitize(video.title) + ' - ' + video.date, outputDirectories[j]); video.title = makeUniqueTitle(sanitize(video.title) + ' - ' + video.date, outputDirectories[j], argv.skip, argv.format);
// Very experimental inline thumbnail rendering // Very experimental inline thumbnail rendering
if (!argv.noExperiments) if (!argv.noExperiments)