unify mark unplayed/played behaviour with plexweb; show mark unplayed even if video in progress

Author: pannal

lib/windows/episodes.py

@@ -513,10 +513,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]'})

lib/windows/preplay.py

@@ -183,10 +183,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)