From e5bd0ca66842d12e6d15dae60396b851d0f3b6d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BE=D1=80=D0=BE=D0=B4=D0=B8=D0=BD=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=BC=D0=B0=D0=BD?= Date: Sat, 5 Dec 2020 23:18:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC?= =?UTF-8?q?=D1=8B=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D0=B0=20?= =?UTF-8?q?=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0?= =?UTF-8?q?=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BF=D0=BE=20=D1=81=D0=B8=D0=B4=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addon.py | 2 +- resources/lib/searchers/kinozal.py | 7 ++++--- resources/lib/searchers/rutracker.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addon.py b/addon.py index 6429f78..cf74c92 100644 --- a/addon.py +++ b/addon.py @@ -72,7 +72,7 @@ def search(plugin, search_query, thumb=None): for p, se in zip(range(0, 100, 100 / len(search_in)), search_in): progress.update(p, line1=se.name) found_items.extend(se().search(search_query)) - open('/tmp/t.t', 'w').write(repr(list(map(lambda x: x.url, found_items)))) + #open('/tmp/t.t', 'w').write(repr(list(map(lambda x: x.url, found_items)))) res_items = [] for i in sorted(found_items, key=lambda x: x.seeders, reverse=True): if '2160p' in i.title: hd = '[2160p/{}] '.format(i.size) diff --git a/resources/lib/searchers/kinozal.py b/resources/lib/searchers/kinozal.py index 655299c..aa3eb17 100644 --- a/resources/lib/searchers/kinozal.py +++ b/resources/lib/searchers/kinozal.py @@ -6,7 +6,7 @@ from codequick.listing import local_image # @UnresolvedImport class SearchEngine(Searcher): base_url = option['kinozal_url'] - search_path = '/browse.php?s={}&g=0&c=0&v=0&d=0&w=0&t=1&f=0' + search_path = '/browse.php?s={}&t=1' name = 'Kinozal.tv' icon = 'searcher_kinozal.png' enabled = option.get_boolean('kinozal_enable') # @UndefinedVariable @@ -27,9 +27,10 @@ class SearchEngine(Searcher): title = link.text seeders = int(r.find('.//td[@class="sl_s"]').text.strip()) leachers = int(r.find('.//td[@class="sl_p"]').text.strip()) - size = list(filter(lambda x: x.text.strip().endswith((u'ГБ', u'МБ')), + size_l = list(filter(lambda x: x.text.strip().endswith((u'ГБ', u'МБ')), r.findall('.//td[@class="s"]')) - )[0].text.strip() + ) + size = size_l[0].text.strip() if len(size_l) else '0' yield ResultItem(url, title, size, seeders, leachers, self.icon, self.cookies, self.base_url) def login(self): user = option['kinozal_login'] diff --git a/resources/lib/searchers/rutracker.py b/resources/lib/searchers/rutracker.py index b0a6a26..6c1dbd0 100644 --- a/resources/lib/searchers/rutracker.py +++ b/resources/lib/searchers/rutracker.py @@ -6,7 +6,7 @@ from codequick.listing import local_image # @UnresolvedImport class SearchEngine(Searcher): base_url = option['rutracker_url'] - search_path = '/forum/tracker.php?nm={}' + search_path = '/forum/tracker.php?nm={}&o=10&s=2' name = 'RuTracker.org' icon = 'searcher_rutracker.png' enabled = option.get_boolean('rutracker_enable') # @UndefinedVariable