From 09b2216623f1afb270ae541291a8f0ff75786e4c Mon Sep 17 00:00:00 2001 From: panni Date: Fri, 20 Jul 2018 02:05:52 +0200 Subject: [PATCH] unify mark unplayed/played behaviour with plexweb; show mark unplayed even if video in progress --- lib/windows/episodes.py | 7 ++++--- lib/windows/preplay.py | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/windows/episodes.py b/lib/windows/episodes.py index 63b8467c1..25672b07b 100644 --- a/lib/windows/episodes.py +++ b/lib/windows/episodes.py @@ -522,10 +522,11 @@ def optionsButtonClicked(self, from_item=False): if len(mli.dataSource.media) > 1: options.append({'key': 'play_version', 'display': T(32451, 'Play Version...')}) - if mli.dataSource.isWatched and not mli.dataSource.viewOffset.asInt(): - options.append({'key': 'mark_unwatched', 'display': T(32318, 'Mark Unplayed')}) - else: + inProgress = mli.dataSource.viewOffset.asInt() + if not mli.dataSource.isWatched or inProgress: options.append({'key': 'mark_watched', 'display': T(32319, 'Mark Played')}) + if mli.dataSource.isWatched or inProgress: + options.append({'key': 'mark_unwatched', 'display': T(32318, 'Mark Unplayed')}) # if True: # options.append({'key': 'add_to_playlist', 'display': '[COLOR FF808080]Add To Playlist[/COLOR]'}) diff --git a/lib/windows/preplay.py b/lib/windows/preplay.py index 8e064a716..66ee3f9bc 100644 --- a/lib/windows/preplay.py +++ b/lib/windows/preplay.py @@ -193,10 +193,11 @@ def optionsButtonClicked(self): if len(self.video.media) > 1: options.append({'key': 'play_version', 'display': T(32451, 'Play Version...')}) - if self.video.isWatched and not self.video.viewOffset.asInt(): - options.append({'key': 'mark_unwatched', 'display': T(32318, 'Mark Unplayed')}) - else: + inProgress = self.video.viewOffset.asInt() + if not self.video.isWatched or inProgress: options.append({'key': 'mark_watched', 'display': T(32319, 'Mark Played')}) + if self.video.isWatched or inProgress: + options.append({'key': 'mark_unwatched', 'display': T(32318, 'Mark Unplayed')}) options.append(dropdown.SEPARATOR)