Browse Source

Renamed 'library.title' to 'library.query'

pull/2681/head
Dean Gardiner 11 years ago
parent
commit
9ba8910281
  1. 4
      couchpotato/core/media/movie/library/movie/main.py
  2. 6
      couchpotato/core/media/show/library/episode/main.py
  3. 6
      couchpotato/core/media/show/library/season/main.py
  4. 4
      couchpotato/core/media/show/library/show/main.py
  5. 2
      couchpotato/core/media/show/searcher/main.py
  6. 2
      couchpotato/core/providers/base.py
  7. 4
      couchpotato/core/providers/nzb/binsearch/main.py
  8. 4
      couchpotato/core/providers/nzb/newznab/main.py
  9. 6
      couchpotato/core/providers/nzb/nzbclub/main.py
  10. 6
      couchpotato/core/providers/nzb/nzbindex/main.py
  11. 6
      couchpotato/core/providers/torrent/bithdtv/main.py
  12. 6
      couchpotato/core/providers/torrent/bitsoup/main.py
  13. 6
      couchpotato/core/providers/torrent/publichd/main.py
  14. 6
      couchpotato/core/providers/torrent/sceneaccess/main.py
  15. 6
      couchpotato/core/providers/torrent/thepiratebay/main.py
  16. 6
      couchpotato/core/providers/torrent/torrentday/main.py
  17. 6
      couchpotato/core/providers/torrent/torrentleech/main.py
  18. 4
      couchpotato/core/providers/torrent/torrentpotato/main.py
  19. 6
      couchpotato/core/providers/torrent/torrentshack/main.py

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

@ -16,12 +16,12 @@ class MovieLibraryPlugin(LibraryBase):
default_dict = {'titles': {}, 'files':{}} default_dict = {'titles': {}, 'files':{}}
def __init__(self): def __init__(self):
addEvent('library.title', self.title) addEvent('library.query', self.query)
addEvent('library.add.movie', self.add) addEvent('library.add.movie', self.add)
addEvent('library.update.movie', self.update) addEvent('library.update.movie', self.update)
addEvent('library.update.movie.release_date', self.updateReleaseDate) 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': if library.get('type') != 'movie':
return return

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

