ukamnya
/
plugin.video.torrenter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kickass fix

pull/1/head
DiMartinoXBMC 2015-05-23 11:25:24 +03:00
parent f9226315b7
commit 263eb29160
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.torrenter" name="Torrenter" version="2.2.4" provider-name="vadim.skorba, DiMartino"> <addon id="plugin.video.torrenter" name="Torrenter" version="2.2.5" provider-name="vadim.skorba, DiMartino">
<requires> <requires>
<import addon="xbmc.python" version="2.1.0"/> <import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.libtorrent"/> <import addon="script.module.libtorrent"/>

10
changelog.txt
View File

@ -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) [+] Проигрыватель: Добавлена возможность запускать через .strm файлы (plugin://plugin.video.torrenter/?action=playSTRM&url=URL_ENCODED_MAGNET_PATH_HTTP)
[B]Version 2.2.2[/B] [B]Version 2.2.2[/B]

4
resources/contenters/KickAssSo.py
View File

@ -33,7 +33,7 @@ class KickAssSo(Content.Content):
' ':[{'name':' ', 'url_after':'?field=seeders&sorder=desc'}]}), ' ':[{'name':' ', 'url_after':'?field=seeders&sorder=desc'}]}),
} }
baseurl = "http://kickass.to" baseurl = "http://kat.cr"
headers = [('User-Agent', headers = [('User-Agent',
'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124' + \ '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'), ' YaBrowser/14.10.2062.12061 Safari/537.36'),
@ -82,7 +82,7 @@ class KickAssSo(Content.Content):
num = 51 num = 51
good_forums=['TV','Anime','Movies'] good_forums=['TV','Anime','Movies']
result = re.compile( result = re.compile(
r'''<a title="Download torrent file" href="(.+?)\?.+?" class=".+?"><i.+?<a.+?<a.+?<a href="(.+?html)" class=".+?">(.+?)</a>.+? in <span.+?"><strong>.+?">(.+?)</a>.+?<td class="nobr center">(.+?)</td>.+?<td class="center">(\d+&nbsp;.+?)</td>.+?<td class="green center">(\d+?)</td>.+?<td class="red lasttd center">(\d+?)</td>''', r'''title="Download torrent file" href="(.+?\.torrent).+?" class=".+?"><i.+?<a.+?<a.+?<a href="(.+?html)" class=".+?">(.+?)</a>.+? in <span.+?"><strong>.+?">(.+?)</a>.+?<td class="nobr center">(.+?)</td>.+?<td class="center">(\d+&nbsp;.+?)</td>.+?<td class="green center">(\d+?)</td>.+?<td class="red lasttd center">(\d+?)</td>''',
re.DOTALL).findall(response) re.DOTALL).findall(response)
for link,infolink,title,forum,size,date,seeds,leechers in result: for link,infolink,title,forum,size,date,seeds,leechers in result:
#main #main

5
resources/searchers/KickAssSo.py
View File

@ -63,7 +63,8 @@ class KickAssSo(SearcherABC.SearcherABC):
def search(self, keyword): def search(self, keyword):
filesList = [] 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', 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'), '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'), ] ('Referer', 'http://kickass.so/'), ('Accept-encoding', 'gzip'), ]
@ -73,7 +74,7 @@ class KickAssSo(SearcherABC.SearcherABC):
#print response #print response
good_forums=['TV','Anime','Movies'] good_forums=['TV','Anime','Movies']
result = re.compile( result = re.compile(
r'''<a title="Download torrent file" href="(.+?)\?.+?" class=".+?"><i.+?<a.+?<a.+?<a href=".+?html" class=".+?">(.+?)</a>.+? in <span.+?"><strong>.+?">(.+?)</a>.+?<td class="nobr center">(.+?)</td>.+?<td class="green center">(\d+?)</td>.+?<td class="red lasttd center">(\d+?)</td>''', r'''title="Download torrent file" href="(.+?\.torrent).+?" class=".+?"><i.+?<a.+?<a.+?<a href=".+?html" class=".+?">(.+?)</a>.+? in <span.+?"><strong>.+?">(.+?)</a>.+?<td class="nobr center">(.+?)</td>.+?<td class="green center">(\d+?)</td>.+?<td class="red lasttd center">(\d+?)</td>''',
re.DOTALL).findall(response) re.DOTALL).findall(response)
for link,title,forum,size,seeds,leechers in result: for link,title,forum,size,seeds,leechers in result:
if forum in good_forums: if forum in good_forums: