Attempt on fixing #162

This commit is contained in:
Izuco 2021-11-13 23:44:35 +01:00
parent bd7cfbf258
commit 768f833644
No known key found for this signature in database
GPG key ID: 318460063D70949F
5 changed files with 55 additions and 53 deletions

3
.gitignore vendored
View file

@ -18,4 +18,5 @@ token.yml
*.user.yml
lib
test.*
updates.json
updates.json
cr_token.yml

View file

@ -835,7 +835,7 @@ async function getMedia(mMeta: CrunchyEpMeta){
appstore.fn = ([
['title', mMeta.episodeTitle],
['episode', mMeta.episodeNumber],
['service', 'Crunchyroll'],
['service', 'CR'],
['showTitle', mMeta.seasonTitle],
['season', mMeta.seasonID]
] as [yargs.AvailableFilenameVars, string|number][]).map((a): Variable => {

90
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "multi-downloader-nx",
"version": "1.0.2",
"version": "1.0.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -278,9 +278,9 @@
}
},
"@types/node": {
"version": "16.11.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz",
"integrity": "sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="
"version": "16.11.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz",
"integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="
},
"@types/responselike": {
"version": "1.0.0",
@ -306,13 +306,13 @@
"dev": true
},
"@typescript-eslint/eslint-plugin": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.3.0.tgz",
"integrity": "sha512-ARUEJHJrq85aaiCqez7SANeahDsJTD3AEua34EoQN9pHS6S5Bq9emcIaGGySt/4X2zSi+vF5hAH52sEen7IO7g==",
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.3.1.tgz",
"integrity": "sha512-cFImaoIr5Ojj358xI/SDhjog57OK2NqlpxwdcgyxDA3bJlZcJq5CPzUXtpD7CxI2Hm6ATU7w5fQnnkVnmwpHqw==",
"dev": true,
"requires": {
"@typescript-eslint/experimental-utils": "5.3.0",
"@typescript-eslint/scope-manager": "5.3.0",
"@typescript-eslint/experimental-utils": "5.3.1",
"@typescript-eslint/scope-manager": "5.3.1",
"debug": "^4.3.2",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.1.8",
@ -322,55 +322,55 @@
}
},
"@typescript-eslint/experimental-utils": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.0.tgz",
"integrity": "sha512-NFVxYTjKj69qB0FM+piah1x3G/63WB8vCBMnlnEHUsiLzXSTWb9FmFn36FD9Zb4APKBLY3xRArOGSMQkuzTF1w==",
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.1.tgz",
"integrity": "sha512-RgFn5asjZ5daUhbK5Sp0peq0SSMytqcrkNfU4pnDma2D8P3ElZ6JbYjY8IMSFfZAJ0f3x3tnO3vXHweYg0g59w==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.9",
"@typescript-eslint/scope-manager": "5.3.0",
"@typescript-eslint/types": "5.3.0",
"@typescript-eslint/typescript-estree": "5.3.0",
"@typescript-eslint/scope-manager": "5.3.1",
"@typescript-eslint/types": "5.3.1",
"@typescript-eslint/typescript-estree": "5.3.1",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
}
},
"@typescript-eslint/parser": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.3.0.tgz",
"integrity": "sha512-rKu/yAReip7ovx8UwOAszJVO5MgBquo8WjIQcp1gx4pYQCwYzag+I5nVNHO4MqyMkAo0gWt2gWUi+36gWAVKcw==",
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.3.1.tgz",
"integrity": "sha512-TD+ONlx5c+Qhk21x9gsJAMRohWAUMavSOmJgv3JGy9dgPhuBd5Wok0lmMClZDyJNLLZK1JRKiATzCKZNUmoyfw==",
"dev": true,
"requires": {
"@typescript-eslint/scope-manager": "5.3.0",
"@typescript-eslint/types": "5.3.0",
"@typescript-eslint/typescript-estree": "5.3.0",
"@typescript-eslint/scope-manager": "5.3.1",
"@typescript-eslint/types": "5.3.1",
"@typescript-eslint/typescript-estree": "5.3.1",
"debug": "^4.3.2"
}
},
"@typescript-eslint/scope-manager": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.3.0.tgz",
"integrity": "sha512-22Uic9oRlTsPppy5Tcwfj+QET5RWEnZ5414Prby465XxQrQFZ6nnm5KnXgnsAJefG4hEgMnaxTB3kNEyjdjj6A==",
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.3.1.tgz",
"integrity": "sha512-XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg==",
"dev": true,
"requires": {
"@typescript-eslint/types": "5.3.0",
"@typescript-eslint/visitor-keys": "5.3.0"
"@typescript-eslint/types": "5.3.1",
"@typescript-eslint/visitor-keys": "5.3.1"
}
},
"@typescript-eslint/types": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.3.0.tgz",
"integrity": "sha512-fce5pG41/w8O6ahQEhXmMV+xuh4+GayzqEogN24EK+vECA3I6pUwKuLi5QbXO721EMitpQne5VKXofPonYlAQg==",
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.3.1.tgz",
"integrity": "sha512-bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.0.tgz",
"integrity": "sha512-FJ0nqcaUOpn/6Z4Jwbtf+o0valjBLkqc3MWkMvrhA2TvzFXtcclIM8F4MBEmYa2kgcI8EZeSAzwoSrIC8JYkug==",
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz",
"integrity": "sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ==",
"dev": true,
"requires": {
"@typescript-eslint/types": "5.3.0",
"@typescript-eslint/visitor-keys": "5.3.0",
"@typescript-eslint/types": "5.3.1",
"@typescript-eslint/visitor-keys": "5.3.1",
"debug": "^4.3.2",
"globby": "^11.0.4",
"is-glob": "^4.0.3",
@ -379,12 +379,12 @@
}
},
"@typescript-eslint/visitor-keys": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.0.tgz",
"integrity": "sha512-oVIAfIQuq0x2TFDNLVavUn548WL+7hdhxYn+9j3YdJJXB7mH9dAmZNJsPDa7Jc+B9WGqoiex7GUDbyMxV0a/aw==",
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.1.tgz",
"integrity": "sha512-3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ==",
"dev": true,
"requires": {
"@typescript-eslint/types": "5.3.0",
"@typescript-eslint/types": "5.3.1",
"eslint-visitor-keys": "^3.0.0"
}
},
@ -1166,9 +1166,9 @@
}
},
"eslint-visitor-keys": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz",
"integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz",
"integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==",
"dev": true
},
"espree": {
@ -1628,11 +1628,11 @@
"dev": true
},
"hls-download": {
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/hls-download/-/hls-download-2.6.4.tgz",
"integrity": "sha512-q6kX4PNrh/WhCxgKXFQvc/7zJIvw4qho0XMHpgiQbSTK2bKfR+Yf1z8qxy/PAF58Gn6ogD59bwE2z2+bc6z7qQ==",
"version": "2.6.5",
"resolved": "https://registry.npmjs.org/hls-download/-/hls-download-2.6.5.tgz",
"integrity": "sha512-W3lHG4+cAql6dIV3X1wd8TYw5e4udR2TAZUx3pNiOmqD6mYZgrbqzrBBHyIQiGHOwwFF9tr2lxzZAJAJe1jRuA==",
"requires": {
"got": "^11.7.0",
"got": "^11.8.2",
"proxy-agent": "^5.0.0",
"sei-helper": "^3.3.0"
}

View file

@ -1,7 +1,7 @@
{
"name": "multi-downloader-nx",
"short_name": "aniDL",
"version": "1.0.3",
"version": "1.0.4",
"description": "Download videos from Funimation or Crunchyroll via cli",
"keywords": [
"download",
@ -30,7 +30,7 @@
"form-data": "^4.0.0",
"fs-extra": "^10.0.0",
"got": "^11.7.0",
"hls-download": "^2.6.4",
"hls-download": "^2.6.5",
"iso-639": "^0.2.2",
"lookpath": "^1.1.0",
"m3u8-parsed": "^1.3.0",
@ -40,10 +40,10 @@
},
"devDependencies": {
"@types/fs-extra": "^9.0.13",
"@types/node": "^16.11.6",
"@types/node": "^16.11.7",
"@types/yargs": "^17.0.5",
"@typescript-eslint/eslint-plugin": "^5.3.0",
"@typescript-eslint/parser": "^5.3.0",
"@typescript-eslint/eslint-plugin": "^5.3.1",
"@typescript-eslint/parser": "^5.3.1",
"eslint": "^7.30.0",
"pkg": "^5.4.1",
"removeNPMAbsolutePaths": "^2.0.0",
@ -63,4 +63,4 @@
"pretest": "npm run tsc",
"test": "cd lib && node modules/build win64 && node modules/build linux64 && node modules/build macos64"
}
}
}

1
tsc.ts
View file

@ -11,6 +11,7 @@ const ignore = [
path.join('bin', 'mkvtoolnix'),
path.join('config', 'token.yml'),
path.join('config', 'updates.json'),
path.join('config', 'cr_token.yml'),
'.eslint',
].map(a => path.join(__dirname, a));