mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fix windows restart

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-21 21:05:33 -04:00
parent 4ef47844d8
commit 257a7d2879
18 changed files with 221 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

21
dashboard-ui/apiclient/sync/serversync.js
View file

@ -4,7 +4,7 @@
var self = this;
self.sync = function (server) {
self.sync = function (server, options) {
var deferred = DeferredBuilder.Deferred();
@ -24,7 +24,7 @@
connectionManager.connectToServer(server, connectionOptions).done(function (result) {
if (result.State == MediaBrowser.ConnectionState.SignedIn) {
performSync(server, deferred);
performSync(server, options, deferred);
} else {
Logger.log('Unable to connect to server id: ' + server.Id);
deferred.reject();
@ -39,23 +39,34 @@
return deferred.promise();
};
function performSync(server, deferred) {
function performSync(server, options, deferred) {
Logger.log("Creating ContentUploader to server: " + server.Id);
var nextAction = function () {
syncOfflineUsers(server, deferred);
};
options = options || {};
if (options.uploadPhotos === false) {
nextAction();
return;
}
require(['contentuploader'], function () {
new MediaBrowser.ContentUploader(connectionManager).uploadImages(server).done(function () {
Logger.log("ContentUploaded succeeded to server: " + server.Id);
syncOfflineUsers(server, deferred);
nextAction();
}).fail(function () {
Logger.log("ContentUploaded failed to server: " + server.Id);
syncOfflineUsers(server, deferred);
nextAction();
});
});
}