add movie resolver fix

dashboard-ui/apiclient/sync/contentuploader.js

@@ -2,11 +2,13 @@
 
     function contentUploader(connectionManager) {
 
+        var self = this;
+
         self.uploadImages = function (server) {
 
             var deferred = DeferredBuilder.Deferred();
 
-            var apiClient = self.getApiClient(server.Id);
+            var apiClient = connectionManager.getApiClient(server.Id);
 
             apiClient.getDevicesOptions().done(function (devicesOptions) {
 

dashboard-ui/apiclient/sync/mediasync.js

@@ -0,0 +1,23 @@
+(function (globalScope) {
+
+    function mediaSync() {
+
+        var self = this;
+
+        self.sync = function (apiClient) {
+
+            var deferred = DeferredBuilder.Deferred();
+
+            deferred.resolve();
+
+            return deferred.promise();
+        };
+    }
+
+    if (!globalScope.MediaBrowser) {
+        globalScope.MediaBrowser = {};
+    }
+
+    globalScope.MediaBrowser.MediaSync = mediaSync;
+
+})(this);

dashboard-ui/apiclient/sync/multiserversync.js

@@ -2,6 +2,8 @@
 
     function multiServerSync(connectionManager) {
 
+        var self = this;
+
         self.sync = function () {
 
             var deferred = DeferredBuilder.Deferred();
@@ -23,11 +25,6 @@
                 return;
             }
 
-            if (progress.isCancelled) {
-                deferred.reject();
-                return;
-            }
-
             var server = servers[index];
 
             // get fresh info from connection manager

dashboard-ui/apiclient/sync/offlineusersync.js

@@ -0,0 +1,23 @@
+(function (globalScope) {
+
+    function offlineUserSync() {
+
+        var self = this;
+
+        self.sync = function (apiClient) {
+
+            var deferred = DeferredBuilder.Deferred();
+
+            deferred.resolve();
+
+            return deferred.promise();
+        };
+    }
+
+    if (!globalScope.MediaBrowser) {
+        globalScope.MediaBrowser = {};
+    }
+
+    globalScope.MediaBrowser.OfflineUserSync = offlineUserSync;
+
+})(this);

dashboard-ui/apiclient/sync/serversync.js

@@ -2,6 +2,8 @@
 
     function serverSync(connectionManager) {
 
+        var self = this;
+
         self.sync = function (server) {
 
             var deferred = DeferredBuilder.Deferred();
@@ -45,11 +47,57 @@
 
                 new MediaBrowser.ContentUploader(connectionManager).uploadImages(server).done(function () {
 
+                    Logger.log("ContentUploaded succeeded to server: " + server.Id);
+
+                    syncOfflineUsers(server, deferred);
+
+                }).fail(function () {
+
+                    Logger.log("ContentUploaded failed to server: " + server.Id);
+
+                    syncOfflineUsers(server, deferred);
+                });
+            });
+        }
+
+        function syncOfflineUsers(server, deferred) {
+
+            require(['offlineusersync'], function () {
+
+                var apiClient = connectionManager.getApiClient(server.Id);
+
+                new MediaBrowser.OfflineUserSync().sync(apiClient).done(function () {
+
+                    Logger.log("OfflineUserSync succeeded to server: " + server.Id);
+
+                    syncMedia(server, deferred);
+
+                }).fail(function () {
+
+                    Logger.log("OfflineUserSync failed to server: " + server.Id);
+
+                    deferred.reject();
+                });
+            });
+        }
+
+        function syncMedia(server, deferred) {
+
+            require(['mediasync'], function () {
+
+                var apiClient = connectionManager.getApiClient(server.Id);
+
+                new MediaBrowser.MediaSync().sync(apiClient).done(function () {
+
+                    Logger.log("MediaSync succeeded to server: " + server.Id);
+
                     deferred.resolve();
 
                 }).fail(function () {
 
-                    deferred.resolve();
+                    Logger.log("MediaSync failed to server: " + server.Id);
+
+                    deferred.reject();
                 });
             });
         }