From 29c98b48eae884fb53a49a209302c19eb50ce51d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 4 Feb 2021 17:50:54 +0000 Subject: [PATCH 1/2] {Aggiornamento domini} --- channels.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/channels.json b/channels.json index 6923b1b4..2b709c5d 100644 --- a/channels.json +++ b/channels.json @@ -15,13 +15,13 @@ "cb01anime": "https://www.cineblog01.red", "cinemalibero": "https://cinemalibero.win", "cinetecadibologna": "http://cinestore.cinetecadibologna.it", - "discoveryplus": "https://www.discoveryplus.it", + "discoveryplus": "https://www.discoveryplus.com", "dreamsub": "https://dreamsub.stream", "dsda": "https://www.dsda.press", - "eurostreaming": "https://eurostreaming.chat", + "eurostreaming": "https://eurostreaming.city", "filmgratis": "https://www.filmaltadefinizione.me", "filmigratis": "https://filmigratis.org", - "filmsenzalimiticc": "https://www.filmsenzalimiti01.fun", + "filmsenzalimiticc": "https://www.filmsenzalimiti01.work", "filmstreaming01": "https://filmstreaming01.com", "guardaserie_stream": "https://guardaserie.host", "guardaseriecam": "https://guardaserie.cam", @@ -29,9 +29,9 @@ "guardaserieicu": "https://guardaserie.shop", "hd4me": "https://hd4me.net", "ilcorsaronero": "https://ilcorsaronero.link", - "ilgeniodellostreaming": "https://ilgeniodellostreaming.dev", + "ilgeniodellostreaming": "https://ilgeniodellostreaming.pub", "ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.gold", - "italiaserie": "https://italiaserie.top", + "italiaserie": "https://italiaserie.bid", "mediasetplay": "https://www.mediasetplay.mediaset.it", "mondoserietv": "https://mondoserietv.fun", "paramount": "https://www.paramountnetwork.it", From 0952f63584436f783a3ca1bf1ffe61cdbf46fab9 Mon Sep 17 00:00:00 2001 From: mac12m99 <10120390+mac12m99@users.noreply.github.com> Date: Thu, 4 Feb 2021 21:24:35 +0100 Subject: [PATCH 2/2] fix mancata chiusura db --- core/__init__.py | 4 ++++ platformcode/launcher.py | 4 ++++ platformcode/platformtools.py | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/__init__.py b/core/__init__.py index 7f4a185d..ccf1b26e 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -24,6 +24,10 @@ class nested_dict_sqlite(defaultdict): self[key] = value = self.default_factory(key) return value + def close(self): + for key in self.keys(): + self[key].close() + db_name = filetools.join(config.get_data_path(), "db.sqlite") db = nested_dict_sqlite(lambda table: SqliteDict(db_name, table, 'c', True)) diff --git a/platformcode/launcher.py b/platformcode/launcher.py index dc953b47..c4dbccda 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -343,6 +343,10 @@ def run(item=None): if platformtools.dialog_yesno(config.get_localized_string(60038), config.get_localized_string(60015)): run(Item(channel="setting", action="report_menu")) + # close db to ensure his thread will stop + from core import db + db.close() + def new_search(item, channel=None): itemlist=[] diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index f03fbd4a..65112d89 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -673,11 +673,11 @@ def play_video(item, strm=False, force_direct=False, autoplay=False): # Open the selection dialog to see the available options opciones, video_urls, seleccion, salir = get_dialogo_opciones(item, default_action, strm, autoplay) - if salir: exit() + if salir: return # get default option of addon configuration seleccion = get_seleccion(default_action, opciones, seleccion, video_urls) - if seleccion < 0: exit() # Canceled box + if seleccion < 0: return # Canceled box logger.debug("selection=%d" % seleccion) logger.debug("selection=%s" % opciones[seleccion])