Player/Seekdialog: Show Video Preview Thumbnails when seeking on timeline with OSD open (was disabled before if chapters were found)

Author: pannal

lib/util.py

@@ -56,7 +56,7 @@
 
 
 DEF_THEME = "modern-colored"
-THEME_VERSION = 30
+THEME_VERSION = 31
 
 xbmc.log('script.plex: Kodi {0}.{1} (build {2})'.format(KODI_VERSION_MAJOR, KODI_VERSION_MINOR, KODI_BUILD_NUMBER),
          xbmc.LOGINFO)

lib/windows/seekdialog.py

@@ -529,9 +529,8 @@ def setup(self, duration, meta, offset=0, bif_url=None, title='', title2='', cha
             self.timeFmtKodi = self.timeFmtKodi.replace("hh:", "")
         self._ignoreTick = False
         self._ignoreInput = False
-        if not self.showChapters:
-            self.bifURL = bif_url
-            self.hasBif = bool(self.bifURL)
+        self.bifURL = bif_url
+        self.hasBif = bool(self.bifURL)
 
         if self.hasBif:
             self.baseURL = re.sub(r'/\d+\?', '/{0}?', self.bifURL)
@@ -636,11 +635,13 @@ def onAction(self, action):
                     # we're seeking from the timeline with the OSD open - do an actual timeline seek
 
                     if action in (xbmcgui.ACTION_MOVE_RIGHT, xbmcgui.ACTION_STEP_FORWARD):
+                        self.setProperty('show.chapters', '')
                         if self.useDynamicStepsForTimeline:
                             return self.skipForward()
                         return self.seekByOffset(10000, auto_seek=self.useAutoSeek)
 
                     elif action in (xbmcgui.ACTION_MOVE_LEFT, xbmcgui.ACTION_STEP_BACK):
+                        self.setProperty('show.chapters', '')
                         if self.useDynamicStepsForTimeline:
                             return self.skipBack()
                         return self.seekByOffset(-10000, auto_seek=self.useAutoSeek)
@@ -1822,7 +1823,12 @@ def updateProgress(self, set_to_current=True, offset=None, onlyTimeIndicator=Fal
             return
 
         if self.hasBif:
-            self.setProperty('bif.image', self.handler.player.playerObject.getBifUrl(offset))
+            bifUrl = self.handler.player.playerObject.getBifUrl(offset)
+            if "blur_chapters" in self.no_spoilers:
+                bifUrl = self.player.video.server.getImageTranscodeURL(bifUrl,
+                                                                       *PlaylistDialog.LI_AR16X9_THUMB_DIM,
+                                                                       **{"blur": util.addonSettings.episodeNoSpoilerBlur})
+            self.setProperty('bif.image', bifUrl)
             self.bifImageControl.setPosition(bifx, 752)
 
         self.seekbarControl.setPosition(0, self.seekbarControl.getPosition()[1])

resources/skins/Main/1080i/templates/script-plex-seek_dialog.xml.tpl

@@ -432,7 +432,7 @@
     <visible>!String.IsEmpty(Window.Property(show.OSD)) + !Window.IsVisible(osdvideosettings) + !Window.IsVisible(osdaudiosettings) + !Window.IsVisible(osdsubtitlesettings) + !Window.IsVisible(subtitlesearch) + !Window.IsActive(playerprocessinfo) + !Window.IsActive(selectdialog) + !Window.IsVisible(osdcmssettings)</visible>
     <animation effect="fade" time="200" delay="200" end="0">Hidden</animation>
     <control type="group" id="300">
-        <visible>!String.IsEmpty(Window.Property(has.bif)) + [Control.HasFocus(100) | Control.HasFocus(501) | !String.IsEmpty(Window.Property(button.seek))]</visible>
+        <visible>!String.IsEmpty(Window.Property(has.bif)) + String.IsEmpty(Window.Property(show.chapters) + [Control.HasFocus(100) | Control.HasFocus(501) | !String.IsEmpty(Window.Property(button.seek))]</visible>
         <animation effect="fade" time="100" delay="100" end="100">Visible</animation>
         <posx>0</posx>
         <posy>752</posy>