Merge pull request #1586 from croneter/python3-beta

Bump Python 3 master

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.4.0" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.4.1" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="script.module.requests" version="2.22.0+matrix.1" />
@@ -91,7 +91,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.4.0:
+    <news>version 3.4.1:
+- Fix PMS setting `List of IP addresses and networks that are allowed without auth` causing Kodi to take forever to start playback
+
+version 3.4.0:
 - Improve logging for converting Unix timestamps
 - Remove dependency on script.module.defusedxml - that module is now included in PKC
 - version 3.3.3-3.3.5 for everyone

changelog.txt

@@ -1,3 +1,6 @@
+version 3.4.1:
+- Fix PMS setting `List of IP addresses and networks that are allowed without auth` causing Kodi to take forever to start playback
+
 version 3.4.0:
 - Improve logging for converting Unix timestamps
 - Remove dependency on script.module.defusedxml - that module is now included in PKC

resources/lib/plex_api/media.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 from logging import getLogger
+import re
 
 from ..utils import cast
 from ..downloadutils import DownloadUtils as DU
@@ -10,6 +11,9 @@ from .. import plex_functions as PF
 LOG = getLogger('PLEX.api')
 
 
+REGEX_VIDEO_FILENAME = re.compile(r'''\/file\.[a-zA-Z0-9]{1,5}$''')
+
+
 class Media(object):
     def optimized_for_streaming(self):
         """
@@ -286,6 +290,12 @@ class Media(object):
         headers = clientinfo.getXArgsDeviceInfo()
         if action == v.PLAYBACK_METHOD_DIRECT_PLAY:
             path = self.xml[self.mediastream][self.part].get('key')
+            # Kodi 19 will try to look for subtitles in the directory containing the file.
+            # '/' and '/file.*'' both point to the file, and Kodi will happily try to read
+            # the whole file without recognizing it isn't a directory.
+            # To get around that, we omit the filename here since it is unnecessary.
+            # We do this for library videos only, not for e.g. trailers (does not work)
+            path = REGEX_VIDEO_FILENAME.sub('/', path, count=1)
             # e.g. Trailers already feature an '?'!
             return utils.extend_url(app.CONN.server + path, headers)
         # Direct Streaming and Transcoding