Merge branch 'beta-version'

README.md

@@ -1,5 +1,5 @@
 [![stable version](https://img.shields.io/badge/stable_version-2.1.2-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.2.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.2.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.2.3" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.2.4" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -67,7 +67,10 @@
     <summary lang="ru_RU">Нативная интеграция сервера Plex в Kodi</summary>
     <description lang="ru_RU">Подключите Kodi к своему серверу Plex. Плагин предполагает что вы управляете своими видео с помощью Plex (а не в Kodi). Вы можете потерять текущие базы данных музыки и видео в Kodi (так как плагин напрямую их изменяет). Используйте на свой страх и риск</description>
     <disclaimer lang="ru_RU">Используйте на свой страх и риск</disclaimer>
-    <news>version 2.2.3 (beta only):
+    <news>version 2.2.4 (beta only):
+- Fix LibrarySync crashing due to Plex Companion messages
+
+version 2.2.3 (beta only):
 - Compatibility with Kodi Krypton Alpha 2
 - Append tv show and SxxExx to episode playlist entries
 

changelog.txt

@@ -1,3 +1,6 @@
+version 2.2.4 (beta only):
+- Fix LibrarySync crashing due to Plex Companion messages
+
 version 2.2.3 (beta only):
 - Compatibility with Kodi Krypton Alpha 2
 - Append tv show and SxxExx to episode playlist entries

resources/lib/librarysync.py

@@ -1024,12 +1024,18 @@ class LibrarySync(Thread):
         processes json.loads() messages from websocket. Triage what we need to
         do with "process_" methods
         """
-        if message['type'] == 'playing':
+        try:
-            self.process_playing(message['PlaySessionStateNotification'])
+            if message['type'] == 'playing':
-        elif message['type'] == 'timeline':
+                self.process_playing(message['PlaySessionStateNotification'])
-            self.process_timeline(message['TimelineEntry'])
+            elif message['type'] == 'timeline':
-        elif message['type'] == 'activity':
+                self.process_timeline(message['TimelineEntry'])
-            self.process_activity(message['ActivityNotification'])
+            elif message['type'] == 'activity':
+                self.process_activity(message['ActivityNotification'])
+        except:
+            LOG.error('Processing of Plex Companion message has crashed')
+            LOG.error('Message was: %s', message)
+            import traceback
+            LOG.error("Traceback:\n%s", traceback.format_exc())
 
     def multi_delete(self, liste, delete_list):
         """