un paio di fix/migliorie

This commit is contained in:
marco
2020-05-05 20:46:53 +02:00
parent 380a55d574
commit 39e2e7712f
2 changed files with 9 additions and 5 deletions

View File

@@ -410,7 +410,7 @@ def downloadpage(url, **opt):
response['data'] = req.content if req.content else ''
if CF:
import re
response['data'] = re.sub('"/save/[^"]*(https?://[^"]+)', '"\\1', response['data'])
response['data'] = re.sub('["|\']/save/[^"]*(https?://[^"]+)', '"\\1', response['data'])
response['url'] = req.url
if type(response['data']) != str:

View File

@@ -196,11 +196,15 @@ def render_items(itemlist, parent_item):
if item.action == 'play' and thumb_type == 1 and not item.forcethumb:
item.thumbnail = "https://github.com/kodiondemand/media/raw/master/resources/servers/" + item.server.lower() + '.png'
# if cloudflare, cookies are needed to display images taken from site
# if cloudflare and cloudscraper is used, cookies are needed to display images taken from site
# before checking domain (time consuming), checking if tmdb failed (so, images scraped from website are used)
# if item.action in ['findvideos'] and not item.infoLabels['tmdb_id'] and item.channel in httptools.channelsCF:
# item.thumbnail = httptools.get_url_headers(item.thumbnail)
# item.fanart = httptools.get_url_headers(item.fanart)
if item.action in ['findvideos'] and not item.infoLabels['tmdb_id']:
# faster but ugly way of checking
for d in httptools.FORCE_CLOUDSCRAPER_LIST:
if d + '/' in item.url:
item.thumbnail = httptools.get_url_headers(item.thumbnail)
item.fanart = httptools.get_url_headers(item.fanart)
break
icon_image = "DefaultFolder.png" if item.folder else "DefaultVideo.png"
listitem = xbmcgui.ListItem(item.title)