From d75e18b5bae0f322d1719f069b16c60d275ac778 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 25 Mar 2021 18:01:38 +0000 Subject: [PATCH 1/3] {Aggiornamento domini} --- channels.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels.json b/channels.json index 54dfccaa..ce96d3f8 100644 --- a/channels.json +++ b/channels.json @@ -30,16 +30,16 @@ "guardaserieicu": "https://guardaserie.works", "hd4me": "https://hd4me.net", "ilcorsaronero": "https://ilcorsaronero.link", - "ilgeniodellostreaming": "https://ilgeniodellostreaming.soy", + "ilgeniodellostreaming": "https://ilgeniodellostreaming.moe", "ilgeniodellostreaming_cam": "https://ilgeniodellostreaming.photo", - "italiaserie": "https://italiaserie.fit", + "italiaserie": "https://italiaserie.casa", "mediasetplay": "https://www.mediasetplay.mediaset.it", "mondoserietv": "https://mondoserietv.fun", "paramount": "https://www.paramountnetwork.it", "piratestreaming": "https://www.piratestreaming.guru", "polpotv": "https://roma.polpo.tv", "raiplay": "https://www.raiplay.it", - "serietvonline": "https://serietvonline.pink", + "serietvonline": "https://serietvonline.blue", "serietvsubita": "http://serietvsubita.xyz", "serietvu": "https://www.serietvu.link", "streamingcommunity": "https://streamingcommunity.co", From a0e4ecb6cb7b05220e38a287d5cc8bd6be4afed7 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Thu, 25 Mar 2021 19:28:23 +0100 Subject: [PATCH 2/3] Fix Episodio Successivo --- platformcode/xbmc_videolibrary.py | 37 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py index 8a5c7146..9bb85a92 100644 --- a/platformcode/xbmc_videolibrary.py +++ b/platformcode/xbmc_videolibrary.py @@ -28,7 +28,7 @@ def mark_auto_as_watched(item): time_limit = time.time() + 30 while not platformtools.is_playing() and time.time() < time_limit: - time.sleep(1) + pass marked = False @@ -39,9 +39,6 @@ def mark_auto_as_watched(item): percentage = float(config.get_setting("watched_setting")) / 100 time_from_end = config.get_setting('next_ep_seconds') if item.contentType != 'movie' and config.get_setting('next_ep') < 3: - next_dialogs = ['NextDialog.xml', 'NextDialogExtended.xml', 'NextDialogCompact.xml'] - next_ep_type = config.get_setting('next_ep_type') - ND = next_dialogs[next_ep_type] try: next_episode = next_ep(item) except: next_episode = False logger.debug(next_episode) @@ -69,29 +66,31 @@ def mark_auto_as_watched(item): show_server = False from specials import videolibrary videolibrary.mark_content_as_watched2(item) - if not next_episode: - break - - # check for next Episode - if next_episode and sync and time_from_end >= difference: - nextdialog = NextDialog(ND, config.get_runtime_path()) - while platformtools.is_playing() and not nextdialog.is_exit(): - xbmc.sleep(100) - if nextdialog.continuewatching: - next_episode.next_ep = True - xbmc.Player().stop() - nextdialog.close() break + # Silent sync with Trakt + if sync and config.get_setting("trakt_sync"): sync_trakt_kodi() + + # check for next Episode + if next_episode and sync: + next_dialogs = ['NextDialog.xml', 'NextDialogExtended.xml', 'NextDialogCompact.xml'] + next_ep_type = config.get_setting('next_ep_type') + ND = next_dialogs[next_ep_type] + nextdialog = NextDialog(ND, config.get_runtime_path()) + while platformtools.is_playing() and not nextdialog.is_exit(): + xbmc.sleep(100) + if nextdialog.continuewatching: + next_episode.next_ep = True + xbmc.Player().stop() + nextdialog.close() + # break + # if item.options['continue']: if actual_time < mark_time: item.played_time = actual_time else: item.played_time = 0 platformtools.set_played_time(item) - # Silent sync with Trakt - if sync and config.get_setting("trakt_sync"): sync_trakt_kodi() - while platformtools.is_playing(): xbmc.sleep(100) From 3cbfb92eb36396ffd8d0817602b4b314e57aedc6 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Thu, 25 Mar 2021 20:18:47 +0100 Subject: [PATCH 3/3] ops --- platformcode/xbmc_videolibrary.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py index 9bb85a92..72e89208 100644 --- a/platformcode/xbmc_videolibrary.py +++ b/platformcode/xbmc_videolibrary.py @@ -37,7 +37,7 @@ def mark_auto_as_watched(item): show_server = True percentage = float(config.get_setting("watched_setting")) / 100 - time_from_end = config.get_setting('next_ep_seconds') + if item.contentType != 'movie' and config.get_setting('next_ep') < 3: try: next_episode = next_ep(item) except: next_episode = False @@ -53,7 +53,6 @@ def mark_auto_as_watched(item): item.played_time = 0 # Fix for Slow Devices mark_time = total_time * percentage - difference = total_time - actual_time # Mark as Watched if actual_time > mark_time and not marked: @@ -73,6 +72,13 @@ def mark_auto_as_watched(item): # check for next Episode if next_episode and sync: + while platformtools.is_playing(): + actual_time = xbmc.Player().getTime() + total_time = xbmc.Player().getTotalTime() + time_from_end = config.get_setting('next_ep_seconds') + difference = total_time - actual_time + if time_from_end >= difference: + break next_dialogs = ['NextDialog.xml', 'NextDialogExtended.xml', 'NextDialogCompact.xml'] next_ep_type = config.get_setting('next_ep_type') ND = next_dialogs[next_ep_type]