From 8322609ef911fa2c2b2667269e818e60e0f06b3b Mon Sep 17 00:00:00 2001 From: croneter Date: Fri, 3 Aug 2018 18:37:16 +0200 Subject: [PATCH 1/3] Fix library sync crashing due to Plex photo albums - Fixes #517 --- resources/lib/playlists/__init__.py | 7 +++++-- resources/lib/variables.py | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/lib/playlists/__init__.py b/resources/lib/playlists/__init__.py index da5df27d..a6c3fcf2 100644 --- a/resources/lib/playlists/__init__.py +++ b/resources/lib/playlists/__init__.py @@ -237,8 +237,6 @@ def sync_plex_playlist(plex_id=None, xml=None, playlist=None): Pass in either the plex_id or an xml (where API(xml) will be used) """ - if not state.SYNC_SPECIFIC_PLEX_PLAYLISTS: - return True if playlist: # Mainly once we DELETED a Plex playlist that we're NOT supposed # to sync @@ -254,8 +252,13 @@ def sync_plex_playlist(plex_id=None, xml=None, playlist=None): api = API(xml[0]) else: api = API(xml) + if api.playlist_type() == v.PLEX_TYPE_PHOTO_PLAYLIST: + # Not supported by Kodi + return False name = api.title() typus = v.KODI_PLAYLIST_TYPE_FROM_PLEX[api.playlist_type()] + if not state.SYNC_SPECIFIC_PLEX_PLAYLISTS: + return True if (not state.ENABLE_MUSIC and typus == v.PLEX_PLAYLIST_TYPE_AUDIO): LOG.debug('Not synching Plex audio playlist') return False diff --git a/resources/lib/variables.py b/resources/lib/variables.py index 9033aa18..24ae88d1 100644 --- a/resources/lib/variables.py +++ b/resources/lib/variables.py @@ -129,8 +129,10 @@ PLAYLIST_PATH_MUSIC = os.path.join(PLAYLIST_PATH, 'music') PLEX_TYPE_AUDIO_PLAYLIST = 'audio' PLEX_TYPE_VIDEO_PLAYLIST = 'video' +PLEX_TYPE_PHOTO_PLAYLIST = 'photo' KODI_TYPE_AUDIO_PLAYLIST = 'music' KODI_TYPE_VIDEO_PLAYLIST = 'video' +KODI_TYPE_PHOTO_PLAYLIST = None # Not supported yet KODI_PLAYLIST_TYPE_FROM_PLEX = { PLEX_TYPE_AUDIO_PLAYLIST: KODI_TYPE_AUDIO_PLAYLIST, PLEX_TYPE_VIDEO_PLAYLIST: KODI_TYPE_VIDEO_PLAYLIST From 82a1771473b81df02d1d4daa0b35eb90e76d4d26 Mon Sep 17 00:00:00 2001 From: croneter Date: Fri, 3 Aug 2018 18:39:26 +0200 Subject: [PATCH 2/3] Update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 47d6cddd..084bbdde 100644 --- a/README.md +++ b/README.md @@ -53,12 +53,13 @@ Some people argue that PKC is 'hacky' because of the way it directly accesses th ### PKC Features -- Support for Kodi 18 Leia Alpha 2 (nightly versions are NOT supported!) +- Support for Kodi 18 Leia Alpha 3 (nightly versions are NOT supported!) - Support for Kodi 17 Krypton - [Amazon Alexa voice recognition](https://www.plex.tv/apps/streaming-devices/amazon-alexa) - [Cinema Trailers & Extras](https://support.plex.tv/articles/202934883-cinema-trailers-extras/) - [Plex Watch Later / Plex It!](https://support.plex.tv/hc/en-us/sections/200211783-Plex-It-) - [Plex Companion](https://support.plex.tv/hc/en-us/sections/200276908-Plex-Companion): fling Plex media (or anything else) from other Plex devices to PlexKodiConnect +- Automatically sync Plex playlists to Kodi playlists and vice-versa - [Plex Transcoding](https://support.plex.tv/hc/en-us/articles/200250377-Transcoding-Media) - Automatically download more artwork from [Fanart.tv](https://fanart.tv/), just like the Kodi addon [Artwork Downloader](http://kodi.wiki/view/Add-on:Artwork_Downloader) - Automatically group movies into [movie sets](http://kodi.wiki/view/movie_sets) From b7faecb46c88878c7cce76f905dcd54ede05f997 Mon Sep 17 00:00:00 2001 From: croneter Date: Fri, 3 Aug 2018 18:41:14 +0200 Subject: [PATCH 3/3] Beta and stable version bump 2.3.1 --- README.md | 4 ++-- addon.xml | 7 +++++-- changelog.txt | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 084bbdde..4b4efde5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![stable version](https://img.shields.io/badge/stable_version-2.3.0-blue.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/stable/repository.plexkodiconnect/repository.plexkodiconnect-1.0.2.zip) -[![beta version](https://img.shields.io/badge/beta_version-2.3.0-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip) +[![stable version](https://img.shields.io/badge/stable_version-2.3.1-blue.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/stable/repository.plexkodiconnect/repository.plexkodiconnect-1.0.2.zip) +[![beta version](https://img.shields.io/badge/beta_version-2.3.1-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip) [![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/Installation) [![FAQ](https://img.shields.io/badge/wiki-FAQ-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/faq) diff --git a/addon.xml b/addon.xml index 3de21437..c9054fd2 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -73,7 +73,10 @@ Нативна інтеграція Plex в Kodi Підключає Kodi до серверу Plex. Цей плагін передбачає, що ви керуєте всіма своїми відео за допомогою Plex (і ніяк не Kodi). Ви можете втратити дані, які вже зберігаються у відео та музичних БД Kodi (оскільки цей плагін безпосередньо їх змінює). Використовуйте на свій страх і ризик! Використовуйте на свій ризик - version 2.3.0: + version 2.3.1: +- Fix library sync crashing due to Plex photo albums + +version 2.3.0: Major stable version bump. Highlights: - Sync Plex playlists to Kodi and Kodi playlists to Plex! - Support for Plex collection/set artwork diff --git a/changelog.txt b/changelog.txt index 88da2ff3..35eab539 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +version 2.3.1: +- Fix library sync crashing due to Plex photo albums + version 2.3.0: Major stable version bump. Highlights: - Sync Plex playlists to Kodi and Kodi playlists to Plex!