Renamed 'library.title' to 'library.query'
This commit is contained in:
1 parent
e83a3cf263
commit
9ba8910281
19 files changed
+48
-48
No files matched your search
@@ -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)
|
||||
|
||||
@@ -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'),
|
||||
|
||||
@@ -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({
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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'),
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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)
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
)
|
||||
@@ -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)
|
||||
|
||||
@@ -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]
|
||||
)
|
||||
@@ -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)
|
||||
@@ -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
|
||||
Reference in new issue
Block a user