Fix false positives from Sceneaccess and Torrentday

This commit is contained in:
mikke89
2014-05-04 23:23:45 +02:00
parent bb56750c1a
commit ffc99cd4f4
3 changed files with 9 additions and 8 deletions
@@ -24,9 +24,9 @@ class Base(TorrentProvider):
http_time_between_calls = 1 # Seconds http_time_between_calls = 1 # Seconds
def _search(self, media, quality, results): def _searchOnTitle(self, title, media, quality, results):
url = self.buildUrl(media, quality) url = self.buildUrl(title, media, quality)
data = self.getHTMLData(url) data = self.getHTMLData(url)
if data: if data:
@@ -1,3 +1,4 @@
from couchpotato.core.helpers.encoding import tryUrlencode
from couchpotato.core.helpers.variable import tryInt from couchpotato.core.helpers.variable import tryInt
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.media._base.providers.torrent.base import TorrentProvider from couchpotato.core.media._base.providers.torrent.base import TorrentProvider
@@ -18,16 +19,16 @@ class Base(TorrentProvider):
http_time_between_calls = 1 # Seconds http_time_between_calls = 1 # Seconds
def _search(self, media, quality, results): def _searchOnTitle(self, title, media, quality, results):
query = self.buildUrl(media) query = '%s %s' % (title, media['info']['year'])
data = { data = {
'/browse.php?': None, '/browse.php?': None,
'cata': 'yes', 'cata': 'yes',
'jxt': 8, 'jxt': 8,
'jxw': 'b', 'jxw': 'b',
'search': query, 'search': tryUrlencode(query),
} }
data = self.getJsonData(self.urls['search'], data = data) data = self.getJsonData(self.urls['search'], data = data)
@@ -17,13 +17,13 @@ class SceneAccess(MovieProvider, Base):
([8], ['dvdr']), ([8], ['dvdr']),
] ]
def buildUrl(self, media, quality): def buildUrl(self, title, media, quality):
cat_id = self.getCatId(quality)[0] cat_id = self.getCatId(quality)[0]
url = self.urls['search'] % (cat_id, cat_id) url = self.urls['search'] % (cat_id, cat_id)
arguments = tryUrlencode({ arguments = tryUrlencode({
'search': fireEvent('library.query', media, single = True), 'search': '%s %s' % (title, media['info']['year']),
'method': 3, 'method': 2,
}) })
query = "%s&%s" % (url, arguments) query = "%s&%s" % (url, arguments)