From 19bf5fe391fd68063121bc1460a76bff5ab8ab46 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Sun, 16 Jun 2013 12:30:57 +0200 Subject: [PATCH] kickass: New domain, clean old https://torrentfreak.com/kat-ph-goes-down-following-domain-issues-switches-to-kickass-to-130613/ --- modules/kickass/browser.py | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/modules/kickass/browser.py b/modules/kickass/browser.py index 6c767a0d..7fca25ab 100644 --- a/modules/kickass/browser.py +++ b/modules/kickass/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound, BrowserHTTPError +from weboob.tools.browser import BaseBrowser, BrowserHTTPNotFound from .pages import TorrentsPage, TorrentPage @@ -27,35 +27,24 @@ __all__ = ['KickassBrowser'] class KickassBrowser(BaseBrowser): - DOMAIN = 'kat.ph' + DOMAIN = 'kickass.to' PROTOCOL = 'https' ENCODING = 'utf-8' USER_AGENT = BaseBrowser.USER_AGENTS['wget'] 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/.*.html': TorrentPage, + 'https://kickass.to/usearch/.*field=seeders&sorder=desc': TorrentsPage, + 'https://kickass.to/.*.html': TorrentPage, } def iter_torrents(self, pattern): - try: - 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')) + self.location('https://kickass.to/usearch/%s/?field=seeders&sorder=desc' % pattern.encode('utf-8')) assert self.is_on_page(TorrentsPage) return self.page.iter_torrents() def get_torrent(self, id): try: - try: - self.location('https://ka.tt/%s.html' % id) - except BrowserHTTPNotFound: - return - except BrowserHTTPError: - try: - self.location('https://kat.ph/%s.html' % id) - except BrowserHTTPNotFound: - return + self.location('https://kickass.to/%s.html' % id) + except BrowserHTTPNotFound: + return if self.is_on_page(TorrentPage): return self.page.get_torrent(id)