diff --git a/addon.xml b/addon.xml index 2c5fb659..1b34118e 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -93,7 +93,11 @@ Plex를 Kodi에 기본 통합 Kodi를 Plex Media Server에 연결합니다. 이 플러그인은 Plex로 모든 비디오를 관리하고 Kodi로는 관리하지 않는다고 가정합니다. Kodi 비디오 및 음악 데이터베이스에 이미 저장된 데이터가 손실 될 수 있습니다 (이 플러그인이 직접 변경하므로). 자신의 책임하에 사용하십시오! 자신의 책임하에 사용 - version 3.6.1: + version 3.6.2: +- Fix playback report not working and AttributeError: 'NoneType' object has no attribute 'startswith' #1755 +- Make sure that no proxy is used for artwork caching for calls to Kodi's webserver at localhost #1754 + +version 3.6.1: - Fix Kodi add-on Up Next crashing by removing code that has become obsolete on the PKC-side #1750 version 3.6.0: diff --git a/changelog.txt b/changelog.txt index ade920ba..0adabeb0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +version 3.6.2: +- Fix playback report not working and AttributeError: 'NoneType' object has no attribute 'startswith' #1755 +- Make sure that no proxy is used for artwork caching for calls to Kodi's webserver at localhost #1754 + version 3.6.1: - Fix Kodi add-on Up Next crashing by removing code that has become obsolete on the PKC-side #1750 diff --git a/resources/lib/artwork.py b/resources/lib/artwork.py index f7a74ab3..a2e169ce 100644 --- a/resources/lib/artwork.py +++ b/resources/lib/artwork.py @@ -99,11 +99,15 @@ def cache_url(url, should_suspend=None): sleeptime = 0 while True: try: + # Make sure that no proxy is used for our calls to Kodi's webserver + # at localhost See + # https://github.com/croneter/PlexKodiConnect/issues/1732 requests.head( url=f'http://{app.CONN.webserver_username}:{app.CONN.webserver_password}@{app.CONN.webserver_host}:{app.CONN.webserver_port}/image/image://{url}', auth=(app.CONN.webserver_username, app.CONN.webserver_password), - timeout=TIMEOUT) + timeout=TIMEOUT, + proxies={'http': None, 'https': None}) except requests.Timeout: # We don't need the result, only trigger Kodi to start the # download. All is well diff --git a/resources/lib/kodimonitor.py b/resources/lib/kodimonitor.py index b26c5fef..39092358 100644 --- a/resources/lib/kodimonitor.py +++ b/resources/lib/kodimonitor.py @@ -322,6 +322,7 @@ class KodiMonitor(xbmc.Monitor): kodi_type = item.kodi_type plex_id = item.plex_id plex_type = item.plex_type + path = item.file if playqueue.id: container_key = '/playQueues/%s' % playqueue.id else: @@ -329,7 +330,7 @@ class KodiMonitor(xbmc.Monitor): # Mechanik for Plex skip intro feature if utils.settings('enableSkipIntro') == 'true': status['intro_markers'] = item.api.intro_markers() - if item.playmethod is None and not path.startswith('plugin://'): + if item.playmethod is None and path and not path.startswith('plugin://'): item.playmethod = v.PLAYBACK_METHOD_DIRECT_PATH item.playerid = playerid # Remember the currently playing item