Ultime modifiche

channelselector.py

@@ -253,7 +253,7 @@ def set_channel_info(parameters):
 def auto_filter(auto_lang=False):
     list_lang = ['ita', 'vos', 'sub-ita']
     if config.get_setting("channel_language") == 'auto' or auto_lang == True:
-        lang = config.get_localized_string(20001)
+        lang = config.get_language()
 
     else:
         lang = config.get_setting("channel_language", default="all")

platformcode/config.py

@@ -439,3 +439,7 @@ def verify_directories_created():
 
 def get_online_server_thumb(server):
     return "https://raw.github.com/kodiondemand/media/master/resources/servers/" + server.lower().replace('_server','') + '.png'
+
+
+def get_language():
+    return get_localized_string(20001)

platformcode/recaptcha.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-import random
+import sys
 import time
 from threading import Thread
 
-import channelselector
 import xbmcgui
-from core import httptools, support
+from core import httptools
 from core import filetools
 from platformcode import config, platformtools
 from platformcode import logger
@@ -18,7 +17,7 @@ tiles_pos = (75+390, 90+40)
 grid_width = 450
 tiles_texture_focus = 'white.png'
 tiles_texture_checked = 'Controls/check_mark.png'
-empty_image = 'https://upload.wikimedia.org/wikipedia/commons/4/49/A_black_image.jpg'
+cur_tmp = 0
 
 TITLE = 10
 PANEL = 11
@@ -31,13 +30,20 @@ CANCEL = 22
 
 
 def get_temp():
+    global cur_tmp
+    cur_tmp += 1
     if not filetools.isdir(temp_dir):
         filetools.mkdir(temp_dir)
-    return temp_dir + str(random.randint(1, 1000)) + '.png'
+    return temp_dir + str(cur_tmp) + '.png'
 
 
 class Kodi:
     def __init__(self, key, referer):
+        if sys.version_info[0] < 3:
+            self.rc = None
+            platformtools.dialog_ok('reCAPTCHA', 'Il sito sta mostrando la schermata "Non sono un robot".\nQuesta schermata tuttavia è superabile solo da kodi 19')
+        else:
+            prog = platformtools.dialog_progress('Caricamento reCAPTCHA', 'Il sito sta mostrando la schermata "Non sono un robot"')
             filetools.rmdirtree(temp_dir)
             self.rc = ReCaptcha(
                 api_key=key,
@@ -45,8 +51,11 @@ class Kodi:
                 user_agent=httptools.get_user_agent(),
                 lang=lang
             )
+            prog.close()
 
     def run(self):
+        if not self.rc:
+            return None
         result = self.rc.first_solver()
         while not isinstance(result, str) and result is not False:
             solution = self.run_solver(result)

platformcode/updater.py

@@ -306,7 +306,7 @@ def updateFromZip(message=config.get_localized_string(80050)):
 
 def refreshLang():
     from platformcode import config
-    language = config.get_localized_string(20001)
+    language = config.get_language()
     if language == 'eng':
         xbmc.executebuiltin("SetGUILanguage(resource.language.it_it)")
         xbmc.executebuiltin("SetGUILanguage(resource.language.en_en)")