From 5e72683ce4d33c7cf30d1ba388a9d62685578c1d Mon Sep 17 00:00:00 2001 From: TheBeastLT Date: Sat, 25 Apr 2020 11:25:21 +0200 Subject: [PATCH] [addon] updates multi/dual languages handling --- addon/lib/languages.js | 4 +++- addon/lib/streamInfo.js | 6 +++++- addon/package-lock.json | 4 ++-- addon/package.json | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/addon/lib/languages.js b/addon/lib/languages.js index 21d42e6..45e12ff 100644 --- a/addon/lib/languages.js +++ b/addon/lib/languages.js @@ -1,6 +1,8 @@ const languageMapping = { 'dubbed': 'Dubbed', - 'multi': 'Multi', + 'multi audio': 'Multi Audio', + 'multi subs': 'Multi Subs', + 'dual audio': 'Dual Audio', 'english': '🇬🇧', 'japanese': '🇯🇵', 'korean': '🇰🇷', diff --git a/addon/lib/streamInfo.js b/addon/lib/streamInfo.js index 4c244c0..2951b45 100644 --- a/addon/lib/streamInfo.js +++ b/addon/lib/streamInfo.js @@ -53,9 +53,9 @@ function getQuality(record, torrentInfo, fileInfo) { function getLanguages(record, torrentInfo, fileInfo) { const providerLanguages = record.torrent.languages && titleParser.parse(record.torrent.languages).languages || []; const torrentLanguages = torrentInfo.languages || []; + const dubbed = torrentInfo.dubbed || fileInfo.dubbed; let languages = [].concat(torrentLanguages).concat(providerLanguages); if (record.kitsuId || record.torrent.type === Type.ANIME) { - const dubbed = torrentInfo.dubbed || fileInfo.dubbed || languages.includes('multi'); // no need to display japanese for anime or english if anime is dubbed languages = languages.concat(dubbed ? ['dubbed'] : []) .filter(lang => lang !== 'japanese') @@ -65,6 +65,10 @@ function getLanguages(record, torrentInfo, fileInfo) { // no need to display languages if only english is present languages = []; } + if (languages.length === 0 && dubbed) { + // display dubbed only if there are no other languages defined for non anime + languages = ['dubbed']; + } return mapLanguages(languages); } diff --git a/addon/package-lock.json b/addon/package-lock.json index 76b5565..15ecc5d 100644 --- a/addon/package-lock.json +++ b/addon/package-lock.json @@ -1599,8 +1599,8 @@ } }, "parse-torrent-title": { - "version": "git://github.com/TheBeastLT/parse-torrent-title.git#9e751ef6e0b4adb31d306d618c92f9feb84963bb", - "from": "git://github.com/TheBeastLT/parse-torrent-title.git#9e751ef6e0b4adb31d306d618c92f9feb84963bb", + "version": "git://github.com/TheBeastLT/parse-torrent-title.git#6f837b460175695757395a0e1b40f760a40f0f59", + "from": "git://github.com/TheBeastLT/parse-torrent-title.git#6f837b460175695757395a0e1b40f760a40f0f59", "requires": { "moment": "^2.24.0" } diff --git a/addon/package.json b/addon/package.json index cd9117e..f2a8ff7 100644 --- a/addon/package.json +++ b/addon/package.json @@ -14,10 +14,10 @@ "named-queue": "^2.2.1", "needle": "^2.2.4", "magnet-uri": "^5.1.7", - "parse-torrent-title": "git://github.com/TheBeastLT/parse-torrent-title.git#9e751ef6e0b4adb31d306d618c92f9feb84963bb", + "parse-torrent-title": "git://github.com/TheBeastLT/parse-torrent-title.git#6f837b460175695757395a0e1b40f760a40f0f59", "pg": "^7.8.2", "pg-hstore": "^2.3.2", - "real-debrid-api": "git://github.com/TheBeastLT/node-real-debrid.git#9e751ef6e0b4adb31d306d618c92f9feb84963bb", + "real-debrid-api": "git://github.com/TheBeastLT/node-real-debrid.git#935a5c23ae809edbcd2a111526a7f74d6767c50d", "sequelize": "^4.43.0", "stremio-addon-sdk": "^1.6.1", "user-agents": "^1.0.559"