diff --git a/channels.json b/channels.json index f2556f4c..d21677f3 100644 --- a/channels.json +++ b/channels.json @@ -37,7 +37,7 @@ "piratestreaming": "https://www.piratestreaming.movie", "polpotv": "https://polpotv.life", "raiplay": "https://www.raiplay.it", - "seriehd": "https://seriehd.productions", + "seriehd": "https://seriehd.group", "serietvonline": "https://serietvonline.press", "serietvsubita": "http://serietvsubita.xyz", "serietvu": "https://www.serietvu.link", diff --git a/channels/altadefinizioneclick.py b/channels/altadefinizioneclick.py index 90101a51..253b12ac 100644 --- a/channels/altadefinizioneclick.py +++ b/channels/altadefinizioneclick.py @@ -106,7 +106,7 @@ def search(item, texto): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] def newest(categoria): diff --git a/channels/animealtadefinizione.py b/channels/animealtadefinizione.py index ab22ed15..d3add57e 100644 --- a/channels/animealtadefinizione.py +++ b/channels/animealtadefinizione.py @@ -40,7 +40,7 @@ def search(item, texto): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] @@ -56,7 +56,7 @@ def newest(categoria): except: import sys for line in sys.exc_info(): - support.infoger.error("{0}".format(line)) + support.logger.error("{0}".format(line)) return [] diff --git a/channels/animeforce.py b/channels/animeforce.py index 6477d06a..b1373656 100644 --- a/channels/animeforce.py +++ b/channels/animeforce.py @@ -49,7 +49,7 @@ def newest(categoria): except: import sys for line in sys.exc_info(): - support.infoger.error("{0}".format(line)) + support.logger.error("{0}".format(line)) return [] return itemlist @@ -65,7 +65,7 @@ def search(item, texto): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py index da1c6682..4715ae78 100644 --- a/channels/animeleggendari.py +++ b/channels/animeleggendari.py @@ -41,7 +41,7 @@ def search(item, texto): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] diff --git a/channels/animeuniverse.py b/channels/animeuniverse.py index c3b3beb8..40c34dcf 100644 --- a/channels/animeuniverse.py +++ b/channels/animeuniverse.py @@ -41,7 +41,7 @@ def search(item, texto): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] @@ -57,7 +57,7 @@ def newest(categoria): except: import sys for line in sys.exc_info(): - support.infoger.error("{0}".format(line)) + support.logger.error("{0}".format(line)) return [] diff --git a/channels/cb01anime.py b/channels/cb01anime.py index 81ca8fde..f0832522 100644 --- a/channels/cb01anime.py +++ b/channels/cb01anime.py @@ -52,7 +52,7 @@ def newest(categoria): except: import sys for line in sys.exc_info(): - support.infoger.error("{0}".format(line)) + support.logger.error("{0}".format(line)) return [] return itemlist diff --git a/channels/cinetecadibologna.py b/channels/cinetecadibologna.py index 33591e2f..7c46505f 100644 --- a/channels/cinetecadibologna.py +++ b/channels/cinetecadibologna.py @@ -44,7 +44,7 @@ def search(item, text): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] diff --git a/channels/dreamsub.py b/channels/dreamsub.py index b93b1647..74f08729 100644 --- a/channels/dreamsub.py +++ b/channels/dreamsub.py @@ -69,7 +69,7 @@ def newest(categoria): except: import sys for line in sys.exc_info(): - support.infoger.error("{0}".format(line)) + support.logger.error("{0}".format(line)) return [] diff --git a/channels/dsda.py b/channels/dsda.py index fdc72fa1..476e3143 100644 --- a/channels/dsda.py +++ b/channels/dsda.py @@ -45,7 +45,7 @@ def newest(categoria): except: import sys for line in sys.exc_info(): - support.infoger.error("{0}".format(line)) + support.logger.error("{0}".format(line)) return [] diff --git a/channels/hd4me.py b/channels/hd4me.py index 2c3e0659..bd9b3c56 100644 --- a/channels/hd4me.py +++ b/channels/hd4me.py @@ -50,7 +50,7 @@ def search(item, text): except: import sys for line in sys.exc_info(): - support.infoger.error("search except: %s" % line) + support.logger.error("search except: %s" % line) return [] diff --git a/channels/ilcorsaronero.py b/channels/ilcorsaronero.py index 7060b2d1..ab9d2b5a 100644 --- a/channels/ilcorsaronero.py +++ b/channels/ilcorsaronero.py @@ -75,7 +75,7 @@ def search(item, text): except: import sys for line in sys.exc_info(): - support.infoger.error("search except: %s" % line) + support.logger.error("search except: %s" % line) return [] diff --git a/channels/mediasetplay.py b/channels/mediasetplay.py index 834aef8e..cf205ddd 100644 --- a/channels/mediasetplay.py +++ b/channels/mediasetplay.py @@ -60,7 +60,7 @@ def search(item, text): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return itemlist def menu(item): diff --git a/channels/metalvideo.py b/channels/metalvideo.py index ebcc8298..3468ded9 100644 --- a/channels/metalvideo.py +++ b/channels/metalvideo.py @@ -64,5 +64,5 @@ def search(item, text): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] diff --git a/channels/mondoserietv.py b/channels/mondoserietv.py index 5f4a9de8..7d8f984e 100644 --- a/channels/mondoserietv.py +++ b/channels/mondoserietv.py @@ -48,7 +48,7 @@ def search(item, text): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] @@ -69,7 +69,7 @@ def newest(categoria): except: import sys for line in sys.exc_info(): - support.infoger.error("{0}".format(line)) + support.logger.error("{0}".format(line)) return [] diff --git a/channels/paramount.py b/channels/paramount.py index 1f283ef6..6ad8baea 100644 --- a/channels/paramount.py +++ b/channels/paramount.py @@ -35,7 +35,7 @@ def search(item, text): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] diff --git a/channels/piratestreaming.py b/channels/piratestreaming.py index 13c6a29d..a4a95a5e 100644 --- a/channels/piratestreaming.py +++ b/channels/piratestreaming.py @@ -31,7 +31,7 @@ def search(item, texto): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] @@ -56,7 +56,7 @@ def newest(categoria): except: import sys for line in sys.exc_info(): - support.infoger.error("{0}".format(line)) + support.logger.error("{0}".format(line)) return [] return itemlist diff --git a/channels/polpotv.py b/channels/polpotv.py index c5771c7d..781f32c4 100644 --- a/channels/polpotv.py +++ b/channels/polpotv.py @@ -118,7 +118,7 @@ def search(item, texto): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] def search_movie_by_genre(item): diff --git a/channels/pufimovies.py b/channels/pufimovies.py index 962a13c0..4795a360 100644 --- a/channels/pufimovies.py +++ b/channels/pufimovies.py @@ -77,7 +77,7 @@ def newest(categoria): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] return itemlist diff --git a/channels/raiplay.py b/channels/raiplay.py index 88fe6861..cce4a064 100644 --- a/channels/raiplay.py +++ b/channels/raiplay.py @@ -136,7 +136,7 @@ def search(item, text): except: import sys for line in sys.exc_info(): - support.infoger.error("%s" % line) + support.logger.error("%s" % line) return [] return itemlist diff --git a/channels/seriehd.py b/channels/seriehd.py index cd8ca5c5..41812143 100644 --- a/channels/seriehd.py +++ b/channels/seriehd.py @@ -5,8 +5,10 @@ from core import support +def findhost(): + return support.match('https://nuovoindirizzo.info/seriehd/', patron=r']+> 0 else {} if item: @@ -103,7 +103,7 @@ def renumber(itemlist, item='', typography=''): def config_item(item, itemlist=[], typography='', active=False): - info() + logger.info() # Configurazione Automatica, Tenta la numerazione Automatica degli episodi title = item.fulltitle.rstrip() @@ -140,7 +140,7 @@ def config_item(item, itemlist=[], typography='', active=False): def semiautomatic_config_item(item): - info() + logger.info() # Configurazione Semi Automatica, utile in caso la numerazione automatica fallisca tvdb.find_and_set_infoLabels(item) @@ -254,7 +254,7 @@ def renumeration (itemlist, item, typography, dict_series, ID, Season, Episode, def manual_renumeration(item, modify=False): - info() + logger.info() _list = [] if item.from_channel: item.channel = item.from_channel title = item.fulltitle.rstrip() @@ -342,7 +342,7 @@ def manual_renumeration(item, modify=False): def delete_renumeration(item): - info() + logger.info() if item.from_channel: item.channel = item.from_channel title = item.fulltitle.rstrip() @@ -352,7 +352,7 @@ def delete_renumeration(item): def make_list(itemlist, item, typography, dict_series, ID, Season, Episode, Mode, title): - info() + logger.info() exist = True item.infoLabels['tvdb_id'] = ID tvdb.set_infoLabels_item(item) @@ -372,6 +372,7 @@ def make_list(itemlist, item, typography, dict_series, ID, Season, Episode, Mode if check: for page in Pages: data = tvdb.otvdb_global.get_list_episodes(ID,page) + logger.info('DATA',data) for episodes in data['data']: if episodes['firstAired'] and [episodes['firstAired'], episodes['airedSeason'], episodes['airedEpisodeNumber']] not in EpList: EpList.append([episodes['firstAired'], episodes['airedSeason'], episodes['airedEpisodeNumber']]) @@ -478,7 +479,7 @@ def make_list(itemlist, item, typography, dict_series, ID, Season, Episode, Mode def check(item): - info() + logger.info() dict_series = load(item) title = item.fulltitle.rstrip() if title in dict_series: title = dict_series[title] @@ -493,7 +494,7 @@ def error(itemlist): def find_episodes(item): - info() + logger.info() ch = __import__('channels.' + item.channel, fromlist=["channels.%s" % item.channel]) itemlist = ch.episodios(item) return itemlist @@ -501,7 +502,7 @@ def find_episodes(item): def RepresentsInt(s): # Controllo Numro Stagione - info() + logger.info() try: int(s) return True @@ -537,7 +538,7 @@ def select_type(item): def filename(item): - info() + logger.info() name_file = item.channel + "_data.json" path = filetools.join(config.get_data_path(), "settings_channels") fname = filetools.join(path, name_file) @@ -546,7 +547,7 @@ def filename(item): def load(item): - info() + logger.info() try: json_file = open(filename(item), "r").read() json = jsontools.load(json_file)[TAG_TVSHOW_RENUMERATE] @@ -558,7 +559,7 @@ def load(item): def write(item, json): - info() + logger.info() json_file = open(filename(item), "r").read() js = jsontools.load(json_file) js[TAG_TVSHOW_RENUMERATE] = json diff --git a/platformcode/launcher.py b/platformcode/launcher.py index 135e790d..b670d33e 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -129,6 +129,10 @@ def run(item=None): from platformcode import shortcuts return getattr(shortcuts, item.action)(item) + elif item.channel == "autorenumber": + from platformcode import autorenumber + return getattr(autorenumber, item.action)(item) + elif item.action == "delete_key": from platformcode import keymaptools return keymaptools.delete_key() diff --git a/resources/skins/Default/720p/InfoWindow.xml b/resources/skins/Default/720p/InfoWindow.xml index 27045eb4..93137c24 100644 --- a/resources/skins/Default/720p/InfoWindow.xml +++ b/resources/skins/Default/720p/InfoWindow.xml @@ -71,9 +71,9 @@ 100 60 - 40 - 100 - font10 + 30 + 200 + font13 FFFFFFFF black left @@ -82,10 +82,10 @@ 100 - 200 - 40 + 250 + 30 365 - font10 + font13 | true FFFFFFFF @@ -95,11 +95,11 @@ - 125 + 130 60 - 40 - 100 - font10 + 30 + 200 + font13 0xFFFFFFFF black left @@ -107,11 +107,11 @@ - 125 - 200 - 40 + 130 + 250 + 30 365 - font10 + font13 | true 0xFFFFFFFF @@ -121,11 +121,11 @@ - 150 + 160 60 - 40 - 100 - font10 + 30 + 200 + font13 0xFFFFFFFF black left @@ -133,11 +133,11 @@ - 150 - 200 - 40 + 160 + 250 + 30 365 - font10 + font13 | true 0xFFFFFFFF @@ -147,11 +147,11 @@ - 175 + 190 60 - 40 - 100 - font10 + 30 + 200 + font13 0xFFFFFFFF black left @@ -159,11 +159,11 @@ - 175 - 200 - 40 + 190 + 250 + 30 365 - font10 + font13 | true 0xFFFFFFFF @@ -173,11 +173,11 @@ - 200 + 220 60 - 40 - 100 - font10 + 30 + 200 + font13 0xFFFFFFFF black left @@ -185,11 +185,11 @@ - 200 - 200 - 40 + 220 + 250 + 30 365 - font10 + font13 | true 0xFFFFFFFF @@ -199,11 +199,11 @@ - 225 + 250 60 - 40 - 100 - font10 + 30 + 200 + font13 0xFFFFFFFF black left @@ -211,11 +211,11 @@ - 225 - 200 - 40 + 250 + 250 + 30 365 - font10 + font13 | true 0xFFFFFFFF @@ -225,11 +225,11 @@ - 250 + 280 60 - 40 - 100 - font10 + 30 + 200 + font13 0xFFFFFFFF black left @@ -237,11 +237,11 @@ - 250 - 200 - 40 + 280 + 250 + 30 365 - font10 + font13 | true 0xFFFFFFFF @@ -251,11 +251,11 @@ - 275 + 310 60 - 40 - 100 - font10 + 30 + 200 + font13 0xFFFFFFFF black left @@ -263,11 +263,11 @@ - 275 - 200 - 40 + 310 + 250 + 30 365 - font10 + font13 | true 0xFFFFFFFF @@ -277,11 +277,11 @@ - 300 + 330 60 - 40 + 30 505 - font10 + font13 0xFFFFFFFF black left @@ -289,11 +289,11 @@ - 300 - 200 - 294 - 500 - font10 + 330 + 250 + 250 + 550 + font13 0xFFFFFFFF black true @@ -362,7 +362,7 @@ 1080 30 110 - font10 + font13 FFFFFFFF black right diff --git a/service.py b/service.py index 4156cda4..12db63fc 100644 --- a/service.py +++ b/service.py @@ -331,12 +331,12 @@ class AddonMonitor(xbmc.Monitor): if self.settings_pre.get("videolibrarypath", None) != settings_post.get("videolibrarypath", None) or \ self.settings_pre.get("folder_movies", None) != settings_post.get("folder_movies", None) or \ self.settings_pre.get("folder_tvshows", None) != settings_post.get("folder_tvshows", None): - videolibrary.move_videolibrary(self.settings_pre.get("videolibrarypath", None), - settings_post.get("videolibrarypath", None), - self.settings_pre.get("folder_movies", None), - settings_post.get("folder_movies", None), - self.settings_pre.get("folder_tvshows", None), - settings_post.get("folder_tvshows", None)) + videolibrary.move_videolibrary(self.settings_pre.get("videolibrarypath", ''), + settings_post.get("videolibrarypath", ''), + self.settings_pre.get("folder_movies", ''), + settings_post.get("folder_movies", ''), + self.settings_pre.get("folder_tvshows", ''), + settings_post.get("folder_tvshows", '')) # si se ha puesto que se quiere autoconfigurar y se habĂ­a creado el directorio de la videoteca if not self.settings_pre.get("videolibrary_kodi", None) and settings_post.get("videolibrary_kodi", None):