diff --git a/couchpotato/core/media/movie/library/movie/main.py b/couchpotato/core/media/movie/library/movie/main.py index dde81f5c..94e519d1 100644 --- a/couchpotato/core/media/movie/library/movie/main.py +++ b/couchpotato/core/media/movie/library/movie/main.py @@ -16,12 +16,12 @@ class MovieLibraryPlugin(LibraryBase): default_dict = {'titles': {}, 'files':{}} def __init__(self): - addEvent('library.title', self.title) + addEvent('library.query', self.query) addEvent('library.add.movie', self.add) addEvent('library.update.movie', self.update) addEvent('library.update.movie.release_date', self.updateReleaseDate) - def title(self, library, first = True, include_year = True, **kwargs): + def query(self, library, first = True, include_year = True, **kwargs): if library.get('type') != 'movie': return diff --git a/couchpotato/core/media/show/library/episode/main.py b/couchpotato/core/media/show/library/episode/main.py index fb0a083b..a1c1bd7b 100644 --- a/couchpotato/core/media/show/library/episode/main.py +++ b/couchpotato/core/media/show/library/episode/main.py @@ -17,13 +17,13 @@ class EpisodeLibraryPlugin(LibraryBase): default_dict = {'titles': {}, 'files':{}} def __init__(self): - addEvent('library.title', self.title) + addEvent('library.query', self.query) addEvent('library.identifier', self.identifier) addEvent('library.add.episode', self.add) addEvent('library.update.episode', self.update) addEvent('library.update.episode_release_date', self.updateReleaseDate) - def title(self, library, first = True, condense = True, include_identifier = True, **kwargs): + def query(self, library, first = True, condense = True, include_identifier = True, **kwargs): if library is list or library.get('type') != 'episode': return @@ -33,7 +33,7 @@ class EpisodeLibraryPlugin(LibraryBase): return titles = fireEvent( - 'library.title', + 'library.query', library['related_libraries']['season'][0], first=False, include_identifier=include_identifier, diff --git a/couchpotato/core/media/show/library/season/main.py b/couchpotato/core/media/show/library/season/main.py index 0ceb657c..a20269ab 100644 --- a/couchpotato/core/media/show/library/season/main.py +++ b/couchpotato/core/media/show/library/season/main.py @@ -17,13 +17,13 @@ class SeasonLibraryPlugin(LibraryBase): default_dict = {'titles': {}, 'files':{}} def __init__(self): - addEvent('library.title', self.title) + addEvent('library.query', self.query) addEvent('library.identifier', self.identifier) addEvent('library.add.season', self.add) addEvent('library.update.season', self.update) addEvent('library.update.season_release_date', self.updateReleaseDate) - def title(self, library, first = True, condense = True, include_identifier = True, **kwargs): + def query(self, library, first = True, condense = True, include_identifier = True, **kwargs): if library is list or library.get('type') != 'season': return @@ -33,7 +33,7 @@ class SeasonLibraryPlugin(LibraryBase): return titles = fireEvent( - 'library.title', + 'library.query', library['related_libraries']['show'][0], first=False, condense=condense, diff --git a/couchpotato/core/media/show/library/show/main.py b/couchpotato/core/media/show/library/show/main.py index 9e3aab18..abc8d93a 100644 --- a/couchpotato/core/media/show/library/show/main.py +++ b/couchpotato/core/media/show/library/show/main.py @@ -20,12 +20,12 @@ class ShowLibraryPlugin(LibraryBase): def __init__(self): self.query_condenser = QueryCondenser() - addEvent('library.title', self.title) + addEvent('library.query', self.query) addEvent('library.add.show', self.add) addEvent('library.update.show', self.update) addEvent('library.update.show_release_date', self.updateReleaseDate) - def title(self, library, first = True, condense = True, **kwargs): + def query(self, library, first = True, condense = True, **kwargs): if library is list or library.get('type') != 'show': return diff --git a/couchpotato/core/media/show/searcher/main.py b/couchpotato/core/media/show/searcher/main.py index 14e3d1c5..856d61d5 100644 --- a/couchpotato/core/media/show/searcher/main.py +++ b/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'], condense = False, single=True) + default_title = fireEvent('library.query', 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) diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/providers/base.py index f530a42d..21243bd1 100644 --- a/couchpotato/core/providers/base.py +++ b/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'], single = True) + media_title = fireEvent('library.query', media['library'], single = True) for title in possibleTitles(media_title): self._searchOnTitle(title, media, quality, results) diff --git a/couchpotato/core/providers/nzb/binsearch/main.py b/couchpotato/core/providers/nzb/binsearch/main.py index 237538bb..9c75c0e1 100644 --- a/couchpotato/core/providers/nzb/binsearch/main.py +++ b/couchpotato/core/providers/nzb/binsearch/main.py @@ -117,7 +117,7 @@ class Season(SeasonProvider, Base): def buildUrl(self, media, quality): query = tryUrlencode({ - 'q': fireEvent('library.title', media['library'], single = True), + 'q': fireEvent('library.query', 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'], single = True), + 'q': fireEvent('library.query', media['library'], single = True), 'm': 'n', 'max': 400, 'adv_age': Env.setting('retention', 'nzb'), diff --git a/couchpotato/core/providers/nzb/newznab/main.py b/couchpotato/core/providers/nzb/newznab/main.py index d8b1aa49..93feea65 100644 --- a/couchpotato/core/providers/nzb/newznab/main.py +++ b/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'], include_identifier = False, single = True) + search_title = fireEvent('library.query', 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'], include_identifier = False, single = True) + search_title = fireEvent('library.query', media['library'], include_identifier = False, single = True) identifier = fireEvent('library.identifier', media['library'], single = True) query = tryUrlencode({ diff --git a/couchpotato/core/providers/nzb/nzbclub/main.py b/couchpotato/core/providers/nzb/nzbclub/main.py index 7a8e9586..9f4fa6c7 100644 --- a/couchpotato/core/providers/nzb/nzbclub/main.py +++ b/couchpotato/core/providers/nzb/nzbclub/main.py @@ -80,7 +80,7 @@ class Movie(MovieProvider, Base): def buildUrl(self, media): query = tryUrlencode({ - 'q': '"%s"' % fireEvent('library.title', media['library'], single = True), + 'q': '"%s"' % fireEvent('library.query', media['library'], single = True), 'ig': 1, 'rpp': 200, 'st': 5, @@ -93,7 +93,7 @@ class Season(SeasonProvider, Base): def buildUrl(self, media): query = tryUrlencode({ - 'q': fireEvent('library.title', media['library'], single = True), + 'q': fireEvent('library.query', media['library'], single = True), 'ig': 1, 'rpp': 200, 'st': 5, @@ -106,7 +106,7 @@ class Episode(EpisodeProvider, Base): def buildUrl(self, media): query = tryUrlencode({ - 'q': fireEvent('library.title', media['library'], single = True), + 'q': fireEvent('library.query', media['library'], single = True), 'ig': 1, 'rpp': 200, 'st': 5, diff --git a/couchpotato/core/providers/nzb/nzbindex/main.py b/couchpotato/core/providers/nzb/nzbindex/main.py index 5c663f8b..70e7420f 100644 --- a/couchpotato/core/providers/nzb/nzbindex/main.py +++ b/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'], include_year = False, single = True) + title = fireEvent('library.query', 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'], single = True), + 'q': fireEvent('library.query', 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'], single = True), + 'q': fireEvent('library.query', media['library'], single = True), 'age': Env.setting('retention', 'nzb'), 'sort': 'agedesc', 'minsize': quality.get('size_min'), diff --git a/couchpotato/core/providers/torrent/bithdtv/main.py b/couchpotato/core/providers/torrent/bithdtv/main.py index 7e90fe2c..b37914b7 100644 --- a/couchpotato/core/providers/torrent/bithdtv/main.py +++ b/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'], single = True), + 'search': fireEvent('library.query', 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'], single = True), + 'search': fireEvent('library.query', 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'], single = True), + 'search': fireEvent('library.query', media['library'], single = True), 'cat': 10 # Episode cat }) return query \ No newline at end of file diff --git a/couchpotato/core/providers/torrent/bitsoup/main.py b/couchpotato/core/providers/torrent/bitsoup/main.py index cad3e52e..4129b5cf 100644 --- a/couchpotato/core/providers/torrent/bitsoup/main.py +++ b/couchpotato/core/providers/torrent/bitsoup/main.py @@ -114,7 +114,7 @@ class Movie(MovieProvider, Base): def buildUrl(self, media, quality): query = tryUrlencode({ 'search': '"%s" %s' % ( - fireEvent('library.title', media['library'], include_year = False, single = True), + fireEvent('library.query', media['library'], include_year = False, single = True), media['library']['year'] ), 'cat': self.getCatId(quality['identifier'])[0], @@ -125,7 +125,7 @@ class Season(SeasonProvider, Base): # For season bundles, bitsoup currently only has one category def buildUrl(self, media, quality): query = tryUrlencode({ - 'search': fireEvent('library.title', media['library'], single = True), + 'search': fireEvent('library.query', media['library'], single = True), 'cat': 45 # TV-Packs Category }) return query @@ -139,7 +139,7 @@ class Episode(EpisodeProvider, Base): def buildUrl(self, media, quality): query = tryUrlencode({ - 'search': fireEvent('library.title', media['library'], single = True), + 'search': fireEvent('library.query', media['library'], single = True), 'cat': self.getCatId(quality['identifier'])[0], }) return query diff --git a/couchpotato/core/providers/torrent/publichd/main.py b/couchpotato/core/providers/torrent/publichd/main.py index f01a0e54..7db1488d 100644 --- a/couchpotato/core/providers/torrent/publichd/main.py +++ b/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'], single = True) + return fireEvent('library.query', media['library'], single = True) class Season(SeasonProvider, Base): def buildUrl(self, media): - return fireEvent('library.title', media['library'], single = True) + return fireEvent('library.query', media['library'], single = True) class Episode(EpisodeProvider, Base): def buildUrl(self, media): - return fireEvent('library.title', media['library'], single = True) + return fireEvent('library.query', media['library'], single = True) diff --git a/couchpotato/core/providers/torrent/sceneaccess/main.py b/couchpotato/core/providers/torrent/sceneaccess/main.py index decb6641..31c338b8 100644 --- a/couchpotato/core/providers/torrent/sceneaccess/main.py +++ b/couchpotato/core/providers/torrent/sceneaccess/main.py @@ -104,7 +104,7 @@ class Movie(MovieProvider, Base): ) arguments = tryUrlencode({ - 'search': fireEvent('library.title', media['library'], single = True), + 'search': fireEvent('library.query', 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'], single = True), + 'search': fireEvent('library.query', 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'], single = True), + 'search': fireEvent('library.query', media['library'], single = True), 'method': 2, }) query = "%s&%s" % (url, arguments) diff --git a/couchpotato/core/providers/torrent/thepiratebay/main.py b/couchpotato/core/providers/torrent/thepiratebay/main.py index ada64a8f..04ad39f3 100644 --- a/couchpotato/core/providers/torrent/thepiratebay/main.py +++ b/couchpotato/core/providers/torrent/thepiratebay/main.py @@ -131,7 +131,7 @@ class Movie(MovieProvider, Base): def buildUrl(self, media, page, cats): return ( - tryUrlencode('"%s"' % fireEvent('library.title', media['library'], single = True)), + tryUrlencode('"%s"' % fireEvent('library.query', media['library'], single = True)), page, ','.join(str(x) for x in cats) ) @@ -145,7 +145,7 @@ class Season(SeasonProvider, Base): def buildUrl(self, media, page, cats): return ( - tryUrlencode('"%s"' % fireEvent('library.title', media['library'], single = True)), + tryUrlencode('"%s"' % fireEvent('library.query', media['library'], single = True)), page, ','.join(str(x) for x in cats) ) @@ -159,7 +159,7 @@ class Episode(EpisodeProvider, Base): def buildUrl(self, media, page, cats): return ( - tryUrlencode('"%s"' % fireEvent('library.title', media['library'], single = True)), + tryUrlencode('"%s"' % fireEvent('library.query', media['library'], single = True)), page, ','.join(str(x) for x in cats) ) diff --git a/couchpotato/core/providers/torrent/torrentday/main.py b/couchpotato/core/providers/torrent/torrentday/main.py index 868e1d70..cfede6a7 100644 --- a/couchpotato/core/providers/torrent/torrentday/main.py +++ b/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'], single = True) + return fireEvent('library.query', 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'], single = True) + return fireEvent('library.query', 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'], single = True) + return fireEvent('library.query', media['library'], single = True) diff --git a/couchpotato/core/providers/torrent/torrentleech/main.py b/couchpotato/core/providers/torrent/torrentleech/main.py index 07268cb1..fba8323b 100644 --- a/couchpotato/core/providers/torrent/torrentleech/main.py +++ b/couchpotato/core/providers/torrent/torrentleech/main.py @@ -91,7 +91,7 @@ class Movie(MovieProvider, Base): def buildUrl(self, media, quality): return ( - tryUrlencode(fireEvent('library.title', media['library'], single = True)), + tryUrlencode(fireEvent('library.query', media['library'], single = True)), self.getCatId(quality['identifier'])[0] ) @@ -103,7 +103,7 @@ class Season(SeasonProvider, Base): def buildUrl(self, media, quality): return ( - tryUrlencode(fireEvent('library.title', media['library'], single = True)), + tryUrlencode(fireEvent('library.query', media['library'], single = True)), self.getCatId(quality['identifier'])[0] ) @@ -116,6 +116,6 @@ class Episode(EpisodeProvider, Base): def buildUrl(self, media, quality): return ( - tryUrlencode(fireEvent('library.title', media['library'], single = True)), + tryUrlencode(fireEvent('library.query', media['library'], single = True)), self.getCatId(quality['identifier'])[0] ) diff --git a/couchpotato/core/providers/torrent/torrentpotato/main.py b/couchpotato/core/providers/torrent/torrentpotato/main.py index 4576d525..b9f67244 100644 --- a/couchpotato/core/providers/torrent/torrentpotato/main.py +++ b/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'], single = True) + 'search': fireEvent('library.query', 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'], single = True) + 'search': fireEvent('library.query', media['library'], single = True) }) return '%s?%s' % (host['host'], arguments) diff --git a/couchpotato/core/providers/torrent/torrentshack/main.py b/couchpotato/core/providers/torrent/torrentshack/main.py index d137dfdc..6a91ff6c 100644 --- a/couchpotato/core/providers/torrent/torrentshack/main.py +++ b/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(fireEvent('library.title', media['library'], single = True)), + query = (tryUrlencode(fireEvent('library.query', 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(fireEvent('library.title', media['library'], single = True)), + query = (tryUrlencode(fireEvent('library.query', 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(fireEvent('library.title', media['library'], single = True)), + query = (tryUrlencode(fireEvent('library.query', media['library'], single = True)), self.getCatId(quality['identifier'])[0], self.getSceneOnly()) return query