@ -17,13 +17,13 @@ class EpisodeLibraryPlugin(LibraryBase):
default_dict = {'titles': {}, 'files':{}} default_dict = {'titles': {}, 'files':{}}
def __init__(self): def __init__(self):
addEvent('library.title', self.title) addEvent('library.query', self.query)
addEvent('library.identifier', self.identifier) addEvent('library.identifier', self.identifier)
addEvent('library.add.episode', self.add) addEvent('library.add.episode', self.add)
addEvent('library.update.episode', self.update) addEvent('library.update.episode', self.update)
addEvent('library.update.episode_release_date', self.updateReleaseDate) 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': if library is list or library.get('type') != 'episode':
return return
@ -33,7 +33,7 @@ class EpisodeLibraryPlugin(LibraryBase):
return return
titles = fireEvent( titles = fireEvent(
'library.title', 'library.query',
library['related_libraries']['season'][0], library['related_libraries']['season'][0],
first=False, first=False,
include_identifier=include_identifier, include_identifier=include_identifier,

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

@ -17,13 +17,13 @@ class SeasonLibraryPlugin(LibraryBase):
default_dict = {'titles': {}, 'files':{}} default_dict = {'titles': {}, 'files':{}}
def __init__(self): def __init__(self):
addEvent('library.title', self.title) addEvent('library.query', self.query)
addEvent('library.identifier', self.identifier) addEvent('library.identifier', self.identifier)
addEvent('library.add.season', self.add) addEvent('library.add.season', self.add)
addEvent('library.update.season', self.update) addEvent('library.update.season', self.update)
addEvent('library.update.season_release_date', self.updateReleaseDate) 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': if library is list or library.get('type') != 'season':
return return
@ -33,7 +33,7 @@ class SeasonLibraryPlugin(LibraryBase):
return return
titles = fireEvent( titles = fireEvent(
'library.title', 'library.query',
library['related_libraries']['show'][0], library['related_libraries']['show'][0],
first=False, first=False,
condense=condense, condense=condense,

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

@ -20,12 +20,12 @@ class ShowLibraryPlugin(LibraryBase):
def __init__(self): def __init__(self):
self.query_condenser = QueryCondenser() self.query_condenser = QueryCondenser()
addEvent('library.title', self.title) addEvent('library.query', self.query)
addEvent('library.add.show', self.add) addEvent('library.add.show', self.add)
addEvent('library.update.show', self.update) addEvent('library.update.show', self.update)
addEvent('library.update.show_release_date', self.updateReleaseDate) 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': if library is list or library.get('type') != 'show':
return return

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

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

2
couchpotato/core/providers/base.py

@ -207,7 +207,7 @@ class YarrProvider(Provider):
self._search(media, quality, results) self._search(media, quality, results)
# Search possible titles # Search possible titles
else: 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): for title in possibleTitles(media_title):
self._searchOnTitle(title, media, quality, results) self._searchOnTitle(title, media, quality, results)

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

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

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

@ -200,7 +200,7 @@ class Movie(MovieProvider, Base):
class Season(SeasonProvider, Base): class Season(SeasonProvider, Base):
def buildUrl(self, media, api_key): 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) identifier = fireEvent('library.identifier', media['library'], single = True)
query = tryUrlencode({ query = tryUrlencode({
@ -215,7 +215,7 @@ class Season(SeasonProvider, Base):
class Episode(EpisodeProvider, Base): class Episode(EpisodeProvider, Base):
def buildUrl(self, media, api_key): 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) identifier = fireEvent('library.identifier', media['library'], single = True)
query = tryUrlencode({ query = tryUrlencode({

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

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

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

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

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

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

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

@ -114,7 +114,7 @@ class Movie(MovieProvider, Base):
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
query = tryUrlencode({ query = tryUrlencode({
'search': '"%s" %s' % ( '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'] media['library']['year']
), ),
'cat': self.getCatId(quality['identifier'])[0], 'cat': self.getCatId(quality['identifier'])[0],
@ -125,7 +125,7 @@ class Season(SeasonProvider, Base):
# For season bundles, bitsoup currently only has one category # For season bundles, bitsoup currently only has one category
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
query = tryUrlencode({ query = tryUrlencode({
'search': fireEvent('library.title', media['library'], single = True), 'search': fireEvent('library.query', media['library'], single = True),
'cat': 45 # TV-Packs Category 'cat': 45 # TV-Packs Category
}) })
return query return query
@ -139,7 +139,7 @@ class Episode(EpisodeProvider, Base):
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
query = tryUrlencode({ query = tryUrlencode({
'search': fireEvent('library.title', media['library'], single = True), 'search': fireEvent('library.query', media['library'], single = True),
'cat': self.getCatId(quality['identifier'])[0], 'cat': self.getCatId(quality['identifier'])[0],
}) })
return query return query

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

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

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

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

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

@ -131,7 +131,7 @@ class Movie(MovieProvider, Base):
def buildUrl(self, media, page, cats): def buildUrl(self, media, page, cats):
return ( return (
tryUrlencode('"%s"' % fireEvent('library.title', media['library'], single = True)), tryUrlencode('"%s"' % fireEvent('library.query', media['library'], single = True)),
page, page,
','.join(str(x) for x in cats) ','.join(str(x) for x in cats)
) )
@ -145,7 +145,7 @@ class Season(SeasonProvider, Base):
def buildUrl(self, media, page, cats): def buildUrl(self, media, page, cats):
return ( return (
tryUrlencode('"%s"' % fireEvent('library.title', media['library'], single = True)), tryUrlencode('"%s"' % fireEvent('library.query', media['library'], single = True)),
page, page,
','.join(str(x) for x in cats) ','.join(str(x) for x in cats)
) )
@ -159,7 +159,7 @@ class Episode(EpisodeProvider, Base):
def buildUrl(self, media, page, cats): def buildUrl(self, media, page, cats):
return ( return (
tryUrlencode('"%s"' % fireEvent('library.title', media['library'], single = True)), tryUrlencode('"%s"' % fireEvent('library.query', media['library'], single = True)),
page, page,
','.join(str(x) for x in cats) ','.join(str(x) for x in cats)
) )

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

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

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

@ -91,7 +91,7 @@ class Movie(MovieProvider, Base):
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
return ( return (
tryUrlencode(fireEvent('library.title', media['library'], single = True)), tryUrlencode(fireEvent('library.query', media['library'], single = True)),
self.getCatId(quality['identifier'])[0] self.getCatId(quality['identifier'])[0]
) )
@ -103,7 +103,7 @@ class Season(SeasonProvider, Base):
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
return ( return (
tryUrlencode(fireEvent('library.title', media['library'], single = True)), tryUrlencode(fireEvent('library.query', media['library'], single = True)),
self.getCatId(quality['identifier'])[0] self.getCatId(quality['identifier'])[0]
) )
@ -116,6 +116,6 @@ class Episode(EpisodeProvider, Base):
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
return ( return (
tryUrlencode(fireEvent('library.title', media['library'], single = True)), tryUrlencode(fireEvent('library.query', media['library'], single = True)),
self.getCatId(quality['identifier'])[0] self.getCatId(quality['identifier'])[0]
) )

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

@ -144,7 +144,7 @@ class Season(SeasonProvider, Base):
arguments = tryUrlencode({ arguments = tryUrlencode({
'user': host['name'], 'user': host['name'],
'passkey': host['pass_key'], '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) return '%s?%s' % (host['host'], arguments)
@ -154,6 +154,6 @@ class Episode(EpisodeProvider, Base):
arguments = tryUrlencode({ arguments = tryUrlencode({
'user': host['name'], 'user': host['name'],
'passkey': host['pass_key'], '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) return '%s?%s' % (host['host'], arguments)

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

@ -97,7 +97,7 @@ class Movie(MovieProvider, Base):
cat_backup_id = 400 cat_backup_id = 400
def buildUrl(self, media, quality): 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.getCatId(quality['identifier'])[0],
self.getSceneOnly()) self.getSceneOnly())
return query return query
@ -115,7 +115,7 @@ class Season(SeasonProvider, Base):
cat_backup_id = 980 cat_backup_id = 980
def buildUrl(self, media, quality): 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.getCatId(quality['identifier'])[0],
self.getSceneOnly()) self.getSceneOnly())
return query return query
@ -132,7 +132,7 @@ class Episode(EpisodeProvider, Base):
cat_backup_id = 620 cat_backup_id = 620
def buildUrl(self, media, quality): 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.getCatId(quality['identifier'])[0],
self.getSceneOnly()) self.getSceneOnly())
return query return query

Loading…
Cancel
Save