From b8b8af6a5e6fca2b5f0945e520702d22e990d440 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Sat, 19 May 2018 02:44:19 +0800 Subject: [PATCH] fix(torrents): auto get resource main title when upload --- config/env/torrents.js | 2 +- .../client/controllers/uploads.client.controller.js | 10 +++++++++- .../client/services/torrent-get-info.client.service.js | 9 ++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/config/env/torrents.js b/config/env/torrents.js index 6830326f..3c68220e 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -1194,7 +1194,7 @@ module.exports = { * @resourcesLanguage: settings for language of dropdown resource info */ tmdbConfig: { - key: 'this is access key from tmdb', + key: '7888f0042a366f63289ff571b68b7ce0', tmdbHome: 'https://www.themoviedb.org', tmdbMovieLinkUrl: 'https://www.themoviedb.org/movie/', tmdbTvserialLinkUrl: 'https://www.themoviedb.org/tv/', diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js index fb112abc..31bfa7be 100644 --- a/modules/torrents/client/controllers/uploads.client.controller.js +++ b/modules/torrents/client/controllers/uploads.client.controller.js @@ -347,7 +347,15 @@ //replace other pt site prefix fname = fname.replace(/\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*/gi, ''); fname = fname.replace(/.torrent/g, ''); - return fname; + + // var re = /((?:^|\D)\d\.\d(?=\D|$))|\./g; + var re = /[0-9]\.[0-9]\b|(\.)/g; + var repl = fname.replace(re, function ($0, $1) { + // return ($1 ? $1.replace(/^\./, ' ') : ' '); + return $1 === '.' ? ' ' : $0; + }); + + return repl; } else { return ''; } diff --git a/modules/torrents/client/services/torrent-get-info.client.service.js b/modules/torrents/client/services/torrent-get-info.client.service.js index 60d6ffb2..ef1ae957 100644 --- a/modules/torrents/client/services/torrent-get-info.client.service.js +++ b/modules/torrents/client/services/torrent-get-info.client.service.js @@ -138,7 +138,14 @@ fname = fname.replace(reg, ''); fname = fname.replace(/.torrent/g, ''); - return fname; + // var re = /((?:^|\D)\d\.\d(?=\D|$))|\./g; + var re = /[0-9]\.[0-9]\b|(\.)/g; + var repl = fname.replace(re, function ($0, $1) { + // return ($1 ? $1.replace(/^\./, ' ') : ' '); + return $1 === '.' ? ' ' : $0; + }); + + return repl; } else { return ''; }