Renamed movie library.title 'include_identifier' to 'include_year', show library.title defaults to 'condense' enabled now.

couchpotato/core/media/_base/searcher/main.py

@@ -171,7 +171,13 @@ class Searcher(SearcherBase):
         return False
 
     def correctWords(self, rel_name, media):
-        media_title = fireEvent('library.title', media['library'], include_identifier = False, single = True)
+        media_title = fireEvent(
+            'library.title', media['library'],
+            condense = False,
+            include_year = False,
+            include_identifier = False,
+            single = True
+        )
         media_words = re.split('\W+', simplifyString(media_title))
 
         rel_name = simplifyString(rel_name)

couchpotato/core/media/movie/library/movie/main.py

@@ -21,14 +21,14 @@ class MovieLibraryPlugin(LibraryBase):
         addEvent('library.update.movie', self.update)
         addEvent('library.update.movie.release_date', self.updateReleaseDate)
 
-    def title(self, library, first = True, condense = False, include_identifier = True):
+    def title(self, library, first = True, include_year = True, **kwargs):
         if library.get('type') != 'movie':
             return
 
         titles = [title['title'] for title in library['titles']]
 
         # Add year identifier to titles
-        if include_identifier:
+        if include_year:
             titles = [title + (' %s' % str(library['year'])) for title in titles]
 
         if first:

couchpotato/core/media/movie/searcher/main.py

@@ -209,7 +209,13 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
 
         if media.get('type') != 'movie': return
 
-        media_title = fireEvent('library.title', media['library'], include_identifier = False, single = True)
+        media_title = fireEvent(
+            'library.title', media['library'],
+            condense = False,
+            include_year = False,
+            include_identifier = False,
+            single = True
+        )
 
         imdb_results = kwargs.get('imdb_results', False)
         retention = Env.setting('retention', section = 'nzb')

couchpotato/core/media/show/library/episode/main.py

@@ -23,7 +23,7 @@ class EpisodeLibraryPlugin(LibraryBase):
         addEvent('library.update.episode', self.update)
         addEvent('library.update.episode_release_date', self.updateReleaseDate)
 
-    def title(self, library, first=True, condense=False, include_identifier=True):
+    def title(self, library, first = True, condense = True, include_identifier = True, **kwargs):
         if library is list or library.get('type') != 'episode':
             return
 

couchpotato/core/media/show/library/season/main.py

@@ -23,7 +23,7 @@ class SeasonLibraryPlugin(LibraryBase):
         addEvent('library.update.season', self.update)
         addEvent('library.update.season_release_date', self.updateReleaseDate)
 
-    def title(self, library, first=True, condense=False, include_identifier=True):
+    def title(self, library, first = True, condense = True, include_identifier = True, **kwargs):
         if library is list or library.get('type') != 'season':
             return
 
@@ -32,7 +32,14 @@ class SeasonLibraryPlugin(LibraryBase):
             log.warning('Invalid library, unable to determine title.')
             return
 
-        titles = fireEvent('library.title', library['related_libraries']['show'][0], first=False, condense=condense, single=True)
+        titles = fireEvent(
+            'library.title',
+            library['related_libraries']['show'][0],
+            first=False,
+            condense=condense,
+
+            single=True
+        )
 
         # Add season map_names if they exist
         if 'map_names' in library['info']:

couchpotato/core/media/show/library/show/main.py

@@ -25,7 +25,7 @@ class ShowLibraryPlugin(LibraryBase):
         addEvent('library.update.show', self.update)
         addEvent('library.update.show_release_date', self.updateReleaseDate)
 
-    def title(self, library, first=True, condense=False, include_identifier=None):
+    def title(self, library, first = True, condense = True, **kwargs):
         if library is list or library.get('type') != 'show':
             return
 

couchpotato/core/media/show/searcher/main.py

@@ -60,7 +60,7 @@ class ShowSearcher(Plugin):
         found_releases = []
         too_early_to_search = []
 
