Merge branch 'beta-version'

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) 
+[![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.0-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-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)
@@ -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)

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.3.0" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.3.1" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -73,7 +73,10 @@
     <summary lang="uk_UA">Нативна інтеграція Plex в Kodi</summary>
     <description lang="uk_UA">Підключає Kodi до серверу Plex. Цей плагін передбачає, що ви керуєте всіма своїми відео за допомогою Plex (і ніяк не Kodi). Ви можете втратити дані, які вже зберігаються у відео та музичних БД Kodi (оскільки цей плагін безпосередньо їх змінює). Використовуйте на свій страх і ризик!</description>
     <disclaimer lang="uk_UA">Використовуйте на свій ризик</disclaimer>
-    <news>version 2.3.0:
+    <news>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

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!

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

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