Merge pull request #2086 from croneter/python3-beta

Bump python3 stable branch

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.10.0" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.10.1" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="script.module.requests" version="2.22.0" />
@@ -113,7 +113,10 @@
     <summary lang="ko_KR">Plex를 Kodi에 기본 통합</summary>
     <description lang="ko_KR">Kodi를 Plex Media Server에 연결합니다. 이 플러그인은 Plex로 모든 비디오를 관리하고 Kodi로는 관리하지 않는다고 가정합니다. Kodi 비디오 및 음악 데이터베이스에 이미 저장된 데이터가 손실 될 수 있습니다 (이 플러그인이 직접 변경하므로). 자신의 책임하에 사용하십시오!</description>
     <disclaimer lang="ko_KR">자신의 책임하에 사용</disclaimer>
-    <news>version 3.10.0:
+    <news>version 3.10.1:
+- Fix auto skipping of e.g. intros or commercials getting stuck #2084
+
+version 3.10.0:
 - WARNING: You will need to reset the Kodi database!
 - Versions 3.9.1-3.9.6 for everyone
 

changelog.txt

@@ -1,3 +1,6 @@
+version 3.10.1:
+- Fix auto skipping of e.g. intros or commercials getting stuck #2084
+
 version 3.10.0:
 - WARNING: You will need to reset the Kodi database!
 - Versions 3.9.1-3.9.6 for everyone

resources/lib/skip_plex_markers.py

@@ -22,7 +22,10 @@ def skip_markers(markers, markers_hidden):
     marker_definition = None
     for start, end, typus, _ in markers:
         marker_definition = MARKERS[typus]
-        if utils.settings(marker_definition[1]) == "true" and start <= progress < end:
+        # The "-1" is important since timestamps/seeks are not exact and we
+        # could end up in an endless loop within start & end
+        # see https://github.com/croneter/PlexKodiConnect/issues/2002
+        if utils.settings(marker_definition[1]) == "true" and start <= progress < end - 1:
             within_marker = typus
             break
         elif typus in markers_hidden: