From 2b9e352d7204ab88fa523c1e1eacc616ceb3f9e0 Mon Sep 17 00:00:00 2001
From: shaun <shaun@bluebit.com.au>
Date: Sun, 6 Sep 2015 15:44:23 +1000
Subject: [PATCH] user server time, add max items setting

---
 addon.xml                    |  2 +-
 resources/lib/LibrarySync.py | 23 +++++++++++++++++++----
 resources/settings.xml       |  1 +
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/addon.xml b/addon.xml
index b9aa92e9..cd0619f6 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.emby" 
         name="Emby" 
-        version="1.1.36"
+        version="1.1.37"
         provider-name="Emby.media">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
diff --git a/resources/lib/LibrarySync.py b/resources/lib/LibrarySync.py
index 2131a2a7..b85a9c69 100644
--- a/resources/lib/LibrarySync.py
+++ b/resources/lib/LibrarySync.py
@@ -98,8 +98,9 @@ class LibrarySync(threading.Thread):
                 utils.logMsg("Sync Database", "Incremental Sync Get Changes Failed", 0)
                 pass
             else:
+                maxItems = int(utils.settings("incSyncMaxItems"))
                 utils.logMsg("Sync Database", "Incremental Sync Changes : " + str(results), 0)
-                if(len(changedItems) < 1000 and len(removedItems) < 1000 and len(userChanges) < 1000):
+                if(len(changedItems) < maxItems and len(removedItems) < maxItems and len(userChanges) < maxItems):
                 
                     WINDOW.setProperty("startup", "done")
                     
@@ -111,7 +112,7 @@ class LibrarySync(threading.Thread):
                     
                     return True
                 else:
-                    utils.logMsg("Sync Database", "Too Many For Incremental Sync, changedItems" + str(len(changedItems)) + " removedItems:" + str(len(removedItems)) + " userChanges:" + str(len(userChanges)), 0)
+                    utils.logMsg("Sync Database", "Too Many For Incremental Sync (" + str(maxItems) + "), changedItems" + str(len(changedItems)) + " removedItems:" + str(len(removedItems)) + " userChanges:" + str(len(userChanges)), 0)
         
         #set some variable to check if this is the first run
         WINDOW.setProperty("SyncDatabaseRunning", "true")     
@@ -203,8 +204,22 @@ class LibrarySync(threading.Thread):
         
     def SaveLastSync(self):
         # save last sync time
-        lastSync = (datetime.utcnow() - timedelta(minutes=5)).strftime('%Y-%m-%dT%H:%M:%SZ')
-        self.logMsg("Sync Database, Incremental Sync Setting Last Run Time Saved: %s" % lastSync, 1)
+
+        du = DownloadUtils()    
+        url = "{server}/Emby.Kodi.SyncQueue/GetServerDateTime?format=json"
+            
+        try:
+            results = du.downloadUrl(url)
+            lastSync = results["ServerDateTime"]
+            self.logMsg("Sync Database, Incremental Sync Using Server Time: %s" % lastSync, 0)
+            lastSync = datetime.strptime(lastSync, "%Y-%m-%dT%H:%M:%SZ")
+            lastSync = (lastSync - timedelta(minutes=5)).strftime('%Y-%m-%dT%H:%M:%SZ')
+            self.logMsg("Sync Database, Incremental Sync Using Server Time -5 min: %s" % lastSync, 0)
+        except:
+            lastSync = (datetime.utcnow() - timedelta(minutes=5)).strftime('%Y-%m-%dT%H:%M:%SZ')
+            self.logMsg("Sync Database, Incremental Sync Using Client Time -5 min: %s" % lastSync, 0)
+            
+        self.logMsg("Sync Database, Incremental Sync Setting Last Run Time Saved: %s" % lastSync, 0)
         utils.settings("LastIncrenetalSync", lastSync)
 
     def MoviesFullSync(self,connection, cursor, pDialog):
diff --git a/resources/settings.xml b/resources/settings.xml
index 3ca97d9c..fa972af2 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -28,6 +28,7 @@
 		<setting id="useDirectPaths" type="bool" label="30250" default="false" visible="true" enable="true" />
 		<setting id="enableTextureCache" type="bool" label="Auto add images to the Kodi texture cache" default="true" visible="true" enable="true" />
 		<setting id="useIncSync" type="bool" label="Use incremental sync at startup (Requires Server Plugin)" default="false" visible="true" enable="true" />
+		<setting id="incSyncMaxItems" type="number" label=" - Max change set size" default="1000" visible="eq(-1,true)" enable="true" />
 	</category>
 	<category label="Playback"> <!-- Extra Sync options -->
 		<setting id="smbusername" type="text" label="30007" default="" visible="true" enable="true" />