dinislage/CouchPotatoServer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dean Gardiner committed 2014-01-11 15:55:20 +13:00
1 parent b3c2945d9b
commit e83a3cf263
21 files changed
+90 -58
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

couchpotato/core/providers/base.py
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+2 -2
View File
@@ -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
+3 -4
View File
@@ -80,8 +80,7 @@ class Movie(MovieProvider, Base):
def buildUrl(self, media):
query = tryUrlencode({
'q': '"%s %s"' % (fireEvent('library.title', media['library'], condense = True,
single = True), media['library']['year']),
'q': '"%s"' % fireEvent('library.title', media['library'], single = True),
'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
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+6 -7
View File
@@ -113,9 +113,10 @@ class Movie(MovieProvider, Base):
def buildUrl(self, media, quality):
query = tryUrlencode({
'search': '"%s" %s' % (fireEvent('searcher.get_search_title',
media['library'], include_identifier = False, single = True),
media['library']['year']),
'search': '"%s" %s' % (
fireEvent('library.title', media['library'], include_year = False, single = True),
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'],
include_identifier = True, single = True),
'search': fireEvent('library.title', media['library'], 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'],
include_identifier = True, single = True),
'search': fireEvent('library.title', media['library'], single = True),
'cat': self.getCatId(quality['identifier'])[0],
})
return query
couchpotato/core/providers/torrent/publichd/main.py
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+15 -6
View File
@@ -130,8 +130,11 @@ class Movie(MovieProvider, Base):
]
def buildUrl(self, media, page, cats):
return tryUrlencode('"%s"' % fireEvent('library.title', media['library'],
condense = True, single = True)), page, ','.join(str(x) for x in cats)
return (
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'],
condense = True, single = True)), page, ','.join(str(x) for x in cats)
return (
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'],
condense = True, single = True)), page, ','.join(str(x) for x in cats)
return (
tryUrlencode('"%s"' % fireEvent('library.title', media['library'], single = True)),
page,
','.join(str(x) for x in cats)
)
couchpotato/core/providers/torrent/torrentday/main.py
+3 -3
View File
@@ -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
+12 -6
View File
@@ -90,8 +90,10 @@ class Movie(MovieProvider, Base):
]
def buildUrl(self, media, quality):
return (tryUrlencode('%s' % fireEvent('library.title', media['library'], condense = True,
single = True)), self.getCatId(quality['identifier'])[0])
return (
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,
single = True)), self.getCatId(quality['identifier'])[0])
return (
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,
single = True)), self.getCatId(quality['identifier'])[0])
return (
tryUrlencode(fireEvent('library.title', media['library'], single = True)),
self.getCatId(quality['identifier'])[0]
)
couchpotato/core/providers/torrent/torrentpotato/main.py
+2 -2
View File
@@ -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
+3 -3
View File
@@ -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