use buildUrl

couchpotato/core/providers/torrent/torrentday/main.py

@@ -29,19 +29,14 @@ class Base(TorrentProvider):
 
     def _search(self, media, quality, results):
 
-        if media['type'] in 'movie':
+        query = self.buildUrl(media)
-            q = '"%s %s"' % (fireEvent('searcher.get_search_title', media['library'], single = True), media['library']['year'])
-        else:
-            q = '"%s"' % fireEvent('searcher.get_search_title',
-                media['library'], include_identifier = True, single = True)
-
 
         params = {
             '/browse.php?': None,
             'cata': 'yes',
             'jxt': 8,
             'jxw': 'b',
-            'search': q,
+            'search': query,
         }
 
         data = self.getJsonData(self.urls['search'], params = params, opener = self.login_opener)
@@ -80,16 +75,25 @@ class Movie(MovieProvider, Base):
         ([3], ['dvdr']),
         ([5], ['bd50']),
     ]
+    def buildUrl(self, media):
+        query = '"%s %s"' % (fireEvent('searcher.get_search_title',
+                                       media['library'], single = True), media['library']['year'])
+
+        return query
 
 class Season(SeasonProvider, Base):
 
     cat_ids = [
         ([14], ['hdtv_sd', 'hdtv_720p', 'webdl_720p', 'webdl_1080p']),
     ]
+    def buildUrl(self, media):
+        return fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True)
 
 class Episode(EpisodeProvider, Base):
-
     cat_ids = [
         ([7], ['hdtv_720p', 'webdl_720p', 'webdl_1080p']),
         ([2], [24], [26], ['hdtv_sd'])
-    ]
+    ]
+    def buildUrl(self, media):
+        return fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True)
+

couchpotato/core/providers/torrent/torrentleech/main.py

@@ -31,12 +31,7 @@ class Base(TorrentProvider):
 
     def _search(self, media, quality, results):
 
-        if media['type'] in 'movie':
+        url = self.urls['search'] % self.buildUrl(media, quality)
-            url = self.urls['search'] % (tryUrlencode('%s %s' % (fireEvent('searcher.get_search_title',
-                media['library'], single = True), media['library']['year'])), self.getCatId(quality['identifier'])[0])
-        else:
-            url = self.urls['search'] % (tryUrlencode('%s' % fireEvent('searcher.get_search_title',
-                media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0])
 
         data = self.getHTMLData(url, opener = self.login_opener)
 
@@ -94,15 +89,30 @@ class Movie(MovieProvider, Base):
         ([12], ['dvdr']),
     ]
 
+    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
+
 class Season(SeasonProvider, Base):
 
     cat_ids = [
         ([27], ['hdtv_sd', 'hdtv_720p', 'webdl_720p', 'webdl_1080p']),
     ]
 
+    def buildUrl(self, media, quality):
+        query = (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):
 
     cat_ids = [
         ([32], ['hdtv_720p', 'webdl_720p', 'webdl_1080p']),
         ([26], ['hdtv_sd'])
     ]
+
+    def buildUrl(self, media, quality):
+        query = (tryUrlencode('%s' % fireEvent('searcher.get_search_title',
+                                               media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0])
+        return query