Merge pull request #8 from kodiondemand/master

up

channels/autorenumber.py

@@ -44,11 +44,25 @@ def config_item(item):
     tvdb.find_and_set_infoLabels(item)
     data = ''
     data = add_season(data)
-    if not item.infoLabels['tvdb_id']:
-        heading = 'TVDB ID'
-        item.infoLabels['tvdb_id'] = platformtools.dialog_numeric(0, heading)
+    title = item.show
+    count = 0
+    
+    while not item.infoLabels['tvdb_id']:
+        try:
+            item.show = platformtools.dialog_input(default=item.show, heading=config.get_localized_string(30112))
+            tvdb.find_and_set_infoLabels(item)
+            count = count + 1
+        except:
+            heading = config.get_localized_string(70704)
+            item.infoLabels['tvdb_id'] = platformtools.dialog_numeric(0, heading)
     data.append(item.infoLabels['tvdb_id'])
-    write_data(item.from_channel, item.show, data)
+    if item.infoLabels['tvdb_id'] != 0:
+        write_data(item.from_channel, title, data)
+    else:
+        message = config.get_localized_string(60444)
+        heading = item.show.strip()
+        platformtools.dialog_notification(heading, message)
+
 
 
 def add_season(data=None):
@@ -59,6 +73,7 @@ def add_season(data=None):
     if season != "":
         heading = config.get_localized_string(70687)
         episode = platformtools.dialog_numeric(0, heading)
+
         if episode == "0":
             heading = config.get_localized_string(70688)
             special = platformtools.dialog_numeric(0, heading)
@@ -92,6 +107,8 @@ def write_data(channel, show, data):
     heading = show.strip()
     platformtools.dialog_notification(heading, message)
 
+
+
 def renumber(itemlist, item='', typography=''):    
     log()
 
@@ -118,7 +135,7 @@ def renumber(itemlist, item='', typography=''):
                             if E == 0: 
                                 epList.append([0, SP])
                                 E = 1
-                            if episodes['airedEpisodeNumber'] >= E:
+                            if episodes['airedEpisodeNumber'] >= E or episodes['airedSeason'] > S:
                                 epList.append([episodes['airedSeason'], episodes['airedEpisodeNumber']])
                     page = page + 1
                 else:

core/servertools.py

@@ -727,13 +727,13 @@ def check_video_link(url, server, timeout=3):
     :return: str(2) '??':No se ha podido comprobar. 'Ok':Parece que el link funciona. 'NO':Parece que no funciona.
     """
 
-    # NK = "[COLOR 0xFFF9B613][B]" + u"\u25cf" + "[/B][/COLOR]"
-    # OK = "[COLOR 0xFF00C289][B]" + u"\u25cf" + "[/B][/COLOR]"
-    # KO = "[COLOR 0xFFC20000][B]" + u"\u25cf" + "[/B][/COLOR]"
+    NK = "[COLOR 0xFFF9B613][B]" + u"\u25cf".encode('utf-8') + "[/B][/COLOR]"
+    OK = "[COLOR 0xFF00C289][B]" + u"\u25cf".encode('utf-8') + "[/B][/COLOR]"
+    KO = "[COLOR 0xFFC20000][B]" + u"\u25cf".encode('utf-8') + "[/B][/COLOR]"
 
-    NK = "[COLOR 0xFFF9B613][B]O[/B][/COLOR]"
-    OK = "[COLOR 0xFF00C289][B]O[/B][/COLOR]"
-    KO = "[COLOR 0xFFC20000][B]O[/B][/COLOR]"
+    # NK = "[COLOR 0xFFF9B613][B]O[/B][/COLOR]"
+    # OK = "[COLOR 0xFF00C289][B]O[/B][/COLOR]"
+    # KO = "[COLOR 0xFFC20000][B]O[/B][/COLOR]"
 
     try:
         server_module = __import__('servers.%s' % server, None, None, ["servers.%s" % server])

resources/language/English/strings.po

@@ -2797,12 +2797,12 @@ msgctxt "#70020"
 msgid "[COLOR yellow]Search similar[/COLOR]"
 msgstr ""
 
-msgctxt "#70021"
-msgid "Search in TMDB"
+msgctxt "#70022"
+msgid " - Movies"
 msgstr ""
 
-msgctxt "#70022"
-msgid "        - Movies"
+msgctxt "#70023"
+msgid " - TV Shows"
 msgstr ""
 
 msgctxt "#70023"
@@ -10446,7 +10446,7 @@ msgid "Enter the number of the starting episode"
 msgstr ""
 
 msgctxt "#70688"
-msgid "Episode 0 is a special episode, enter the number of this episode"
+msgid "Episode 0 is a special episode, enter the number of this episode (0 to skip it)"
 msgstr ""
 
 msgctxt "#70689"
@@ -10502,4 +10502,8 @@ msgstr ""
 
 msgctxt "#70703"
 msgid "Create directories with lowercase letters"
+msgstr ""
+
+msgctxt "#70704"
+msgid "TMDB ID (0 to cancel)"
 msgstr ""

resources/language/Italian/strings.po

@@ -2794,12 +2794,12 @@ msgid "Search in TMDB"
 msgstr "Cerca in TMDB"
 
 msgctxt "#70022"
-msgid "        - Movies"
-msgstr "        - Film"
+msgid " - Movies"
+msgstr " - Film"
 
 msgctxt "#70023"
-msgid "        - TV Shows"
-msgstr "        - Serie TV"
+msgid " - TV Shows"
+msgstr " - Serie TV"
 
 msgctxt "#70024"
 msgid "Search in Filmaffinity"
@@ -5431,8 +5431,8 @@ msgid "Enter the number of the starting episode"
 msgstr "Inserisci il numero dell'episodio di partenza"
 
 msgctxt "#70688"
-msgid "Episode 0 is a special episode, enter the number of this episode"
-msgstr "L'episodio 0 è un episodio speciale, inserisci il numero di questo episodio"
+msgid "Episode 0 is a special episode, enter the number of this episode (0 to skip it)"
+msgstr "L'episodio 0 è un episodio speciale, inserisci il numero di questo episodio (0 per saltare)"
 
 msgctxt "#70689"
 msgid "Enable Download"
@@ -5488,4 +5488,8 @@ msgstr "Riavvia Kodi per applicare le modifiche"
 
 msgctxt "#70703"
 msgid "Create directories with lowercase letters"
-msgstr "Crea cartelle con le lettere minuscole"
+msgstr "Crea cartelle con le lettere minuscole"
+
+msgctxt "#70704"
+msgid "TMDB ID (0 to cancel)"
+msgstr "TMDB ID (0 per annullare)"

servers/vidtome.json

@@ -6,6 +6,10 @@
       {
         "pattern": "vidto.me/(?:embed-|)([A-z0-9]+)",
         "url": "http://vidto.me/embed-\\1.html"
+      },
+      {
+        "pattern": "vidtome.stream/(?:embed-|)([A-z0-9]+)",
+        "url": "http://vidtome.stream/\\1.html"
       }
     ]
   },