From 95269795e8d80faae4b8acc7ab3d981c53aef885 Mon Sep 17 00:00:00 2001
From: marco <m.toma99@gmail.com>
Date: Fri, 10 Apr 2020 18:28:28 +0200
Subject: [PATCH] =?UTF-8?q?fix=20compatiblit=C3=A0=20API=20kodi=2019?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addon.xml                     |  1 -
 channels.json                 |  2 +-
 platformcode/platformtools.py | 25 ++++++++++++++++---------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/addon.xml b/addon.xml
index 543c9151..b38d871d 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.video.kod" name="Kodi on Demand BETA" version="0.8.1" provider-name="KOD Team">
   <requires>
-    <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.libtorrent" optional="true"/>
     <import addon="metadata.themoviedb.org"/>
     <import addon="metadata.tvdb.com"/>
diff --git a/channels.json b/channels.json
index c10d9dac..5725f65c 100644
--- a/channels.json
+++ b/channels.json
@@ -28,7 +28,7 @@
     "italiaserie": "https://italiaserie.org",
     "mondoserietv": "https://mondoserietv.com",
     "netfreex": "https://www.netfreex.pro",
-    "piratestreaming": "https://www.piratestreaming.group",
+    "piratestreaming": "https://www.piratestreaming.online",
     "polpotv": "https://polpotv.club",
     "pufimovies": "https://pufimovies.com",
     "raiplay": "https://www.raiplay.it",
diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py
index 9d986016..985fc67a 100644
--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -47,10 +47,17 @@ class XBMCPlayer(xbmc.Player):
 
 xbmc_player = XBMCPlayer()
 
+def makeMessage(line1, line2, line3):
+    message = line1
+    if line2:
+        message += '\n' + line2
+    if line3:
+        message += '\n' + line3
+    return message
 
 def dialog_ok(heading, line1, line2="", line3=""):
     dialog = xbmcgui.Dialog()
-    return dialog.ok(heading, line1, line2, line3)
+    return dialog.ok(heading, makeMessage(line1, line2, line3))
 
 
 def dialog_notification(heading, message, icon=0, time=5000, sound=True):
@@ -62,12 +69,14 @@ def dialog_notification(heading, message, icon=0, time=5000, sound=True):
         dialog_ok(heading, message)
 
 
-def dialog_yesno(heading, line1, line2="", line3="", nolabel="No", yeslabel="Si", autoclose=""):
+def dialog_yesno(heading, line1, line2="", line3="", nolabel="No", yeslabel="Si", autoclose=0, customlabel=None):
+    # customlabel only on kodi 19
     dialog = xbmcgui.Dialog()
+
     if autoclose:
-        return dialog.yesno(heading, line1, line2, line3, nolabel, yeslabel, autoclose)
+        return dialog.yesno(heading, makeMessage(line1, line2, line3), nolabel=nolabel, yeslabel=yeslabel, customlabel=customlabel, autoclose=autoclose)
     else:
-        return dialog.yesno(heading, line1, line2, line3, nolabel, yeslabel)
+        return dialog.yesno(heading, makeMessage(line1, line2, line3), nolabel=nolabel, yeslabel=yeslabel, customlabel=customlabel)
 
 
 def dialog_select(heading, _list):
@@ -80,7 +89,7 @@ def dialog_multiselect(heading, _list, autoclose=0, preselect=[], useDetails=Fal
 
 def dialog_progress(heading, line1, line2=" ", line3=" "):
     dialog = xbmcgui.DialogProgress()
-    dialog.create(heading, line1, line2, line3)
+    dialog.create(heading, makeMessage(line1, line2, line3))
     return dialog
 
 
@@ -172,12 +181,12 @@ def render_items(itemlist, parent_item):
 
         # if cloudflare, 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 scrapertools.get_domain_from_url(item.thumbnail) in httptools.domainCF:
+        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)
 
         icon_image = "DefaultFolder.png" if item.folder else "DefaultVideo.png"
-        listitem = xbmcgui.ListItem(item.title, offscreen=True)
+        listitem = xbmcgui.ListItem(item.title)
         listitem.setArt({'icon': icon_image, 'thumb': item.thumbnail, 'poster': item.thumbnail,
                          'fanart': item.fanart if item.fanart else default_fanart})
 
@@ -208,7 +217,6 @@ def render_items(itemlist, parent_item):
             breadcrumb = config.get_localized_string(70693)
 
     xbmcplugin.setPluginCategory(handle=_handle, category=breadcrumb)
-    # from core.support import dbg;dbg()
 
     set_view_mode(item, parent_item)
 
@@ -218,7 +226,6 @@ def render_items(itemlist, parent_item):
 
 def set_view_mode(item, parent_item):
     def mode(content, Type):
-        # from core.support import dbg;dbg()
         mode = int(config.get_setting('view_mode_%s' % content).split(',')[-1])
         if mode > 0:
             xbmcplugin.setContent(handle=int(sys.argv[1]), content=Type)