stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix httptools e trailertools per kodi 19

Browse Source
This commit is contained in:
Alhaziel01
2020-08-17 18:16:38 +02:00
parent 76df639e42
commit 45c38ff7ee
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/httptools.py
+2 -1
View File
@@ -417,7 +417,8 @@ def downloadpage(url, **opt):
response['url'] = response['url'].replace('https://web.archive.org/save/', '') response['url'] = response['url'].replace('https://web.archive.org/save/', '')
if type(response['data']) != str: if type(response['data']) != str:
response['data'] = response['data'].decode('UTF-8') try: response['data'] = response['data'].decode('utf-8')
except: response['data'] = response['data'].decode('ISO-8859-1')
if not response['data']: if not response['data']:
response['data'] = '' response['data'] = ''
specials/trailertools.py
+4 -4
View File
@@ -176,8 +176,7 @@ def youtube_search(item):
patron += 'url":"([^"]+)' patron += 'url":"([^"]+)'
matches = scrapertools.find_multiple_matches(data, patron) matches = scrapertools.find_multiple_matches(data, patron)
for scrapedthumbnail, scrapedtitle, scrapedduration, scrapedurl in matches: for scrapedthumbnail, scrapedtitle, scrapedduration, scrapedurl in matches:
scrapedtitle = scrapedtitle.decode('utf8').encode('utf8') scrapedtitle = scrapedtitle if PY3 else scrapedtitle.decode('utf8').encode('utf8') + " (" + scrapedduration + ")"
scrapedtitle = scrapedtitle + " (" + scrapedduration + ")"
if item.contextual: if item.contextual:
scrapedtitle = "%s" % scrapedtitle scrapedtitle = "%s" % scrapedtitle
url = urlparse.urljoin('https://www.youtube.com/', scrapedurl) url = urlparse.urljoin('https://www.youtube.com/', scrapedurl)
@@ -208,7 +207,7 @@ def abandomoviez_search(item):
if item.page != "": if item.page != "":
data = httptools.downloadpage(item.page).data data = httptools.downloadpage(item.page).data
else: else:
titulo = item.contentTitle.decode('utf-8').encode('iso-8859-1') titulo = item.contentTitle if PY3 else item.contentTitle.decode('utf-8').encode('iso-8859-1')
post = urllib.urlencode({'query': titulo, 'searchby': '1', 'posicion': '1', 'orden': '1', post = urllib.urlencode({'query': titulo, 'searchby': '1', 'posicion': '1', 'orden': '1',
'anioin': item.year, 'anioout': item.year, 'orderby': '1'}) 'anioin': item.year, 'anioout': item.year, 'orderby': '1'})
url = "http://www.abandomoviez.net/db/busca_titulo.php?busco2=%s" %item.contentTitle url = "http://www.abandomoviez.net/db/busca_titulo.php?busco2=%s" %item.contentTitle
@@ -217,7 +216,8 @@ def abandomoviez_search(item):
if "No hemos encontrado ninguna" in data: if "No hemos encontrado ninguna" in data:
url = "http://www.abandomoviez.net/indie/busca_titulo.php?busco2=%s" %item.contentTitle url = "http://www.abandomoviez.net/indie/busca_titulo.php?busco2=%s" %item.contentTitle
item.prefix = "indie/" item.prefix = "indie/"
data = httptools.downloadpage(url, post=post).data.decode("iso-8859-1").encode('utf-8') data = httptools.downloadpage(url, post=post).data
if not PY3: data = data.decode("iso-8859-1").encode('utf-8')
itemlist = [] itemlist = []
patron = '(?:<td width="85"|<div class="col-md-2 col-sm-2 col-xs-3">).*?<img src="([^"]+)"' \ patron = '(?:<td width="85"|<div class="col-md-2 col-sm-2 col-xs-3">).*?<img src="([^"]+)"' \