From 26509f614c43572a562e99d46f48ee461cdce10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joel=20K=C3=A5berg?= Date: Sun, 15 Dec 2013 11:12:47 +0100 Subject: [PATCH] use identifier instead --- couchpotato/core/providers/torrent/bithdtv/main.py | 4 ++-- couchpotato/core/providers/torrent/publichd/main.py | 4 +--- couchpotato/core/providers/torrent/sceneaccess/main.py | 12 ++++++------ couchpotato/core/providers/torrent/thepiratebay/main.py | 11 ++++------- couchpotato/core/providers/torrent/torrentday/main.py | 5 +---- couchpotato/core/providers/torrent/torrentleech/main.py | 11 ++++------- couchpotato/core/providers/torrent/torrentshack/main.py | 4 ++-- 7 files changed, 20 insertions(+), 31 deletions(-) diff --git a/couchpotato/core/providers/torrent/bithdtv/main.py b/couchpotato/core/providers/torrent/bithdtv/main.py index 17aff58..85ec5e3 100644 --- a/couchpotato/core/providers/torrent/bithdtv/main.py +++ b/couchpotato/core/providers/torrent/bithdtv/main.py @@ -95,8 +95,8 @@ class Movie(MovieProvider, Base): def buildUrl(self, media): query = tryUrlencode({ - 'search': '%s %s' % (fireEvent('searcher.get_search_title', - media['library'], single = True), media['library']['year']), + 'search': fireEvent('searcher.get_search_title', media['library'], + include_identifier = True, single = True), 'cat': 7 # Movie cat }) return query diff --git a/couchpotato/core/providers/torrent/publichd/main.py b/couchpotato/core/providers/torrent/publichd/main.py index a42d629..b5d9e96 100644 --- a/couchpotato/core/providers/torrent/publichd/main.py +++ b/couchpotato/core/providers/torrent/publichd/main.py @@ -99,9 +99,7 @@ class Base(TorrentMagnetProvider): class Movie(MovieProvider, Base): def buildUrl(self, media): - query = '%s %s' % (fireEvent('searcher.get_search_title', - media['library'], single = True), media['library']['year']) - return query + return fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True) class Season(SeasonProvider, Base): diff --git a/couchpotato/core/providers/torrent/sceneaccess/main.py b/couchpotato/core/providers/torrent/sceneaccess/main.py index 6d287d4..e2261e5 100644 --- a/couchpotato/core/providers/torrent/sceneaccess/main.py +++ b/couchpotato/core/providers/torrent/sceneaccess/main.py @@ -99,8 +99,8 @@ class Movie(MovieProvider, Base): def buildUrl(self, media, quality): url = self.urls['search'] % ( - self.getCatId(quality['identifier'])[0], - self.getCatId(quality['identifier'])[0] + self.getCatId(quality['identifier'])[0], + self.getCatId(quality['identifier'])[0] ) arguments = tryUrlencode({ @@ -119,8 +119,8 @@ class Season(SeasonProvider, Base): def buildUrl(self, media, quality): url = self.urls['archive'] % ( - self.getCatId(quality['identifier'])[0], - self.getCatId(quality['identifier'])[0] + self.getCatId(quality['identifier'])[0], + self.getCatId(quality['identifier'])[0] ) arguments = tryUrlencode({ @@ -140,8 +140,8 @@ class Episode(EpisodeProvider, Base): def buildUrl(self, media, quality): url = self.urls['search'] % ( - self.getCatId(quality['identifier'])[0], - self.getCatId(quality['identifier'])[0] + self.getCatId(quality['identifier'])[0], + self.getCatId(quality['identifier'])[0] ) arguments = tryUrlencode({ diff --git a/couchpotato/core/providers/torrent/thepiratebay/main.py b/couchpotato/core/providers/torrent/thepiratebay/main.py index 8a57459..8282470 100644 --- a/couchpotato/core/providers/torrent/thepiratebay/main.py +++ b/couchpotato/core/providers/torrent/thepiratebay/main.py @@ -130,9 +130,8 @@ class Movie(MovieProvider, Base): ] def buildUrl(self, media, page, cats): - query = tryUrlencode('"%s" %s' % (fireEvent('searcher.get_search_title', media['library'], - single = True), media['library']['year'])), page, ','.join(str(x) for x in cats) - return query + return tryUrlencode('"%s"' % fireEvent('searcher.get_search_title', media['library'], + include_identifier = True, single = True)), page, ','.join(str(x) for x in cats) class Season(SeasonProvider, Base): @@ -142,9 +141,8 @@ class Season(SeasonProvider, Base): ] def buildUrl(self, media, page, cats): - query = tryUrlencode('"%s"' % fireEvent('searcher.get_search_title', media['library'], + return tryUrlencode('"%s"' % fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True)), page, ','.join(str(x) for x in cats) - return query class Episode(EpisodeProvider, Base): @@ -154,6 +152,5 @@ class Episode(EpisodeProvider, Base): ] def buildUrl(self, media, page, cats): - query = tryUrlencode('"%s"' % fireEvent('searcher.get_search_title', media['library'], + return tryUrlencode('"%s"' % fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True)), page, ','.join(str(x) for x in cats) - return query diff --git a/couchpotato/core/providers/torrent/torrentday/main.py b/couchpotato/core/providers/torrent/torrentday/main.py index c0ae11f..36c2bd1 100644 --- a/couchpotato/core/providers/torrent/torrentday/main.py +++ b/couchpotato/core/providers/torrent/torrentday/main.py @@ -76,10 +76,7 @@ class Movie(MovieProvider, Base): ([5], ['bd50']), ] def buildUrl(self, media): - query = '"%s %s"' % (fireEvent('searcher.get_search_title', - media['library'], single = True), media['library']['year']) - - return query + return fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True) class Season(SeasonProvider, Base): diff --git a/couchpotato/core/providers/torrent/torrentleech/main.py b/couchpotato/core/providers/torrent/torrentleech/main.py index 7162a0b..612a8e9 100644 --- a/couchpotato/core/providers/torrent/torrentleech/main.py +++ b/couchpotato/core/providers/torrent/torrentleech/main.py @@ -90,9 +90,8 @@ class Movie(MovieProvider, Base): ] def buildUrl(self, media, quality): - query = (tryUrlencode('%s %s' % (fireEvent('searcher.get_search_title', - media['library'], single = True), media['library']['year'])), self.getCatId(quality['identifier'])[0]) - return query + return (tryUrlencode('%s' % fireEvent('searcher.get_search_title', + media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0]) class Season(SeasonProvider, Base): @@ -101,9 +100,8 @@ class Season(SeasonProvider, Base): ] def buildUrl(self, media, quality): - query = (tryUrlencode('%s' % fireEvent('searcher.get_search_title', + return (tryUrlencode('%s' % fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0]) - return query class Episode(EpisodeProvider, Base): @@ -113,6 +111,5 @@ class Episode(EpisodeProvider, Base): ] def buildUrl(self, media, quality): - query = (tryUrlencode('%s' % fireEvent('searcher.get_search_title', + return (tryUrlencode('%s' % fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0]) - return query diff --git a/couchpotato/core/providers/torrent/torrentshack/main.py b/couchpotato/core/providers/torrent/torrentshack/main.py index 081c311..8c2b09b 100644 --- a/couchpotato/core/providers/torrent/torrentshack/main.py +++ b/couchpotato/core/providers/torrent/torrentshack/main.py @@ -97,8 +97,8 @@ class Movie(MovieProvider, Base): cat_backup_id = 400 def buildUrl(self, media, quality): - query = (tryUrlencode('%s %s' % (fireEvent('searcher.get_search_title', - media['library'], single = True), media['library']['year'])), + query = (tryUrlencode('%s' % fireEvent('searcher.get_search_title', + media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0], self.getSceneOnly()) return query