nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[kickass] ka.tt seems not to be reachable from france, backend now tries the two URLs

Browse source
This commit is contained in:
Julien Veyssier 2013-04-10 16:03:49 +02:00
commit e2f123db5d
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/kickass/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound, BrowserHTTPError
from .pages import TorrentsPage, TorrentPage from .pages import TorrentsPage, TorrentPage
@ -27,27 +27,35 @@ __all__ = ['KickassBrowser']
class KickassBrowser(BaseBrowser): class KickassBrowser(BaseBrowser):
DOMAIN = 'ka.tt' DOMAIN = 'kat.ph'
PROTOCOL = 'https' PROTOCOL = 'https'
ENCODING = 'utf-8' ENCODING = 'utf-8'
USER_AGENT = BaseBrowser.USER_AGENTS['wget'] USER_AGENT = BaseBrowser.USER_AGENTS['wget']
PAGES = { PAGES = {
'https://kat.ph/usearch/.*field=seeders&sorder=desc': TorrentsPage,
'https://kat.ph/.*.html': TorrentPage,
'https://ka.tt/usearch/.*field=seeders&sorder=desc': TorrentsPage, 'https://ka.tt/usearch/.*field=seeders&sorder=desc': TorrentsPage,
'https://ka.tt/.*.html': TorrentPage, 'https://ka.tt/.*.html': TorrentPage,
} }
def home(self):
return self.location('https://ka.tt/')
def iter_torrents(self, pattern): def iter_torrents(self, pattern):
try:
self.location('https://ka.tt/usearch/%s/?field=seeders&sorder=desc' % pattern.encode('utf-8')) self.location('https://ka.tt/usearch/%s/?field=seeders&sorder=desc' % pattern.encode('utf-8'))
except BrowserHTTPError:
self.location('https://kat.ph/usearch/%s/?field=seeders&sorder=desc' % pattern.encode('utf-8'))
assert self.is_on_page(TorrentsPage) assert self.is_on_page(TorrentsPage)
return self.page.iter_torrents() return self.page.iter_torrents()
def get_torrent(self, id): def get_torrent(self, id):
try:
try: try:
self.location('https://ka.tt/%s.html' % id) self.location('https://ka.tt/%s.html' % id)
except BrowserHTTPNotFound: except BrowserHTTPNotFound:
return return
except BrowserHTTPError:
try:
self.location('https://kat.ph/%s.html' % id)
except BrowserHTTPNotFound:
return
if self.is_on_page(TorrentPage): if self.is_on_page(TorrentPage):
return self.page.get_torrent(id) return self.page.get_torrent(id)