From 36ea5ff352e5a849f33ac37e242fd7ec805ae491 Mon Sep 17 00:00:00 2001
From: Alhaziel01 <alhaziel01@gmail.com>
Date: Fri, 10 Apr 2020 22:16:04 +0200
Subject: [PATCH] piccoli fix

---
 channels/raiplay.py           |  4 +++-
 channels/vvvvid.py            | 16 +++++++++++-----
 core/scrapertools.py          |  2 +-
 platformcode/launcher.py      |  2 +-
 platformcode/platformtools.py |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/channels/raiplay.py b/channels/raiplay.py
index efe0569f..c821381b 100644
--- a/channels/raiplay.py
+++ b/channels/raiplay.py
@@ -165,8 +165,10 @@ def dirette(item):
     onAir = current_session.get(onair).json()['on_air']
     for i, key in enumerate(json):
         itemlist.append(support.Item(channel = item.channel, title = support.typo(key['channel'], 'bold'), fulltitle = key['channel'], show = key['channel'],
-                                     thumbnail = key['transparent-icon'].replace("[RESOLUTION]", "256x-"), fanart = getUrl(onAir[i]['currentItem']['image']), url = key['video']['contentUrl'],
+                                     thumbnail = key['transparent-icon'].replace("[RESOLUTION]", "256x-"),forcethumb=True , fanart = getUrl(onAir[i]['currentItem']['image']), url = key['video']['contentUrl'],
                                      plot = support.typo(onAir[i]['currentItem']['name'],'bold')+ '\n\n' + onAir[i]['currentItem']['description'], action = 'play'))
+    for item in itemlist:
+        support.log(item)
     return itemlist
 
 
diff --git a/channels/vvvvid.py b/channels/vvvvid.py
index 1eded5de..9bd08b16 100644
--- a/channels/vvvvid.py
+++ b/channels/vvvvid.py
@@ -165,8 +165,8 @@ def episodios(item):
         episodes.append(episode['episodes'])
     for episode in episodes:
         for key in episode:
-            if 'stagione' in key['title'].encode('utf8').lower():
-                match = support.match(key['title'].encode('utf8'), patron=r'[Ss]tagione\s*(\d+) - [Ee]pisodio\s*(\d+)').match
+            if 'stagione' in encode(key['title']).lower():
+                match = support.match(encode(key['title']), patron=r'[Ss]tagione\s*(\d+) - [Ee]pisodio\s*(\d+)').match
                 title = match[0]+'x'+match[1] + ' - ' + item.fulltitle
                 make_item = True
             elif int(key['season_id']) == int(season_id):
@@ -228,10 +228,10 @@ def make_itemlist(itemlist, item, data):
     search = item.search if item.search else ''
     infoLabels = {}
     for key in data['data']:
-        if search.lower() in key['title'].encode('utf8').lower():
+        if search.lower() in encode(key['title']).lower():
             infoLabels['year'] = key['date_published']
             infoLabels['title'] = infoLabels['tvshowtitle'] = key['title']
-            title = key['title'].encode('utf8')
+            title = encode(key['title'])
             itemlist.append(
                 Item(
                     channel = item.channel,
@@ -245,4 +245,10 @@ def make_itemlist(itemlist, item, data):
                     contentTitle= title if item.contentType == 'movie' else '',
                     infoLabels=infoLabels
             ))
-    return itemlist
\ No newline at end of file
+    return itemlist
+
+def encode(text):
+    if sys.version_info[0] >= 3:
+        return text
+    else:
+        return text.encode('utf8')
\ No newline at end of file
diff --git a/core/scrapertools.py b/core/scrapertools.py
index e984484c..0503b92e 100644
--- a/core/scrapertools.py
+++ b/core/scrapertools.py
@@ -120,7 +120,7 @@ def unescape(text):
                 pass
         return text  # leave as is
 
-    return re.sub("&#?\w+;", fixup, text)
+    return re.sub("&#?\w+;", str(fixup), str(text))
 
     # Convierte los codigos html "&ntilde;" y lo reemplaza por "ñ" caracter unicode utf-8
 
diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index a377e863..60a657a1 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -45,7 +45,7 @@ def start():
     if not config.dev_mode():
         from platformcode import updater
         updater.showSavedChangelog()
-    
+
 def run(item=None):
     logger.info()
     if not item:
diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py
index 985fc67a..6c264847 100644
--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -176,7 +176,7 @@ def render_items(itemlist, parent_item):
             item.folder = False
         if item.fanart == "":
             item.fanart = parent_item.fanart
-        if item.action == 'play' and thumb_type == 1:
+        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