use identifier instead

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

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):
 

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

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):
 

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

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