From aafcf1273b9ba23342f44531c6fe0d484e783100 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Fri, 9 Mar 2012 00:55:22 +0100 Subject: [PATCH] Fix Kickass search It wasn't working at all anymore. Also fix searching with unicode characters. --- modules/kickass/backend.py | 3 ++- modules/kickass/browser.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/kickass/backend.py b/modules/kickass/backend.py index 5a71fc17..b462026c 100644 --- a/modules/kickass/backend.py +++ b/modules/kickass/backend.py @@ -22,6 +22,7 @@ from weboob.tools.backend import BaseBackend from .browser import KickassBrowser +from urllib import quote_plus __all__ = ['KickassBackend'] @@ -49,4 +50,4 @@ class KickassBackend(BaseBackend, ICapTorrent): return self.browser.openurl(torrent.url.encode('utf-8')).read() def iter_torrents(self, pattern): - return self.browser.iter_torrents(pattern.replace(' ','+')) + return self.browser.iter_torrents(quote_plus(pattern.encode('utf-8'))) diff --git a/modules/kickass/browser.py b/modules/kickass/browser.py index a38661d4..8894a438 100644 --- a/modules/kickass/browser.py +++ b/modules/kickass/browser.py @@ -32,7 +32,7 @@ class KickassBrowser(BaseBrowser): ENCODING = 'utf-8' USER_AGENT = BaseBrowser.USER_AGENTS['wget'] PAGES = { - 'http://kat.ph/new/.*field=seeders&sorder=desc': TorrentsPage, + 'http://kat.ph/usearch/.*field=seeders&sorder=desc': TorrentsPage, 'http://kat.ph/.*.html': TorrentPage, } @@ -40,7 +40,7 @@ class KickassBrowser(BaseBrowser): return self.location('http://kat.ph') def iter_torrents(self, pattern): - self.location('http://kat.ph/new/?q=%s&field=seeders&sorder=desc' % pattern.encode('utf-8')) + self.location('http://kat.ph/usearch/%s/?field=seeders&sorder=desc' % pattern.encode('utf-8')) assert self.is_on_page(TorrentsPage) return self.page.iter_torrents()