From 51e86ae593c3518c46921399ca9ab973ebcaa470 Mon Sep 17 00:00:00 2001 From: Luca Date: Fri, 10 Apr 2020 12:49:09 +0200 Subject: [PATCH 1/2] automated update on install --- package-lock.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4b6aaeb..17f6dda 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1356,14 +1356,6 @@ } } }, - "is-admin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-admin/-/is-admin-3.0.0.tgz", - "integrity": "sha512-wOa3CXFJAu8BZ2BDtG9xYOOrsq6oiSvc2jFPy4X/HINx5bmJUcW8e+apItVbU2E7GIfBVaFVO7Zit4oAWtTJcw==", - "requires": { - "execa": "^1.0.0" - } - }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", @@ -1372,6 +1364,14 @@ "kind-of": "^6.0.0" } }, + "is-admin": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-admin/-/is-admin-3.0.0.tgz", + "integrity": "sha512-wOa3CXFJAu8BZ2BDtG9xYOOrsq6oiSvc2jFPy4X/HINx5bmJUcW8e+apItVbU2E7GIfBVaFVO7Zit4oAWtTJcw==", + "requires": { + "execa": "^1.0.0" + } + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -1406,15 +1406,6 @@ "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", "dev": true }, - "is-elevated": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-elevated/-/is-elevated-3.0.0.tgz", - "integrity": "sha512-wjcp6RkouU9jpg55zERl+BglvV5j4jx5c/EMvQ+d12j/+nIEenNWPu+qc0tCg3JkLodbKZMg1qhJzEwG4qjclg==", - "requires": { - "is-admin": "^3.0.0", - "is-root": "^2.1.0" - } - }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", @@ -1425,6 +1416,15 @@ "kind-of": "^6.0.2" } }, + "is-elevated": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-elevated/-/is-elevated-3.0.0.tgz", + "integrity": "sha512-wjcp6RkouU9jpg55zERl+BglvV5j4jx5c/EMvQ+d12j/+nIEenNWPu+qc0tCg3JkLodbKZMg1qhJzEwG4qjclg==", + "requires": { + "is-admin": "^3.0.0", + "is-root": "^2.1.0" + } + }, "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", From b3fd6544cc9c83c5c64dc50ce45699463458b6a1 Mon Sep 17 00:00:00 2001 From: Luca Date: Fri, 10 Apr 2020 12:59:09 +0200 Subject: [PATCH 2/2] changed function name to be more significant --- destreamer.ts | 5 +++-- test/test.ts | 6 +++--- utils.ts | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/destreamer.ts b/destreamer.ts index 6ce18f7..45804fb 100644 --- a/destreamer.ts +++ b/destreamer.ts @@ -1,4 +1,4 @@ -import { sleep, getVideoUrls, checkRequirements } from './utils'; +import { sleep, parseVideoUrls, checkRequirements } from './utils'; import { TokenCache } from './TokenCache'; import { getVideoMetadata } from './Metadata'; import { Metadata, Session } from './Types'; @@ -78,6 +78,7 @@ function init() { } async function DoInteractiveLogin(username?: string): Promise { + console.log('Launching headless Chrome to perform the OpenID Connect dance...'); const browser = await puppeteer.launch({ headless: false, @@ -230,7 +231,7 @@ async function main() { process.exit(-1); } - videoUrls = getVideoUrls(argv.videoUrls); + videoUrls = parseVideoUrls(argv.videoUrls); if (videoUrls.length === 0) { console.error(colors.red('\nERROR: No valid URL has been found!\n')); process.exit(-1); diff --git a/test/test.ts b/test/test.ts index 4b3b611..3bd6a51 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,4 +1,4 @@ -import { getVideoUrls } from '../utils'; +import { parseVideoUrls } from '../utils'; import puppeteer from 'puppeteer'; import assert from 'assert'; import tmp from 'tmp'; @@ -53,7 +53,7 @@ describe('Destreamer', () => { fs.writeFileSync(tmpFile.fd, testIn.join('\r\n')); - testOut = getVideoUrls([tmpFile.name]); + testOut = parseVideoUrls([tmpFile.name]); if (testOut.length !== expectedOut.length) assert.strictEqual(testOut, expectedOut, "URL list not sanitized"); @@ -64,4 +64,4 @@ describe('Destreamer', () => { assert.ok("sanitizeUrls ok"); }); -}); \ No newline at end of file +}); diff --git a/utils.ts b/utils.ts index 4bd55b4..4eed2bd 100644 --- a/utils.ts +++ b/utils.ts @@ -27,7 +27,7 @@ function sanitizeUrls(urls: string[]) { return sanitized; } -export function getVideoUrls(videoUrls: any) { +export function parseVideoUrls(videoUrls: any) { const t = videoUrls[0] as string; const isPath = t.substring(t.length-4) === '.txt'; let urls: string[]; @@ -56,4 +56,4 @@ export function checkRequirements() { )); process.exit(22); } -} \ No newline at end of file +}