stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
mac12m99
2021-03-25 21:09:16 +01:00
parent b0079b4d77 3cbfb92eb3
commit 59aceeaeb7
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels.json
View File

@@ -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",

47
platformcode/xbmc_videolibrary.py
View File

@@ -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
@@ -37,11 +37,8 @@ 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:
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)
@@ -56,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:
@@ -69,29 +65,38 @@ 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:
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]
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)