Merge pull request #1757 from croneter/python3-beta
Bump Python 3 master
This commit is contained in:
commit
ec0b5b6d97
4 changed files with 17 additions and 4 deletions
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<addon id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.6.1" provider-name="croneter">
|
||||
<addon id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.6.2" provider-name="croneter">
|
||||
<requires>
|
||||
<import addon="xbmc.python" version="3.0.0"/>
|
||||
<import addon="script.module.requests" version="2.22.0+matrix.1" />
|
||||
|
@ -93,7 +93,11 @@
|
|||
<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.6.1:
|
||||
<news>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:
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue