From 605fd0df6f356a4e43c10bd9581edbbc12e0468b Mon Sep 17 00:00:00 2001 From: Shaun Date: Sat, 27 Jan 2018 11:57:21 +1100 Subject: [PATCH] add setting to force auto resume of in progress items --- addon.xml | 2 +- resources/language/resource.language.en_gb/strings.po | 4 ++++ resources/lib/play_utils.py | 7 +++++++ resources/settings.xml | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/addon.xml b/addon.xml index deaa139..b07078e 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index bca32a2..8222ecb 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -689,3 +689,7 @@ msgstr "" msgctxt "#30321" msgid " - Album Artists" msgstr "" + +msgctxt "#30322" +msgid "Auto Resume" +msgstr "" diff --git a/resources/lib/play_utils.py b/resources/lib/play_utils.py index 8cfbef4..16146d9 100644 --- a/resources/lib/play_utils.py +++ b/resources/lib/play_utils.py @@ -116,6 +116,7 @@ def playFile(play_info, monitor): settings = xbmcaddon.Addon('plugin.video.embycon') addon_path = settings.getAddonInfo('path') + force_auto_resume = settings.getSetting('forceAutoResume') == 'true' jump_back_amount = int(settings.getSetting("jump_back_amount")) server = download_utils.getServer() @@ -173,6 +174,12 @@ def playFile(play_info, monitor): # process user data for resume points if auto_resume != -1: seekTime = (auto_resume / 1000) / 10000 + + elif force_auto_resume: + userData = result.get("UserData") + reasonableTicks = int(userData.get("PlaybackPositionTicks")) / 1000 + seekTime = reasonableTicks / 10000 + else: userData = result.get("UserData") if userData.get("PlaybackPositionTicks") != 0: diff --git a/resources/settings.xml b/resources/settings.xml index e0e2dda..b556009 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -36,6 +36,7 @@ +