Merge branch 'beta-version'

2018-08-05 18:15:30 +02:00 · 2018-08-05 18:15:30 +02:00 · 7a2752f4b0
commit 7a2752f4b0
parent d8386c4cc0 632dae37be
9 changed files with 24 additions and 18 deletions
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
 [![stable version](https://img.shields.io/badge/stable_version-2.3.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.3.4-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.5-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)
--- a/addon.xml
+++ b/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.4" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.3.5" 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.4 (beta only):
+    <news>version 2.3.5 (beta only):
+- Fix PKC not starting by importing playlist module only when sync enabled
+
+version 2.3.4 (beta only):
 - Fix playback sometimes not starting and UnicodeEncodeError for logging

 version 2.3.3:
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,6 @@
+version 2.3.5 (beta only):
+- Fix PKC not starting by importing playlist module only when sync enabled
+
 version 2.3.4 (beta only):
 - Fix playback sometimes not starting and UnicodeEncodeError for logging

--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@ -110,7 +110,7 @@ msgstr ""

 # PKC settings sync options
 msgctxt "#30020"
-msgid "Sync Plex playlists"
+msgid "Sync Plex playlists (reboot Kodi!)"
 msgstr ""

 # PKC settings sync options
--- a/resources/lib/kodimonitor.py
+++ b/resources/lib/kodimonitor.py
@ -51,7 +51,6 @@ STATE_SETTINGS = {
    'forceReloadSkinOnPlaybackStop': 'FORCE_RELOAD_SKIN',
    'fetch_pms_item_number': 'FETCH_PMS_ITEM_NUMBER',
    'imageSyncNotifications': 'IMAGE_SYNC_NOTIFICATIONS',
-    'enablePlaylistSync': 'SYNC_PLAYLISTS',
    'syncSpecificPlexPlaylists': 'SYNC_SPECIFIC_PLEX_PLAYLISTS',
    'syncSpecificKodiPlaylists': 'SYNC_SPECIFIC_KODI_PLAYLISTS'
 }
--- a/resources/lib/librarysync.py
+++ b/resources/lib/librarysync.py
@ -20,10 +20,16 @@ from . import plex_functions as PF
 from .plex_api import API
 from .library_sync import get_metadata, process_metadata, fanart, sync_info
 from . import music
-from . import playlists
 from . import variables as v
 from . import state

+if 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.librarysync')
@ -265,7 +271,7 @@ class LibrarySync(Thread):
                 repair)
        if not self._full_sync():
            return False
-        if not playlists.full_sync():
+        if PLAYLIST_SYNC_ENABLED and not playlists.full_sync():
            return False
        return True

@ -1186,7 +1192,7 @@ class LibrarySync(Thread):
                continue
            status = int(item['state'])
            if typus == 'playlist':
-                if not state.SYNC_PLAYLISTS:
+                if not PLAYLIST_SYNC_ENABLED:
                    continue
                playlists.websocket(plex_id=unicode(item['itemID']),
                                    status=status)
@ -1560,7 +1566,8 @@ class LibrarySync(Thread):
                    initial_sync_done = True
                    kodi_db_version_checked = True
                    last_sync = utils.unix_timestamp()
-                    playlist_monitor = playlists.kodi_playlist_monitor()
+                    if PLAYLIST_SYNC_ENABLED:
+                        playlist_monitor = playlists.kodi_playlist_monitor()
                    self.sync_fanart()
                    self.fanartthread.start()
                else:
@ -1612,7 +1619,8 @@ class LibrarySync(Thread):
                    initial_sync_done = True
                    last_sync = utils.unix_timestamp()
                    LOG.info('Done initial sync on Kodi startup')
-                    playlist_monitor = playlists.kodi_playlist_monitor()
+                    if PLAYLIST_SYNC_ENABLED:
+                        playlist_monitor = playlists.kodi_playlist_monitor()
                    artwork.Artwork().cache_major_artwork()
                    self.sync_fanart()
                    self.fanartthread.start()
--- a/resources/lib/playlists/init.py
+++ b/resources/lib/playlists/init.py
@ -113,9 +113,6 @@ def full_sync():
    Full sync of playlists between Kodi and Plex. Returns True is successful,
    False otherwise
    """
-    if not state.SYNC_PLAYLISTS:
-        LOG.debug('Not syncing playlists')
-        return True
    LOG.info('Starting playlist full sync')
    with state.LOCK_PLAYLISTS:
        return _full_sync()
@ -282,9 +279,6 @@ class PlaylistEventhandler(events.FileSystemEventHandler):
        :type event:
            :class:`FileSystemEvent`
        """
-        if not state.SYNC_PLAYLISTS:
-            # Sync is deactivated
-            return
        path = event.dest_path if event.event_type == events.EVENT_TYPE_MOVED \
            else event.src_path
        if not sync_kodi_playlist(path):
--- a/resources/lib/service_entry.py
+++ b/resources/lib/service_entry.py
@ -58,6 +58,7 @@ class Service():
                 utils.settings('syncThreadNumber'))
        LOG.info('Playlist m3u encoding: %s', v.M3U_ENCODING)
        LOG.info("Full sys.argv received: %s", sys.argv)
+        LOG.info('Sync playlists: %s', utils.settings('enablePlaylistSync'))
        LOG.info('Synching only specific Kodi playlists: %s',
                 utils.settings('syncSpecificKodiPlaylists') == 'true')
        LOG.info('Kodi playlist prefix: %s',
--- a/resources/lib/state.py
+++ b/resources/lib/state.py
@ -57,8 +57,6 @@ FORCE_RELOAD_SKIN = True
 SYNC_DIALOG = True
 # Shall Kodi show dialogs for syncing/caching images? (e.g. images left to sync)
 IMAGE_SYNC_NOTIFICATIONS = True
-# Sync playlists from Plex to Kodi and vice-versa?
-SYNC_PLAYLISTS = True
 # Only sync specific Plex playlists to Kodi?
 SYNC_SPECIFIC_PLEX_PLAYLISTS = False
 # Only sync specific Kodi playlists to Plex?