This commit is contained in:
Izuco 2021-12-22 12:22:20 +01:00
parent 0824d4873a
commit 546550bd44
No known key found for this signature in database
GPG key ID: 41DFCB1835A5695E
3 changed files with 12 additions and 10 deletions

16
funi.ts
View file

@ -585,18 +585,20 @@ async function downloadStreams(epsiode: FunimationMediaDownload){
}
argv.q = argv.q < 1 || argv.q > plMaxLayer ? plMaxLayer : argv.q;
const plSelectedServer = plServerList[argv.x-1];
const plSelectedList = plStreams[plSelectedServer];
const videoUrl = argv.x < plServerList.length+1 && plSelectedList[argv.q] ? plSelectedList[argv.q] : '';
plLayersStr.sort();
console.log(`[INFO] Servers available:\n\t${plServerList.join('\n\t')}`);
console.log(`[INFO] Available qualities:\n\t${plLayersStr.join('\n\t')}`);
const selectedQuality = argv.q === 0 || argv.q > Object.keys(plLayersRes).length
? Object.keys(plLayersRes).pop() as string
: argv.q;
const videoUrl = argv.x < plServerList.length+1 && plSelectedList[selectedQuality] ? plSelectedList[selectedQuality] : '';
if(videoUrl != ''){
console.log(`[INFO] Selected layer: ${argv.q} (${plLayersRes[argv.q].width}x${plLayersRes[argv.q].height}) @ ${plSelectedServer}`);
console.log(`[INFO] Selected layer: ${selectedQuality} (${plLayersRes[selectedQuality].width}x${plLayersRes[selectedQuality].height}) @ ${plSelectedServer}`);
console.log('[INFO] Stream URL:',videoUrl);
fnOutput = parseFileName(argv.fileName, ([
@ -604,8 +606,8 @@ async function downloadStreams(epsiode: FunimationMediaDownload){
['title', epsiode.title],
['showTitle', epsiode.showTitle],
['season', season],
['width', plLayersRes[argv.q].width],
['height', plLayersRes[argv.q].height],
['width', plLayersRes[selectedQuality].width],
['height', plLayersRes[selectedQuality].height],
['service', 'Funimation']
] as [appYargs.AvailableFilenameVars, string|number][]).map((a): Variable => {
return {

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "multi-downloader-nx",
"version": "2.0.13",
"version": "2.0.14",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "multi-downloader-nx",
"version": "2.0.13",
"version": "2.0.14",
"license": "MIT",
"dependencies": {
"cheerio": "^1.0.0-rc.10",

View file

@ -1,7 +1,7 @@
{
"name": "multi-downloader-nx",
"short_name": "aniDL",
"version": "2.0.13",
"version": "2.0.14",
"description": "Download videos from Funimation or Crunchyroll via cli",
"keywords": [
"download",