KoD 1.3.1

- aggiunti nuovi canali: film4k, animealtadefinizione, streamingcommunity, animeuniverse , guardaserieICU
- HDmario ora supporta l'utilizzo di account
- Miglioramenti sezione news, è ora possibile raggruppare per canale o per contenuto, e settare l'ordinamento
- risolto il fastidioso problema per cui poteva capitare che la ricerca ripartisse dopo un refresh di kodi (tipicamente quando l'aggiornamento della videoteca finiva)
- alcuni fix ai canali

platformcode/launcher.py

@@ -8,8 +8,10 @@ PY3 = False
 if sys.version_info[0] >= 3:PY3 = True; unicode = str; unichr = chr; long = int
 
 from core.item import Item
+from core import filetools
 from platformcode import config, logger, platformtools
 from platformcode.logger import WebErrorException
+temp_search_file = config.get_temp_file('temp-search')
 
 
 def start():
@@ -242,6 +244,20 @@ def run(item=None):
 
             # Special action for searching, first asks for the words then call the "search" function
             elif item.action == "search":
+                # from core.support import dbg;dbg()
+                if filetools.isfile(temp_search_file) and config.get_setting('videolibrary_kodi'):
+                    itemlist = []
+                    f = filetools.read(temp_search_file)
+                    strList = f.split(',')
+                    if strList[0] == '[V]' and strList[1] == item.channel:
+                        for it in strList:
+                            if it and it not in ['[V]', item.channel]:
+                                itemlist.append(Item().fromurl(it))
+                        filetools.write(temp_search_file, f[4:])
+                        return platformtools.render_items(itemlist, item)
+                    else:
+                        filetools.remove(temp_search_file)
+
                 logger.info("item.action=%s" % item.action.upper())
                 from core import channeltools
 
@@ -250,15 +266,11 @@ def run(item=None):
                 else:
                     last_search = ''
 
-                tecleado = platformtools.dialog_input(last_search)
+                search_text = platformtools.dialog_input(last_search)
 
-                if tecleado is not None:
-                    channeltools.set_channel_setting('Last_searched', tecleado, 'search')
-                    if 'search' in dir(channel):
-                        itemlist = channel.search(item, tecleado)
-                    else:
-                        from core import support
-                        itemlist = support.search(channel, item, tecleado)
+                if search_text is not None:
+                    channeltools.set_channel_setting('Last_searched', search_text, 'search')
+                    itemlist = new_search(item.clone(text=search_text), channel)
                 else:
                     return
 
@@ -276,8 +288,7 @@ def run(item=None):
                         trakt_tools.auth_trakt()
                     else:
                         import xbmc
-                        if not xbmc.getCondVisibility('System.HasAddon(script.trakt)') and config.get_setting(
-                                'install_trakt'):
+                        if not xbmc.getCondVisibility('System.HasAddon(script.trakt)') and config.get_setting('install_trakt'):
                             trakt_tools.ask_install_script()
                     itemlist = trakt_tools.trakt_check(itemlist)
                 else:
@@ -330,6 +341,24 @@ def run(item=None):
                 log_message)
 
 
+def new_search(item, channel=None):
+    itemlist=[]
+    if 'search' in dir(channel):
+        itemlist = channel.search(item, item.text)
+    else:
+        from core import support
+        itemlist = support.search(channel, item, item.text)
+
+    writelist = item.channel
+    for it in itemlist:
+        writelist += ',' + it.tourl()
+    filetools.write(temp_search_file, writelist)
+    return itemlist
+
+def set_search_temp(item):
+    if filetools.isfile(temp_search_file) and config.get_setting('videolibrary_kodi'):
+        f = '[V],' + filetools.read(temp_search_file)
+        filetools.write(temp_search_file, f)
 
 def reorder_itemlist(itemlist):
     logger.info()

platformcode/logger.py

@@ -13,7 +13,12 @@ PY3 = False
 if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int
 
 loggeractive = (config.get_setting("debug") == True)
-
+try:
+    xbmc.KodiStub()
+    testMode = True
+    import cgi
+except:
+    testMode = False
 
 def log_enable(active):
     global loggeractive
@@ -39,6 +44,9 @@ def encode_log(message=""):
     else:
         message = str(message)
 
+    if testMode:
+        message = cgi.escape(message).replace('\n', '<br>')
+
     return message
 
 

platformcode/platformtools.py

@@ -15,7 +15,7 @@ else:
 import os, xbmc, xbmcgui, xbmcplugin
 from past.utils import old_div
 from channelselector import get_thumb
-from core import trakt_tools, scrapertools
+from core import scrapertools
 from core.item import Item
 from platformcode import logger, config
 
@@ -920,6 +920,7 @@ def set_player(item, xlistitem, mediaurl, view, strm, nfo_path=None, head_nfo=No
             # Reproduce
             xbmc_player.play(playlist, xlistitem)
             if config.get_setting('trakt_sync'):
+                from core import trakt_tools
                 trakt_tools.wait_for_update_trakt()
 
         elif player_mode == 1:

platformcode/xbmc_config_menu.py

@@ -171,7 +171,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog):
         if not self.list_controls:
 
             # If the channel path is in the "channels" folder, we get the controls and values using chaneltools
-            if os.path.join(config.get_runtime_path(), "channels") or os.path.join(config.get_runtime_path(), "specials") in channelpath:
+            if os.path.join(config.get_runtime_path(), "channels") in channelpath or os.path.join(config.get_runtime_path(), "specials") in channelpath:
 
                 # The call is made from a channel
                 self.list_controls, default_values = channeltools.get_channel_controls_settings(self.channel)