-        default_title = fireEvent('library.title', media['library'], single=True)
+        default_title = fireEvent('library.title', media['library'], condense = False, single=True)
         if not default_title:
             log.error('No proper info found for episode, removing it from library to cause it from having more issues.')
             #fireEvent('episode.delete', episode['id'], single = True)

couchpotato/core/providers/base.py

@@ -207,7 +207,7 @@ class YarrProvider(Provider):
             self._search(media, quality, results)
         # Search possible titles
         else:
-            media_title = fireEvent('library.title', media['library'], condense = True, single = True)
+            media_title = fireEvent('library.title', media['library'], single = True)
 
             for title in possibleTitles(media_title):
                 self._searchOnTitle(title, media, quality, results)

couchpotato/core/providers/nzb/binsearch/main.py

@@ -101,7 +101,7 @@ class Movie(MovieProvider, Base):
 
     def buildUrl(self, media, quality):
         query = tryUrlencode({
-            'q': media['library']['identifier'],
+            'q': media['library']['identifier'],  # TODO should this use library.title?
             'm': 'n',
             'max': 400,
             'adv_age': Env.setting('retention', 'nzb'),
@@ -117,7 +117,7 @@ class Season(SeasonProvider, Base):
 
     def buildUrl(self, media, quality):
         query = tryUrlencode({
-            'q': fireEvent('library.title', media['library'], condense = True, single = True),
+            'q': fireEvent('library.title', media['library'], single = True),
             'm': 'n',
             'max': 400,
             'adv_age': Env.setting('retention', 'nzb'),
@@ -133,7 +133,7 @@ class Episode(EpisodeProvider, Base):
 
     def buildUrl(self, media, quality):
         query = tryUrlencode({
-            'q': fireEvent('library.title', media['library'], condense = True, single = True),
+            'q': fireEvent('library.title', media['library'], single = True),
             'm': 'n',
             'max': 400,
             'adv_age': Env.setting('retention', 'nzb'),

couchpotato/core/providers/nzb/newznab/main.py

@@ -200,7 +200,7 @@ class Movie(MovieProvider, Base):
 class Season(SeasonProvider, Base):
 
     def buildUrl(self, media, api_key):
-        search_title = fireEvent('library.title', media['library'], condense = True, include_identifier = False, single = True)
+        search_title = fireEvent('library.title', media['library'], include_identifier = False, single = True)
         identifier = fireEvent('library.identifier', media['library'], single = True)
 
         query = tryUrlencode({
@@ -215,7 +215,7 @@ class Season(SeasonProvider, Base):
 class Episode(EpisodeProvider, Base):
 
     def buildUrl(self, media, api_key):
-        search_title = fireEvent('library.title', media['library'], condense = True, include_identifier = False, single = True)
+        search_title = fireEvent('library.title', media['library'], include_identifier = False, single = True)
         identifier = fireEvent('library.identifier', media['library'], single = True)
 
         query = tryUrlencode({

couchpotato/core/providers/nzb/nzbclub/main.py

@@ -80,8 +80,7 @@ class Movie(MovieProvider, Base):
 
     def buildUrl(self, media):
         query = tryUrlencode({
-            'q': '"%s %s"' % (fireEvent('library.title', media['library'], condense = True,
+            'q': '"%s"' % fireEvent('library.title', media['library'], single = True),
-                                        single = True), media['library']['year']),
             'ig': 1,
             'rpp': 200,
             'st': 5,
@@ -94,7 +93,7 @@ class Season(SeasonProvider, Base):
 
     def buildUrl(self, media):
         query = tryUrlencode({
-            'q': fireEvent('library.title', media['library'], condense = True, single = True),
+            'q': fireEvent('library.title', media['library'], single = True),
             'ig': 1,
             'rpp': 200,
             'st': 5,
@@ -107,7 +106,7 @@ class Episode(EpisodeProvider, Base):
 
     def buildUrl(self, media):
         query = tryUrlencode({
-            'q': fireEvent('library.title', media['library'], condense = True, single = True),
+            'q': fireEvent('library.title', media['library'], single = True),
             'ig': 1,
             'rpp': 200,
             'st': 5,

couchpotato/core/providers/nzb/nzbindex/main.py

@@ -104,7 +104,7 @@ class Base(NZBProvider, RSS):
 class Movie(MovieProvider, Base):
 
     def buildUrl(self, media, quality):
-        title = fireEvent('library.title', media['library'], condense = True, include_identifier = False, single = True)
+        title = fireEvent('library.title', media['library'], include_year = False, single = True)
         year =  media['library']['year']
 
         query = tryUrlencode({
@@ -124,7 +124,7 @@ class Season(SeasonProvider, Base):
 
     def buildUrl(self, media, quality):
         query = tryUrlencode({
-            'q': fireEvent('library.title', media['library'], condense = True, single = True),
+            'q': fireEvent('library.title', media['library'], single = True),
             'age': Env.setting('retention', 'nzb'),
             'sort': 'agedesc',
             'minsize': quality.get('size_min'),
@@ -140,7 +140,7 @@ class Episode(EpisodeProvider, Base):
 
     def buildUrl(self, media, quality):
         query = tryUrlencode({
-            'q': fireEvent('library.title', media['library'], condense = True, single = True),
+            'q': fireEvent('library.title', media['library'], single = True),
             'age': Env.setting('retention', 'nzb'),
             'sort': 'agedesc',
             'minsize': quality.get('size_min'),

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

@@ -95,7 +95,7 @@ class Movie(MovieProvider, Base):
 
     def buildUrl(self, media):
         query = tryUrlencode({
-            'search': fireEvent('library.title', media['library'], condense = True, single = True),
+            'search': fireEvent('library.title', media['library'], single = True),
             'cat': 7 # Movie cat
         })
         return query
@@ -104,7 +104,7 @@ class Season(SeasonProvider, Base):
 
     def buildUrl(self, media):
         query = tryUrlencode({
-            'search': fireEvent('library.title', media['library'], condense = True, single = True),
+            'search': fireEvent('library.title', media['library'], single = True),
             'cat': 12 # Season cat
         })
         return query
@@ -113,7 +113,7 @@ class Episode(EpisodeProvider, Base):
 
     def buildUrl(self, media):
         query = tryUrlencode({
-            'search': fireEvent('library.title', media['library'], condense = True, single = True),
+            'search': fireEvent('library.title', media['library'], single = True),
             'cat': 10 # Episode cat
         })
         return query

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

@@ -113,9 +113,10 @@ class Movie(MovieProvider, Base):
 
     def buildUrl(self, media, quality):
         query = tryUrlencode({
-            'search': '"%s" %s' % (fireEvent('searcher.get_search_title',
+            'search': '"%s" %s' % (
-                                  media['library'], include_identifier = False, single = True),
+                fireEvent('library.title', media['library'], include_year = False, single = True),
-                                  media['library']['year']),
+                media['library']['year']
+            ),
             'cat': self.getCatId(quality['identifier'])[0],
         })
         return query
@@ -124,8 +125,7 @@ class Season(SeasonProvider, Base):
     # For season bundles, bitsoup currently only has one category
     def buildUrl(self, media, quality):
         query = tryUrlencode({
-            'search': fireEvent('searcher.get_search_title', media['library'],
+            'search': fireEvent('library.title', media['library'], single = True),
-                                include_identifier = True, single = True),
             'cat': 45 # TV-Packs Category
         })
         return query
@@ -139,8 +139,7 @@ class Episode(EpisodeProvider, Base):
 
     def buildUrl(self, media, quality):
         query = tryUrlencode({
-            'search': fireEvent('searcher.get_search_title', media['library'],
+            'search': fireEvent('library.title', media['library'], single = True),
-                                include_identifier = True, single = True),
             'cat': self.getCatId(quality['identifier'])[0],
         })
         return query

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

@@ -99,14 +99,14 @@ class Base(TorrentMagnetProvider):
 class Movie(MovieProvider, Base):
 
     def buildUrl(self, media):
-        return fireEvent('library.title', media['library'], condense = True, single = True)
+        return fireEvent('library.title', media['library'], single = True)
 
 class Season(SeasonProvider, Base):
 
     def buildUrl(self, media):
-        return fireEvent('library.title', media['library'], condense = True, single = True)
+        return fireEvent('library.title', media['library'], single = True)
 
 class Episode(EpisodeProvider, Base):
 
     def buildUrl(self, media):
-        return fireEvent('library.title', media['library'], condense = True, single = True)
+        return fireEvent('library.title', media['library'], single = True)

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

@@ -104,7 +104,7 @@ class Movie(MovieProvider, Base):
         )
 
         arguments = tryUrlencode({
-            'search': fireEvent('library.title', media['library'], condense = True, single = True),
+            'search': fireEvent('library.title', media['library'], single = True),
             'method': 2,
         })
         query = "%s&%s" % (url, arguments)
@@ -124,7 +124,7 @@ class Season(SeasonProvider, Base):
         )
 
         arguments = tryUrlencode({
-            'search': fireEvent('library.title', media['library'], condense = True, single = True),
+            'search': fireEvent('library.title', media['library'], single = True),
             'method': 2,
         })
         query = "%s&%s" % (url, arguments)
@@ -145,7 +145,7 @@ class Episode(EpisodeProvider, Base):
         )
 
         arguments = tryUrlencode({
-            'search': fireEvent('library.title', media['library'], condense = True, single = True),
+            'search': fireEvent('library.title', media['library'], single = True),
             'method': 2,
         })
         query = "%s&%s" % (url, arguments)

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

@@ -130,8 +130,11 @@ class Movie(MovieProvider, Base):
     ]
 
     def buildUrl(self, media, page, cats):
-        return tryUrlencode('"%s"' % fireEvent('library.title', media['library'],
+        return (
-                                               condense = True, single = True)), page, ','.join(str(x) for x in cats)
+            tryUrlencode('"%s"' % fireEvent('library.title', media['library'], single = True)),
+            page,
+            ','.join(str(x) for x in cats)
+        )
 
 class Season(SeasonProvider, Base):
 
@@ -141,8 +144,11 @@ class Season(SeasonProvider, Base):
     ]
 
     def buildUrl(self, media, page, cats):
-        return tryUrlencode('"%s"' % fireEvent('library.title', media['library'],
+        return (
-                                               condense = True, single = True)), page, ','.join(str(x) for x in cats)
+            tryUrlencode('"%s"' % fireEvent('library.title', media['library'], single = True)),
+            page,
+            ','.join(str(x) for x in cats)
+        )
 
 class Episode(EpisodeProvider, Base):
 
@@ -152,5 +158,8 @@ class Episode(EpisodeProvider, Base):
     ]
 
     def buildUrl(self, media, page, cats):
-        return tryUrlencode('"%s"' % fireEvent('library.title', media['library'],
+        return (
-                                               condense = True, single = True)), page, ','.join(str(x) for x in cats)
+            tryUrlencode('"%s"' % fireEvent('library.title', media['library'], single = True)),
+            page,
+            ','.join(str(x) for x in cats)
+        )

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

@@ -76,7 +76,7 @@ class Movie(MovieProvider, Base):
         ([5], ['bd50']),
     ]
     def buildUrl(self, media):
-        return fireEvent('library.title', media['library'], condense = True, single = True)
+        return fireEvent('library.title', media['library'], single = True)
 
 class Season(SeasonProvider, Base):
 
@@ -84,7 +84,7 @@ class Season(SeasonProvider, Base):
         ([14], ['hdtv_sd', 'hdtv_720p', 'webdl_720p', 'webdl_1080p']),
     ]
     def buildUrl(self, media):
-        return fireEvent('library.title', media['library'], condense = True, single = True)
+        return fireEvent('library.title', media['library'], single = True)
 
 class Episode(EpisodeProvider, Base):
     cat_ids = [
@@ -92,5 +92,5 @@ class Episode(EpisodeProvider, Base):
         ([2], [24], [26], ['hdtv_sd'])
     ]
     def buildUrl(self, media):
-        return fireEvent('library.title', media['library'], condense = True, single = True)
+        return fireEvent('library.title', media['library'], single = True)
 

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

@@ -90,8 +90,10 @@ class Movie(MovieProvider, Base):
     ]
 
     def buildUrl(self, media, quality):
-        return (tryUrlencode('%s' % fireEvent('library.title', media['library'], condense = True,
+        return (
-                                              single = True)), self.getCatId(quality['identifier'])[0])
+            tryUrlencode(fireEvent('library.title', media['library'], single = True)),
+            self.getCatId(quality['identifier'])[0]
+        )
 
 class Season(SeasonProvider, Base):
 
@@ -100,8 +102,10 @@ class Season(SeasonProvider, Base):
     ]
 
     def buildUrl(self, media, quality):
-        return (tryUrlencode('%s' % fireEvent('library.title', media['library'], condense = True,
+        return (
-                                              single = True)), self.getCatId(quality['identifier'])[0])
+            tryUrlencode(fireEvent('library.title', media['library'], single = True)),
+            self.getCatId(quality['identifier'])[0]
+        )
 
 class Episode(EpisodeProvider, Base):
 
@@ -111,5 +115,7 @@ class Episode(EpisodeProvider, Base):
     ]
 
     def buildUrl(self, media, quality):
-        return (tryUrlencode('%s' % fireEvent('library.title', media['library'], condense = True,
+        return (
-                                              single = True)), self.getCatId(quality['identifier'])[0])
+            tryUrlencode(fireEvent('library.title', media['library'], single = True)),
+            self.getCatId(quality['identifier'])[0]
+        )

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

@@ -144,7 +144,7 @@ class Season(SeasonProvider, Base):
         arguments = tryUrlencode({
             'user': host['name'],
             'passkey': host['pass_key'],
-            'search': fireEvent('library.title', media['library'], condense = True, single = True)
+            'search': fireEvent('library.title', media['library'], single = True)
         })
         return '%s?%s' % (host['host'], arguments)
 
@@ -154,6 +154,6 @@ class Episode(EpisodeProvider, Base):
         arguments = tryUrlencode({
             'user': host['name'],
             'passkey': host['pass_key'],
-            'search': fireEvent('library.title', media['library'], condense = True, single = True)
+            'search': fireEvent('library.title', media['library'], single = True)
         })
         return '%s?%s' % (host['host'], arguments)

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

@@ -97,7 +97,7 @@ class Movie(MovieProvider, Base):
     cat_backup_id = 400
 
     def buildUrl(self, media, quality):
-        query = (tryUrlencode('%s' % fireEvent('library.title', media['library'], condense = True, single = True)),
+        query = (tryUrlencode(fireEvent('library.title', media['library'], single = True)),
                  self.getCatId(quality['identifier'])[0],
                  self.getSceneOnly())
         return query
@@ -115,7 +115,7 @@ class Season(SeasonProvider, Base):
     cat_backup_id = 980
 
     def buildUrl(self, media, quality):
-        query = (tryUrlencode('%s' % fireEvent('library.title', media['library'], condense = True, single = True)),
+        query = (tryUrlencode(fireEvent('library.title', media['library'], single = True)),
                  self.getCatId(quality['identifier'])[0],
                  self.getSceneOnly())
         return query
@@ -132,7 +132,7 @@ class Episode(EpisodeProvider, Base):
     cat_backup_id = 620
 
     def buildUrl(self, media, quality):
-        query = (tryUrlencode('%s' % fireEvent('library.title', media['library'], condense = True, single = True)),
+        query = (tryUrlencode(fireEvent('library.title', media['library'], single = True)),
                  self.getCatId(quality['identifier'])[0],
                  self.getSceneOnly())
         return query