diff --git a/addon/lib/streamInfo.js b/addon/lib/streamInfo.js index c7bc786..84d0af7 100644 --- a/addon/lib/streamInfo.js +++ b/addon/lib/streamInfo.js @@ -12,8 +12,10 @@ function toStreamInfo(record) { function movieStream(record) { const titleInfo = titleParser.parse(record.title); + const sameInfo = record.title === record.torrent.title; const title = joinDetailParts( [ + joinDetailParts([!sameInfo && record.torrent.title.replace(/[, ]+/g, ' ') || undefined]), joinDetailParts([titleInfo.title, titleInfo.year, titleInfo.language]), joinDetailParts([titleInfo.resolution, titleInfo.source], '📺 '), joinDetailParts([record.torrent.seeders], '👤 ') @@ -37,7 +39,10 @@ function seriesStream(record) { [ joinDetailParts([record.torrent.title.replace(/[, ]+/g, ' ')]), joinDetailParts([!sameInfo && record.title.replace(/[, ]+/g, ' ') || undefined]), - joinDetailParts([tInfo.resolution || eInfo.resolution, tInfo.source || eInfo.source], '📺 '), + joinDetailParts([ + tInfo.resolution || eInfo.resolution || record.torrent.resolution, + tInfo.source || eInfo.source + ], '📺 '), joinDetailParts([record.torrent.seeders], '👤 ') ], '', diff --git a/package-lock.json b/package-lock.json index 33add90..5296bd5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1385,8 +1385,8 @@ } }, "parse-torrent-title": { - "version": "git://github.com/TheBeastLT/parse-torrent-title.git#90c60ab3edab3a40843160ba1bdf4995c4b5cc56", - "from": "git://github.com/TheBeastLT/parse-torrent-title.git#master", + "version": "git://github.com/TheBeastLT/parse-torrent-title.git#494145d07b1ac842d3edf0ed9c69ca65caf30eef", + "from": "git://github.com/TheBeastLT/parse-torrent-title.git#494145d07b1ac842d3edf0ed9c69ca65caf30eef", "requires": { "moment": "^2.24.0" } @@ -1882,31 +1882,36 @@ } }, "sequelize": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-5.15.1.tgz", - "integrity": "sha512-DCzzJYvJLMKnyf8G3at2A+yM9M2fSQmTmuOYIpCWM8Gjqx3XfgNTd1NkuyPWFoi1/d1AXQsN2VDPXkPczida8A==", + "version": "5.21.5", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-5.21.5.tgz", + "integrity": "sha512-n9hR5K4uQGmBGK/Y/iqewCeSFmKVsd0TRnh0tfoLoAkmXbKC4tpeK96RhKs7d+TTMtrJlgt2TNLVBaAxEwC4iw==", "requires": { "bluebird": "^3.5.0", "cls-bluebird": "^2.1.0", "debug": "^4.1.1", "dottie": "^2.0.0", "inflection": "1.12.0", - "lodash": "^4.17.11", + "lodash": "^4.17.15", "moment": "^2.24.0", "moment-timezone": "^0.5.21", - "retry-as-promised": "^3.1.0", - "semver": "^6.1.1", + "retry-as-promised": "^3.2.0", + "semver": "^6.3.0", "sequelize-pool": "^2.3.0", "toposort-class": "^1.0.1", - "uuid": "^3.2.1", + "uuid": "^3.3.3", "validator": "^10.11.0", - "wkx": "^0.4.6" + "wkx": "^0.4.8" }, "dependencies": { "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" } } }, diff --git a/package.json b/package.json index d93e26a..db3a42f 100644 --- a/package.json +++ b/package.json @@ -29,12 +29,12 @@ "node-schedule": "^1.3.2", "nodejs-bing": "^0.1.0", "parse-torrent": "^6.1.2", - "parse-torrent-title": "git://github.com/TheBeastLT/parse-torrent-title.git#master", + "parse-torrent-title": "git://github.com/TheBeastLT/parse-torrent-title.git#494145d07b1ac842d3edf0ed9c69ca65caf30eef", "peer-search": "^0.6.x", "pg": "^7.8.2", "pg-hstore": "^2.3.2", "rarbg-api": "^1.1.3", - "sequelize": "^5.15.1", + "sequelize": "^5.21.5", "sugar-date": "^2.0.6", "torrent-stream": "^1.1.0" }