diff --git a/src/CommandLineParser.ts b/src/CommandLineParser.ts index 694926a..b6de101 100644 --- a/src/CommandLineParser.ts +++ b/src/CommandLineParser.ts @@ -1,10 +1,9 @@ -import { CLI_ERROR, ERROR_CODE } from './Errors'; +import { CLI_ERROR } from './Errors'; import { makeOutDir } from './Utils'; import { logger } from './Logger'; import { templateElements } from './Types'; import fs from 'fs'; -import readlineSync from 'readline-sync'; import sanitize from 'sanitize-filename'; import yargs from 'yargs'; @@ -198,14 +197,3 @@ function isOutputTemplateValid(argv: any): boolean { return true; } - - -export function promptUser(choices: Array): number { - const index: number = readlineSync.keyInSelect(choices, 'Which resolution/format do you prefer?'); - - if (index === -1) { - process.exit(ERROR_CODE.CANCELLED_USER_INPUT); - } - - return index; -} diff --git a/src/Utils.ts b/src/Utils.ts index b2dfb32..c9218e6 100644 --- a/src/Utils.ts +++ b/src/Utils.ts @@ -6,6 +6,7 @@ import { StreamSession, VideoUrl } from './Types'; import { AxiosResponse } from 'axios'; import { execSync } from 'child_process'; import fs from 'fs'; +import readlineSync from 'readline-sync'; const streamUrlRegex = new RegExp(/https?:\/\/web\.microsoftstream\.com.*/); @@ -237,3 +238,14 @@ export function ffmpegTimemarkToChunk(timemark: string): number { return (hrs * 60 * 60) + (mins * 60) + secs; } + + +export function promptUser(choices: Array): number { + const index: number = readlineSync.keyInSelect(choices, 'Which resolution/format do you prefer?'); + + if (index === -1) { + process.exit(ERROR_CODE.CANCELLED_USER_INPUT); + } + + return index; +} diff --git a/src/VideoUtils.ts b/src/VideoUtils.ts index 69ec632..593f9a0 100644 --- a/src/VideoUtils.ts +++ b/src/VideoUtils.ts @@ -1,5 +1,5 @@ import { StreamApiClient } from './ApiClient'; -import { promptUser } from './CommandLineParser'; +import { promptUser } from './Utils'; import { logger } from './Logger'; import { Video, StreamSession, VideoUrl } from './Types'; diff --git a/test/test.ts b/test/test.ts index 23887f1..d30a28b 100644 --- a/test/test.ts +++ b/test/test.ts @@ -6,6 +6,7 @@ import { StreamSession, VideoUrl } from './Types'; // we cannot test groups parsing as that requires an actual session +// TODO: add SharePoint urls describe('Destreamer parsing', () => { it('Input file to arrays of guids', async () => { const testSession: StreamSession = {