Merge pull request #1461 from croneter/py3-fix-attributerror

Fix a rare AttributeError when using playlists
This commit is contained in:
croneter 2021-05-02 13:48:53 +02:00 committed by GitHub
commit 287cb55941
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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