Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-05-07 03:26:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(torrents): auto get resource main title when upload

Browse Source
This commit is contained in:
OldHawk
2018-05-19 02:55:56 +08:00
parent 09a30be6b8
commit 948b9e989f
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/torrents/client/controllers/uploads.client.controller.js
View File

@@ -338,19 +338,19 @@
};
/**
* getTitleFromResourceFileName
* @param fname
* getFormattedResourceTitle
* @param title
* @returns {*}
*/
function getTitleFromResourceFileName(fname) {
if (fname) {
function getFormattedResourceTitle(title) {
if (title) {
//replace other pt site prefix
fname = fname.replace(/\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*/gi, '');
fname = fname.replace(/.torrent/g, '');
title = title.replace(/\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*/gi, '');
title = title.replace(/.torrent/g, '');
// var re = /((?:^|\D)\d\.\d(?=\D|$))|\./g;
var re = /[0-9]\.[0-9]\b|(\.)/g;
var repl = fname.replace(re, function ($0, $1) {
var repl = title.replace(re, function ($0, $1) {
// return ($1 ? $1.replace(/^\./, ' ') : ' ');
return $1 === '.' ? ' ' : $0;
});
@@ -413,7 +413,7 @@
tmdbid: tmdbid,
language: getStorageLangService.getLang()
}, function (res) {
vm.customTorrent.title = getTitleFromResourceFileName(vm.torrentInfo.filename);
vm.customTorrent.title = getFormattedResourceTitle(vm.torrentInfo.filename);
vm.customTorrent.subtitle = res.title;
vm.tmdb_info_ok = true;
@@ -459,7 +459,7 @@
tmdbid: tmdbid,
language: getStorageLangService.getLang()
}, function (res) {
vm.customTorrent.title = getTitleFromResourceFileName(vm.torrentInfo.filename);
vm.customTorrent.title = getFormattedResourceTitle(vm.torrentInfo.filename);
vm.customTorrent.subtitle = res.name;
vm.tmdb_info_ok = true;

20
modules/torrents/client/services/torrent-get-info.client.service.js
View File

@@ -20,7 +20,7 @@
getTorrentDoubleTitle: getTorrentDoubleTitle,
getTorrentCustomTitle: getTorrentCustomTitle,
getTorrentCustomSubTitle: getTorrentCustomSubTitle,
getTitleFromResourceFileName: getTitleFromResourceFileName,
getFormattedResourceTitle: getFormattedResourceTitle,
getTorrentListImage: getTorrentListImage,
getTorrentListTopImage: getTorrentListTopImage,
getTorrentTopOneImage: getTorrentTopOneImage,
@@ -106,9 +106,9 @@
*/
function getTorrentCustomTitle(item) {
if (item.resource_detail_info.custom_title) {
return item.resource_detail_info.custom_title;
return getFormattedResourceTitle(item.resource_detail_info.custom_title);
} else {
return getTitleFromResourceFileName(item.torrent_filename);
return getFormattedResourceTitle(item.torrent_filename);
}
}
@@ -128,19 +128,19 @@
}
/**
* getTitleFromResourceFileName
* @param fname
* getFormattedResourceTitle
* @param title
* @returns {*}
*/
function getTitleFromResourceFileName(fname) {
if (fname) {
function getFormattedResourceTitle(title) {
if (title) {
var reg = /\{([a-zA-Z0-9\_\-\.\s]){2,10}\}[\.|\s]*|\[([a-zA-Z0-9\_\-\.\s]){2,10}\][\.|\s]*/gi;
fname = fname.replace(reg, '');
fname = fname.replace(/.torrent/g, '');
title = title.replace(reg, '');
title = title.replace(/.torrent/g, '');
// var re = /((?:^|\D)\d\.\d(?=\D|$))|\./g;
var re = /[0-9]\.[0-9]\b|(\.)/g;
var repl = fname.replace(re, function ($0, $1) {
var repl = title.replace(re, function ($0, $1) {
// return ($1 ? $1.replace(/^\./, ' ') : ' ');
return $1 === '.' ? ' ' : $0;
});