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

use identifier instead

Browse Source
This commit is contained in:
Joel Kåberg
2013-12-15 11:12:47 +01:00
parent 3e28d5a936
commit 26509f614c
7 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/providers/torrent/bithdtv/main.py
+2 -2
View File
@@ -95,8 +95,8 @@ class Movie(MovieProvider, Base):
def buildUrl(self, media): def buildUrl(self, media):
query = tryUrlencode({ query = tryUrlencode({
'search': '%s %s' % (fireEvent('searcher.get_search_title', 'search': fireEvent('searcher.get_search_title', media['library'],
media['library'], single = True), media['library']['year']), include_identifier = True, single = True),
'cat': 7 # Movie cat 'cat': 7 # Movie cat
}) })
return query return query
couchpotato/core/providers/torrent/publichd/main.py
+1 -3
View File
@@ -99,9 +99,7 @@ class Base(TorrentMagnetProvider):
class Movie(MovieProvider, Base): class Movie(MovieProvider, Base):
def buildUrl(self, media): def buildUrl(self, media):
query = '%s %s' % (fireEvent('searcher.get_search_title', return fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True)
media['library'], single = True), media['library']['year'])
return query
class Season(SeasonProvider, Base): class Season(SeasonProvider, Base):
couchpotato/core/providers/torrent/sceneaccess/main.py
+6 -6
View File
@@ -99,8 +99,8 @@ class Movie(MovieProvider, Base):
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
url = self.urls['search'] % ( url = self.urls['search'] % (
self.getCatId(quality['identifier'])[0], self.getCatId(quality['identifier'])[0],
self.getCatId(quality['identifier'])[0] self.getCatId(quality['identifier'])[0]
) )
arguments = tryUrlencode({ arguments = tryUrlencode({
@@ -119,8 +119,8 @@ class Season(SeasonProvider, Base):
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
url = self.urls['archive'] % ( url = self.urls['archive'] % (
self.getCatId(quality['identifier'])[0], self.getCatId(quality['identifier'])[0],
self.getCatId(quality['identifier'])[0] self.getCatId(quality['identifier'])[0]
) )
arguments = tryUrlencode({ arguments = tryUrlencode({
@@ -140,8 +140,8 @@ class Episode(EpisodeProvider, Base):
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
url = self.urls['search'] % ( url = self.urls['search'] % (
self.getCatId(quality['identifier'])[0], self.getCatId(quality['identifier'])[0],
self.getCatId(quality['identifier'])[0] self.getCatId(quality['identifier'])[0]
) )
arguments = tryUrlencode({ arguments = tryUrlencode({
couchpotato/core/providers/torrent/thepiratebay/main.py
+4 -7
View File
@@ -130,9 +130,8 @@ class Movie(MovieProvider, Base):
] ]
def buildUrl(self, media, page, cats): def buildUrl(self, media, page, cats):
query = tryUrlencode('"%s" %s' % (fireEvent('searcher.get_search_title', media['library'], return tryUrlencode('"%s"' % fireEvent('searcher.get_search_title', media['library'],
single = True), media['library']['year'])), page, ','.join(str(x) for x in cats) include_identifier = True, single = True)), page, ','.join(str(x) for x in cats)
return query
class Season(SeasonProvider, Base): class Season(SeasonProvider, Base):
@@ -142,9 +141,8 @@ class Season(SeasonProvider, Base):
] ]
def buildUrl(self, media, page, cats): def buildUrl(self, media, page, cats):
query = tryUrlencode('"%s"' % fireEvent('searcher.get_search_title', media['library'], return tryUrlencode('"%s"' % fireEvent('searcher.get_search_title', media['library'],
include_identifier = True, single = True)), page, ','.join(str(x) for x in cats) include_identifier = True, single = True)), page, ','.join(str(x) for x in cats)
return query
class Episode(EpisodeProvider, Base): class Episode(EpisodeProvider, Base):
@@ -154,6 +152,5 @@ class Episode(EpisodeProvider, Base):
] ]
def buildUrl(self, media, page, cats): def buildUrl(self, media, page, cats):
query = tryUrlencode('"%s"' % fireEvent('searcher.get_search_title', media['library'], return tryUrlencode('"%s"' % fireEvent('searcher.get_search_title', media['library'],
include_identifier = True, single = True)), page, ','.join(str(x) for x in cats) include_identifier = True, single = True)), page, ','.join(str(x) for x in cats)
return query
couchpotato/core/providers/torrent/torrentday/main.py
+1 -4
View File
@@ -76,10 +76,7 @@ class Movie(MovieProvider, Base):
([5], ['bd50']), ([5], ['bd50']),
] ]
def buildUrl(self, media): def buildUrl(self, media):
query = '"%s %s"' % (fireEvent('searcher.get_search_title', return fireEvent('searcher.get_search_title', media['library'], include_identifier = True, single = True)
media['library'], single = True), media['library']['year'])
return query
class Season(SeasonProvider, Base): class Season(SeasonProvider, Base):
couchpotato/core/providers/torrent/torrentleech/main.py
+4 -7
View File
@@ -90,9 +90,8 @@ class Movie(MovieProvider, Base):
] ]
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
query = (tryUrlencode('%s %s' % (fireEvent('searcher.get_search_title', return (tryUrlencode('%s' % fireEvent('searcher.get_search_title',
media['library'], single = True), media['library']['year'])), self.getCatId(quality['identifier'])[0]) media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0])
return query
class Season(SeasonProvider, Base): class Season(SeasonProvider, Base):
@@ -101,9 +100,8 @@ class Season(SeasonProvider, Base):
] ]
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
query = (tryUrlencode('%s' % fireEvent('searcher.get_search_title', return (tryUrlencode('%s' % fireEvent('searcher.get_search_title',
media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0]) media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0])
return query
class Episode(EpisodeProvider, Base): class Episode(EpisodeProvider, Base):
@@ -113,6 +111,5 @@ class Episode(EpisodeProvider, Base):
] ]
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
query = (tryUrlencode('%s' % fireEvent('searcher.get_search_title', return (tryUrlencode('%s' % fireEvent('searcher.get_search_title',
media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0]) media['library'], include_identifier = True, single = True)), self.getCatId(quality['identifier'])[0])
return query
couchpotato/core/providers/torrent/torrentshack/main.py
+2 -2
View File
@@ -97,8 +97,8 @@ class Movie(MovieProvider, Base):
cat_backup_id = 400 cat_backup_id = 400
def buildUrl(self, media, quality): def buildUrl(self, media, quality):
query = (tryUrlencode('%s %s' % (fireEvent('searcher.get_search_title', query = (tryUrlencode('%s' % fireEvent('searcher.get_search_title',
media['library'], single = True), media['library']['year'])), media['library'], include_identifier = True, single = True)),
self.getCatId(quality['identifier'])[0], self.getCatId(quality['identifier'])[0],
self.getSceneOnly()) self.getSceneOnly())
return query return query