Merge branch 'beta-version' into plex_for_kodi

README.md

@@ -1,5 +1,5 @@
 [![stable version](https://img.shields.io/badge/stable_version-2.4.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.4.3-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.4.4-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.4.3" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.4.4" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -74,7 +74,11 @@
     <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.4.3:
+    <news>version 2.4.4 (beta only):
+- Fix rare case when playback would not start-up
+- Increase logging
+
+version 2.4.3:
 - Fix Kodi addons throwing jsonrpc errors (database reset needed)
 
 version 2.4.2:

changelog.txt

@@ -1,3 +1,7 @@
+version 2.4.4 (beta only):
+- Fix rare case when playback would not start-up
+- Increase logging
+
 version 2.4.3:
 - Fix Kodi addons throwing jsonrpc errors (database reset needed)
 

resources/lib/kodimonitor.py

@@ -535,7 +535,7 @@ def _playback_cleanup(ended=False):
         state.PLAYER_STATES[playerid] = copy.deepcopy(state.PLAYSTATE)
     # As all playback has halted, reset the players that have been active
     state.ACTIVE_PLAYERS = set()
-    LOG.debug('Finished PKC playback cleanup')
+    LOG.info('Finished PKC playback cleanup')
 
 
 def _record_playstate(status, ended):

resources/lib/playback.py

@@ -57,6 +57,7 @@ def playback_triage(plex_id=None, plex_type=None, path=None, resolve=True):
         utils.dialog('notification', utils.lang(29999), utils.lang(30017))
         _ensure_resolve(abort=True)
         return
+    with state.LOCK_PLAYQUEUES:
         playqueue = PQ.get_playqueue_from_type(
             v.KODI_PLAYLIST_TYPE_FROM_PLEX_TYPE[plex_type])
         try:
@@ -64,7 +65,7 @@ def playback_triage(plex_id=None, plex_type=None, path=None, resolve=True):
         except KeyError:
             # Kodi bug - Playlist plays (not Playqueue) will ALWAYS be audio for
             # add-on paths
-        LOG.info('No position returned from Kodi player! Assuming playlist')
+            LOG.info('No position returned from player! Assuming playlist')
             playqueue = PQ.get_playqueue_from_type(v.KODI_PLAYLIST_TYPE_AUDIO)
             try:
                 pos = js.get_position(playqueue.playlistid)
@@ -106,12 +107,11 @@ def playback_triage(plex_id=None, plex_type=None, path=None, resolve=True):
             initiate = True
         else:
             if item.plex_id != plex_id:
-            LOG.debug('Received new plex_id %s, expected %s. Init playback',
+                LOG.debug('Received new plex_id %s, expected %s',
                           plex_id, item.plex_id)
                 initiate = True
             else:
                 initiate = False
-    with state.LOCK_PLAYQUEUES:
         if initiate:
             _playback_init(plex_id, plex_type, playqueue, pos)
         else: