From 263eb2916010ab5b18027d08a742a45d9d9b9ea7 Mon Sep 17 00:00:00 2001 From: DiMartinoXBMC Date: Sat, 23 May 2015 11:25:24 +0300 Subject: [PATCH] kickass fix --- addon.xml | 2 +- changelog.txt | 10 +++++++++- resources/contenters/KickAssSo.py | 4 ++-- resources/searchers/KickAssSo.py | 5 +++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/addon.xml b/addon.xml index f8ea4f3..16f3c33 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@  - + diff --git a/changelog.txt b/changelog.txt index ce3b717..b5e8ae4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,12 @@ -[B]Version 2.2.3[/B] +[B]Version 2.2.5[/B] +[+] Списки Медиа: Исправлен KickAssSo +[+] Поиск: Исправлен KickAssSo + +[B]Version 2.2.4[/B] +[+] Проигрыватель: Поддержка музыки (проигрывание следующего файла). +[+] Торрент-клиент: Исправлен прогресс Deluge. + +[B]Version 2.2.3[/B] [+] Проигрыватель: Добавлена возможность запускать через .strm файлы (plugin://plugin.video.torrenter/?action=playSTRM&url=URL_ENCODED_MAGNET_PATH_HTTP) [B]Version 2.2.2[/B] diff --git a/resources/contenters/KickAssSo.py b/resources/contenters/KickAssSo.py index 6789a9d..ff92c72 100644 --- a/resources/contenters/KickAssSo.py +++ b/resources/contenters/KickAssSo.py @@ -33,7 +33,7 @@ class KickAssSo(Content.Content): ' ':[{'name':' ', 'url_after':'?field=seeders&sorder=desc'}]}), } - baseurl = "http://kickass.to" + baseurl = "http://kat.cr" headers = [('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124' + \ ' YaBrowser/14.10.2062.12061 Safari/537.36'), @@ -82,7 +82,7 @@ class KickAssSo(Content.Content): num = 51 good_forums=['TV','Anime','Movies'] result = re.compile( - r'''(.+?).+? in .+?">(.+?).+?(.+?).+?(\d+ .+?).+?(\d+?).+?(\d+?)''', + r'''title="Download torrent file" href="(.+?\.torrent).+?" class=".+?">(.+?).+? in .+?">(.+?).+?(.+?).+?(\d+ .+?).+?(\d+?).+?(\d+?)''', re.DOTALL).findall(response) for link,infolink,title,forum,size,date,seeds,leechers in result: #main diff --git a/resources/searchers/KickAssSo.py b/resources/searchers/KickAssSo.py index 526f942..361c8a6 100644 --- a/resources/searchers/KickAssSo.py +++ b/resources/searchers/KickAssSo.py @@ -63,7 +63,8 @@ class KickAssSo(SearcherABC.SearcherABC): def search(self, keyword): filesList = [] - url = "http://kickass.to/usearch/%s/?field=seeders&sorder=desc" % urllib.quote_plus(keyword) + baseurl="http://kat.cr" + url = baseurl+"/usearch/%s/?field=seeders&sorder=desc" % urllib.quote_plus(keyword) headers = [('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124 YaBrowser/14.10.2062.12061 Safari/537.36'), ('Referer', 'http://kickass.so/'), ('Accept-encoding', 'gzip'), ] @@ -73,7 +74,7 @@ class KickAssSo(SearcherABC.SearcherABC): #print response good_forums=['TV','Anime','Movies'] result = re.compile( - r'''(.+?).+? in .+?">(.+?).+?(.+?).+?(\d+?).+?(\d+?)''', + r'''title="Download torrent file" href="(.+?\.torrent).+?" class=".+?">(.+?).+? in .+?">(.+?).+?(.+?).+?(\d+?).+?(\d+?)''', re.DOTALL).findall(response) for link,title,forum,size,seeds,leechers in result: if forum in good_forums: