Merge pull request #683 from croneter/beta-version

Bump beta

README.md

@@ -1,5 +1,5 @@
-[![stable version](https://img.shields.io/badge/stable_version-2.6.2-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.6.3-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.6.2-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.6.3-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)

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.6.2" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.6.3" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -77,7 +77,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.6.2:
+    <news>version 2.6.3:
+- Fix PKC crashing on Xbox
+
+version 2.6.2:
 - Fix playlist sync: sequence item 0: expected string or unicode
 - Fix PKC not deleting all the items it should
 - Fix keyError 'sessionKey' for weird PMS messages 

changelog.txt

@@ -1,3 +1,6 @@
+version 2.6.3:
+- Fix PKC crashing on Xbox
+
 version 2.6.2:
 - Fix playlist sync: sequence item 0: expected string or unicode
 - Fix PKC not deleting all the items it should

resources/lib/library_sync/__init__.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, division, unicode_literals
 
-from .full_sync import start, PLAYLIST_SYNC_ENABLED
+from .full_sync import start
 from .time import sync_pms_time
 from .websocket import store_websocket_message, process_websocket_messages, \
     WEBSOCKET_MESSAGES, PLAYSTATE_SESSIONS
-from .common import update_kodi_library
+from .common import update_kodi_library, PLAYLIST_SYNC_ENABLED
 from .fanart import FanartThread, FanartTask

resources/lib/library_sync/common.py

@@ -3,7 +3,10 @@
 from __future__ import absolute_import, division, unicode_literals
 import xbmc
 
-from .. import app
+from .. import app, utils, variables as v
+
+PLAYLIST_SYNC_ENABLED = (v.PLATFORM != 'Microsoft UWP' and
+                         utils.settings('enablePlaylistSync') == 'true')
 
 
 class libsync_mixin(object):

resources/lib/library_sync/full_sync.py

@@ -13,13 +13,9 @@ from .. import utils, timing, backgroundthread, variables as v, app
 from .. import plex_functions as PF, itemtypes
 from ..plex_db import PlexDB
 
-if (v.PLATFORM != 'Microsoft UWP' and
+if common.PLAYLIST_SYNC_ENABLED:
-        utils.settings('enablePlaylistSync') == 'true'):
-    # Xbox cannot use watchdog, a dependency for PKC playlist features
     from .. import playlists
-    PLAYLIST_SYNC_ENABLED = True
+
-else:
-    PLAYLIST_SYNC_ENABLED = False
 
 LOG = getLogger('PLEX.sync.full_sync')
 # How many items will be put through the processing chain at once?
@@ -411,7 +407,7 @@ class FullSync(common.fullsync_mixin):
             if self.isCanceled():
                 self.successful = False
                 return
-            if PLAYLIST_SYNC_ENABLED and not playlists.full_sync():
+            if common.PLAYLIST_SYNC_ENABLED and not playlists.full_sync():
                 self.successful = False
                 return
         finally:

resources/lib/library_sync/websocket.py

@@ -3,15 +3,17 @@
 from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 
-from .common import update_kodi_library
+from .common import update_kodi_library, PLAYLIST_SYNC_ENABLED
-from .full_sync import PLAYLIST_SYNC_ENABLED
 from .fanart import SYNC_FANART, FanartTask
 from ..plex_api import API
 from ..plex_db import PlexDB
 from .. import kodi_db
-from .. import backgroundthread, playlists, plex_functions as PF, itemtypes
+from .. import backgroundthread, plex_functions as PF, itemtypes
 from .. import artwork, utils, timing, variables as v, app
 
+if PLAYLIST_SYNC_ENABLED:
+    from .. import playlists
+
 LOG = getLogger('PLEX.sync.websocket')
 
 CACHING_ENALBED = utils.settings('enableTextureCache') == "true"

resources/lib/sync.py

@@ -9,6 +9,9 @@ from . import library_sync, timing
 from . import backgroundthread, utils, artwork, variables as v, app
 from . import kodi_db
 
+if library_sync.PLAYLIST_SYNC_ENABLED:
+    from . import playlists
+
 LOG = getLogger('PLEX.sync')
 
 
@@ -208,7 +211,6 @@ class Sync(backgroundthread.KillableThread):
                     initial_sync_done = True
                     utils.settings('dbCreatedWithVersion', v.ADDON_VERSION)
                     if library_sync.PLAYLIST_SYNC_ENABLED:
-                        from . import playlists
                         playlist_monitor = playlists.kodi_playlist_monitor()
                     self.start_fanart_download(refresh=False)
                     self.start_image_cache_thread()
@@ -227,7 +229,6 @@ class Sync(backgroundthread.KillableThread):
                     initial_sync_done = True
                     LOG.info('Done initial sync on Kodi startup')
                     if library_sync.PLAYLIST_SYNC_ENABLED:
-                        from . import playlists
                         playlist_monitor = playlists.kodi_playlist_monitor()
                     self.start_fanart_download(refresh=False)
                     self.start_image_cache_thread()