From bf69e4afd6515954128f5d9129396c56553005e3 Mon Sep 17 00:00:00 2001 From: Florrie Date: Mon, 19 Mar 2018 22:55:17 -0300 Subject: Make duration graph use common CLI stuff --- src/duration-graph.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/duration-graph.js b/src/duration-graph.js index 5d0bf85..c8fce75 100644 --- a/src/duration-graph.js +++ b/src/duration-graph.js @@ -11,6 +11,8 @@ const { flattenGrouplike } = require('./playlist-utils') +const { makePlaylistOptions } = require('./general-util') + const readFile = util.promisify(fs.readFile) const metrics = {} @@ -217,7 +219,9 @@ async function main(args) { let onlyFirst = 20 let metric = metrics.duration - await processArgv(args.slice(1), { + const { optionFunctions, getStuff } = makePlaylistOptions() + + Object.assign(optionFunctions, { '-metric': util => { const arg = util.nextArg() if (Object.keys(metrics).includes(arg)) { @@ -253,19 +257,18 @@ async function main(args) { } }, - '-only': util => util.alias('-only-first'), - 'o': util => util.alias('-only-first'), '-first': util => util.alias('-only-first'), - 'f': util => util.alias('-only-first'), '-all': util => { onlyFirst = Infinity - }, - - 'a': util => util.alias('-all') + } }) - const playlist = updatePlaylistFormat(JSON.parse(await readFile(args[0]))) + await processArgv(args, optionFunctions) + + const playlist = getStuff.activePlaylist + + console.log(playlist) for (const line of makePlaylistGraph(playlist, { graphWidth, onlyFirst, metric -- cgit 1.3.0-6-gf8a5