Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.emby"
         name="Emby" 
-        version="2.3.9"
+        version="2.3.13"
         provider-name="Emby.media">
   <requires>
     <import addon="xbmc.python" version="2.19.0"/>

changelog.txt

@@ -1,3 +1,8 @@
+version 2.3.12
+- Fix virtual episodes being processed
+- Return offline items so they don't get removed in kodi
+- other minor fixes
+
 version 2.3.8
 - Fix database connection
 - other minor fixes

resources/lib/database.py

@@ -98,7 +98,7 @@ class DatabaseConn(object):
 
         log.info("opened: %s - %s", self.path, id(self.conn))
         self.cursor = self.conn.cursor()
-        return self.conn.cursor()
+        return self.cursor
 
     def _SQL(self, media_type):
 

resources/lib/librarysync.py

@@ -651,9 +651,6 @@ class LibrarySync(threading.Thread):
 
         log.warn("---===### Starting LibrarySync ###===---")
 
-        # Verify database structure, otherwise create it.
-        self._verify_emby_database()
-
         while not self.monitor.abortRequested():
 
             # In the event the server goes offline

resources/lib/objects/tvshows.py

@@ -401,7 +401,7 @@ class TVShows(Items):
             # We needed to recreate the show entry. Re-add episodes now.
             log.info("Repairing episodes for showid: %s %s", showid, title)
             all_episodes = emby.getEpisodesbyShow(itemid)
-            self.add_episode(all_episodes['Items'], None)
+            self.add_episodes(all_episodes['Items'], None)
 
         return True
 

resources/lib/player.py

@@ -385,9 +385,14 @@ class Player(xbmc.Player):
         log.debug("PLAYBACK_SEEK: %s" % currentFile)
 
         if self.played_info.get(currentFile):
+            position = None
+            try:
                 position = self.xbmcplayer.getTime()
-            self.played_info[currentFile]['currentPosition'] = position
+            except:
+                pass
 
+            if position is not None:
+                self.played_info[currentFile]['currentPosition'] = position
                 self.reportPlayback()
     
     @log_error()

resources/lib/read_embyserver.py

@@ -172,6 +172,7 @@ class Read_EmbyServer():
             'ParentId': parentid,
             'ArtistIds': artist_id,
             'IncludeItemTypes': itemtype,
+            'LocationTypes': "FileSystem,Remote,Offline",
             'CollapseBoxSetItems': False,
             'IsVirtualUnaired': False,
             'IsMissing': False,
@@ -201,6 +202,7 @@ class Read_EmbyServer():
                     'IncludeItemTypes': itemtype,
                     'CollapseBoxSetItems': False,
                     'IsVirtualUnaired': False,
+                    'LocationTypes': "FileSystem,Remote,Offline",
                     'IsMissing': False,
                     'Recursive': True,
                     'StartIndex': index,
@@ -340,6 +342,7 @@ class Read_EmbyServer():
             'ParentId': parentid,
             'CollapseBoxSetItems': False,
             'IsVirtualUnaired': False,
+            'LocationTypes': "FileSystem,Remote,Offline",
             'IsMissing': False,
             'Recursive': True,
             'Ids': itemid
@@ -446,6 +449,7 @@ class Read_EmbyServer():
                     'ParentId': parent_id,
                     'Recursive': True,
                     'IsVirtualUnaired': False,
+                    'LocationTypes': "FileSystem,Remote,Offline",
                     'IsMissing': False,
                     'StartIndex': index,
                     'Limit': jump,

resources/lib/service_entry.py

@@ -7,6 +7,7 @@ import sys
 import time
 import _strptime # Workaround for threads using datetime: _striptime is locked
 from datetime import datetime
+import platform
 
 import xbmc
 
@@ -99,6 +100,8 @@ class Service(object):
         self.websocket_thread = wsc.WebSocketClient()
         self.library_thread = librarysync.LibrarySync()
 
+        # Verify database structure, otherwise create it.
+        self.library_thread._verify_emby_database()
 
         while not self.monitor.abortRequested():
 
@@ -164,6 +167,11 @@ class Service(object):
         
         ga = GoogleAnalytics()
         ga.sendEventData("Application", "Startup", serverId)
+        try:
+            ga.sendEventData("Version", "OS", platform.platform())
+            ga.sendEventData("Version", "Python", platform.python_version())
+        except Exception:
+            pass
 
         # Start up events
         self.warn_auth = True