Merge pull request #1484 from croneter/beta-version

Bump master
This commit is contained in:
croneter 2021-05-23 08:05:07 +02:00 committed by GitHub
commit dbf2117a30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 7 deletions

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.12.22" provider-name="croneter"> <addon id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.12.24" provider-name="croneter">
<requires> <requires>
<import addon="xbmc.python" version="2.1.0"/> <import addon="xbmc.python" version="2.1.0"/>
<import addon="script.module.requests" version="2.9.1" /> <import addon="script.module.requests" version="2.9.1" />
@ -88,7 +88,14 @@
<summary lang="ko_KR">Plex를 Kodi에 기본 통합</summary> <summary lang="ko_KR">Plex를 Kodi에 기본 통합</summary>
<description lang="ko_KR">Kodi를 Plex Media Server에 연결합니다. 이 플러그인은 Plex로 모든 비디오를 관리하고 Kodi로는 관리하지 않는다고 가정합니다. Kodi 비디오 및 음악 데이터베이스에 이미 저장된 데이터가 손실 될 수 있습니다 (이 플러그인이 직접 변경하므로). 자신의 책임하에 사용하십시오!</description> <description lang="ko_KR">Kodi를 Plex Media Server에 연결합니다. 이 플러그인은 Plex로 모든 비디오를 관리하고 Kodi로는 관리하지 않는다고 가정합니다. Kodi 비디오 및 음악 데이터베이스에 이미 저장된 데이터가 손실 될 수 있습니다 (이 플러그인이 직접 변경하므로). 자신의 책임하에 사용하십시오!</description>
<disclaimer lang="ko_KR">자신의 책임하에 사용</disclaimer> <disclaimer lang="ko_KR">자신의 책임하에 사용</disclaimer>
<news>version 2.12.22: <news>version 2.12.24:
- version 2.12.23 for everyone
version 2.12.23 (beta only):
- Fix Alexa and RuntimeError: dictionary keys changed during iteration
- Fix a rare AttributeError when using playlists
version 2.12.22:
- version 2.12.20 and 2.12.21 for everyone - version 2.12.20 and 2.12.21 for everyone
version 2.12.21 (beta only): version 2.12.21 (beta only):

View file

@ -1,3 +1,10 @@
version 2.12.24:
- version 2.12.23 for everyone
version 2.12.23 (beta only):
- Fix Alexa and RuntimeError: dictionary keys changed during iteration
- Fix a rare AttributeError when using playlists
version 2.12.22: version 2.12.22:
- version 2.12.20 and 2.12.21 for everyone - version 2.12.20 and 2.12.21 for everyone

View file

@ -49,7 +49,7 @@ def convert_alexa_to_companion(dictionary):
""" """
The params passed by Alexa must first be converted to Companion talk The params passed by Alexa must first be converted to Companion talk
""" """
for key in dictionary: for key in list(dictionary):
if key in v.ALEXA_TO_COMPANION: if key in v.ALEXA_TO_COMPANION:
dictionary[v.ALEXA_TO_COMPANION[key]] = dictionary[key] dictionary[v.ALEXA_TO_COMPANION[key]] = dictionary[key]
del dictionary[key] del dictionary[key]

View file

@ -410,9 +410,9 @@ def _get_playListVersion_from_xml(playlist, xml):
Raises PlaylistError if unsuccessful Raises PlaylistError if unsuccessful
""" """
playlist.version = utils.cast(int, try:
xml.get('%sVersion' % playlist.kind)) playlist.version = int(xml.get('%sVersion' % playlist.kind))
if playlist.version is None: except (AttributeError, TypeError):
raise PlaylistError('Could not get new playlist Version for playlist ' raise PlaylistError('Could not get new playlist Version for playlist '
'%s' % playlist) '%s' % playlist)
@ -424,6 +424,8 @@ def get_playlist_details_from_xml(playlist, xml):
Raises PlaylistError if something went wrong. Raises PlaylistError if something went wrong.
""" """
if xml is None:
raise PlaylistError('No playlist received for playlist %s' % playlist)
playlist.id = utils.cast(int, playlist.id = utils.cast(int,
xml.get('%sID' % playlist.kind)) xml.get('%sID' % playlist.kind))
playlist.version = utils.cast(int, playlist.version = utils.cast(int,
@ -711,8 +713,8 @@ def delete_playlist_item_from_PMS(playlist, pos):
playlist.items[pos].id, playlist.items[pos].id,
playlist.repeat), playlist.repeat),
action_type="DELETE") action_type="DELETE")
_get_playListVersion_from_xml(playlist, xml)
del playlist.items[pos] del playlist.items[pos]
_get_playListVersion_from_xml(playlist, xml)
# Functions operating on the Kodi playlist objects ########## # Functions operating on the Kodi playlist objects ##########