Update bitsoup searchOnTitle

This commit is contained in:
Ruud
2014-05-05 20:38:47 +02:00
parent 685210aee3
commit bcd2d22fbf
2 changed files with 3 additions and 14 deletions
@@ -1,7 +1,6 @@
import traceback import traceback
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from couchpotato.core.helpers.encoding import simplifyString, 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
@@ -24,13 +23,7 @@ class Base(TorrentProvider):
def _searchOnTitle(self, title, movie, quality, results): def _searchOnTitle(self, title, movie, quality, results):
q = '"%s" %s' % (simplifyString(title), movie['info']['year']) url = self.urls['search'] % self.buildUrl(title, movie, quality)
arguments = tryUrlencode({
'search': q,
})
url = "%s&%s" % (self.urls['search'], arguments)
url = self.urls['search'] % self.buildUrl(movie, quality)
data = self.getHTMLData(url) data = self.getHTMLData(url)
if data: if data:
@@ -1,6 +1,5 @@
from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.helpers.encoding import tryUrlencode
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.event import fireEvent
from couchpotato.core.media._base.providers.torrent.bitsoup import Base from couchpotato.core.media._base.providers.torrent.bitsoup import Base
from couchpotato.core.media.movie.providers.base import MovieProvider from couchpotato.core.media.movie.providers.base import MovieProvider
@@ -18,12 +17,9 @@ class Bitsoup(MovieProvider, Base):
] ]
cat_backup_id = 0 cat_backup_id = 0
def buildUrl(self, media, quality): def buildUrl(self, title, media, quality):
query = tryUrlencode({ query = tryUrlencode({
'search': '"%s" %s' % ( 'search': '"%s" %s' % (title, media['info']['year']),
fireEvent('library.query', media, include_year = False, single = True),
media['info']['year']
),
'cat': self.getCatId(quality)[0], 'cat': self.getCatId(quality)[0],
}) })
return query return query