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

update promises

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-29 17:39:13 -05:00
parent 3e1fd2ec8a
commit cc53792556
2 changed files with 264 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

180
dashboard-ui/apiclient/connectionmanager.js
View file

@ -400,10 +400,10 @@
function ensureConnectUser(credentials) { function ensureConnectUser(credentials) {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
if (connectUser && connectUser.Id == credentials.ConnectUserId) { if (connectUser && connectUser.Id == credentials.ConnectUserId) {
deferred.resolveWith(null, [[]]); resolve();
} }
else if (credentials.ConnectUserId && credentials.ConnectAccessToken) { else if (credentials.ConnectUserId && credentials.ConnectAccessToken) {
@ -413,17 +413,16 @@
getConnectUser(credentials.ConnectUserId, credentials.ConnectAccessToken).then(function (user) { getConnectUser(credentials.ConnectUserId, credentials.ConnectAccessToken).then(function (user) {
onConnectUserSignIn(user); onConnectUserSignIn(user);
deferred.resolveWith(null, [[]]); resolve();
}, function () { }, function () {
deferred.resolveWith(null, [[]]); resolve();
}); });
} else { } else {
deferred.resolveWith(null, [[]]); resolve();
} }
});
return deferred.promise();
} }
function getConnectUser(userId, accessToken) { function getConnectUser(userId, accessToken) {
@ -487,7 +486,7 @@
function validateAuthentication(server, connectionMode) { function validateAuthentication(server, connectionMode) {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
var url = MediaBrowser.ServerInfo.getServerAddress(server, connectionMode); var url = MediaBrowser.ServerInfo.getServerAddress(server, connectionMode);
@ -518,13 +517,13 @@
}).then(function (user) { }).then(function (user) {
onLocalUserSignIn(user); onLocalUserSignIn(user);
deferred.resolveWith(null, [[]]); resolve();
}, function () { }, function () {
server.UserId = null; server.UserId = null;
server.AccessToken = null; server.AccessToken = null;
deferred.resolveWith(null, [[]]); resolve();
}); });
} }
@ -532,11 +531,9 @@
server.UserId = null; server.UserId = null;
server.AccessToken = null; server.AccessToken = null;
deferred.resolveWith(null, [[]]); resolve();
});
}); });
return deferred.promise();
} }
function getImageUrl(localUser) { function getImageUrl(localUser) {
@ -569,7 +566,7 @@
self.user = function (apiClient) { self.user = function (apiClient) {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
var localUser; var localUser;
@ -577,14 +574,13 @@
var image = getImageUrl(localUser); var image = getImageUrl(localUser);
deferred.resolveWith(null, [ resolve({
{
localUser: localUser, localUser: localUser,
name: connectUser ? connectUser.Name : (localUser ? localUser.Name : null), name: connectUser ? connectUser.Name : (localUser ? localUser.Name : null),
canManageServer: localUser ? localUser.Policy.IsAdministrator : false, canManageServer: localUser ? localUser.Policy.IsAdministrator : false,
imageUrl: image.url, imageUrl: image.url,
supportsImageParams: image.supportsParams supportsImageParams: image.supportsParams
}]); });
} }
function onEnsureConnectUserDone() { function onEnsureConnectUserDone() {
@ -607,8 +603,7 @@
} else { } else {
onEnsureConnectUserDone(); onEnsureConnectUserDone();
} }
});
return deferred.promise();
}; };
self.isLoggedIntoConnect = function () { self.isLoggedIntoConnect = function () {
@ -634,7 +629,7 @@
} }
} }
return DeferredBuilder.when(promises).then(function () { return Promise.all(promises).then(function () {
var credentials = credentialProvider.credentials(); var credentials = credentialProvider.credentials();
@ -692,11 +687,11 @@
logger.log('Begin getConnectServers'); logger.log('Begin getConnectServers');
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
if (!credentials.ConnectAccessToken || !credentials.ConnectUserId) { if (!credentials.ConnectAccessToken || !credentials.ConnectUserId) {
deferred.resolveWith(null, [[]]); resolve([]);
return deferred.promise(); return;
} }
var url = "https://connect.emby.media/service/servers?userId=" + credentials.ConnectUserId; var url = "https://connect.emby.media/service/servers?userId=" + credentials.ConnectUserId;
@ -724,14 +719,13 @@
}; };
}); });
deferred.resolveWith(null, [servers]); resolve(servers);
}, function () { }, function () {
deferred.resolveWith(null, [[]]); resolve([]);
}); });
});
return deferred.promise();
} }
self.getSavedServers = function () { self.getSavedServers = function () {
@ -754,14 +748,10 @@
// Clone the array // Clone the array
var credentials = credentialProvider.credentials(); var credentials = credentialProvider.credentials();
var deferred = DeferredBuilder.Deferred(); return Promise.all([getConnectServers(credentials), findServers()]).then(function (responses) {
var connectServersPromise = getConnectServers(credentials); var connectServers = responses[0];
var findServersPromise = findServers(); var foundServers = responses[1];
connectServersPromise.then(function (connectServers) {
findServersPromise.then(function (foundServers) {
var servers = credentials.Servers.slice(0); var servers = credentials.Servers.slice(0);
mergeServers(servers, foundServers); mergeServers(servers, foundServers);
@ -777,11 +767,8 @@
credentialProvider.credentials(credentials); credentialProvider.credentials(credentials);
deferred.resolveWith(null, [servers]); return servers;
}); });
});
return deferred.promise();
}; };
function filterServers(servers, connectServers) { function filterServers(servers, connectServers) {
@ -803,7 +790,7 @@
function findServers() { function findServers() {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
require(['serverdiscovery'], function () { require(['serverdiscovery'], function () {
ServerDiscovery.findServers(1000).then(function (foundServers) { ServerDiscovery.findServers(1000).then(function (foundServers) {
@ -822,11 +809,11 @@
return info; return info;
}); });
deferred.resolveWith(null, [servers]); resolve(servers);
}); });
}); });
return deferred.promise(); });
} }
function convertEndpointAddressToManualAddress(info) { function convertEndpointAddressToManualAddress(info) {
@ -854,18 +841,16 @@
logger.log('Begin connect'); logger.log('Begin connect');
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
self.getAvailableServers().then(function (servers) { self.getAvailableServers().then(function (servers) {
self.connectToServers(servers).then(function (result) { self.connectToServers(servers).then(function (result) {
deferred.resolveWith(null, [result]); resolve(result);
});
}); });
}); });
return deferred.promise();
}; };
self.getOffineResult = function () { self.getOffineResult = function () {
@ -1160,15 +1145,15 @@
self.loginToConnect = function (username, password) { self.loginToConnect = function (username, password) {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
if (!username) { if (!username) {
deferred.reject(); reject();
return deferred.promise(); return;
} }
if (!password) { if (!password) {
deferred.reject(); reject();
return deferred.promise(); return;
} }
require(['connectservice'], function () { require(['connectservice'], function () {
@ -1199,39 +1184,36 @@
onConnectUserSignIn(result.User); onConnectUserSignIn(result.User);
deferred.resolveWith(null, [result]); resolve(result);
}, function () { }, reject);
deferred.reject();
}); });
}); });
return deferred.promise();
}; };
self.signupForConnect = function (email, username, password, passwordConfirm) { self.signupForConnect = function (email, username, password, passwordConfirm) {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
if (!email) { if (!email) {
deferred.rejectWith(null, [{ errorCode: 'invalidinput' }]); reject({ errorCode: 'invalidinput' });
return deferred.promise(); return;
} }
if (!username) { if (!username) {
deferred.rejectWith(null, [{ errorCode: 'invalidinput' }]); reject({ errorCode: 'invalidinput' });
return deferred.promise(); return;
} }
if (!password) { if (!password) {
deferred.rejectWith(null, [{ errorCode: 'invalidinput' }]); reject({ errorCode: 'invalidinput' });
return deferred.promise(); return;
} }
if (!passwordConfirm) { if (!passwordConfirm) {
deferred.rejectWith(null, [{ errorCode: 'passwordmatch' }]); reject({ errorCode: 'passwordmatch' });
return deferred.promise(); return;
} }
if (password != passwordConfirm) { if (password != passwordConfirm) {
deferred.rejectWith(null, [{ errorCode: 'passwordmatch' }]); reject({ errorCode: 'passwordmatch' });
return deferred.promise(); return;
} }
require(['connectservice'], function () { require(['connectservice'], function () {
@ -1253,24 +1235,19 @@
"X-CONNECT-TOKEN": "CONNECT-REGISTER" "X-CONNECT-TOKEN": "CONNECT-REGISTER"
} }
}).then(function (result) { }).then(resolve, function (e) {
deferred.resolve(null, []);
}, function (e) {
try { try {
var result = JSON.parse(e.responseText); var result = JSON.parse(e.responseText);
deferred.rejectWith(null, [{ errorCode: result.Status }]); reject({ errorCode: result.Status });
} catch (err) { } catch (err) {
deferred.rejectWith(null, [{}]); reject({});
} }
}); });
}); });
});
return deferred.promise();
}; };
self.getConnectPasswordHash = function (password) { self.getConnectPasswordHash = function (password) {
@ -1333,7 +1310,7 @@
}); });
server = server.length ? server[0] : null; server = server.length ? server[0] : null;
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
function onDone() { function onDone() {
var credentials = credentialProvider.credentials(); var credentials = credentialProvider.credentials();
@ -1343,12 +1320,12 @@
}); });
credentialProvider.credentials(credentials); credentialProvider.credentials(credentials);
deferred.resolve(); resolve();
} }
if (!server.ConnectServerId) { if (!server.ConnectServerId) {
onDone(); onDone();
return deferred.promise(); return;
} }
var connectToken = self.connectToken(); var connectToken = self.connectToken();
@ -1356,7 +1333,7 @@
if (!connectToken || !connectUserId) { if (!connectToken || !connectUserId) {
onDone(); onDone();
return deferred.promise(); return;
} }
var url = "https://connect.emby.media/service/serverAuthorizations?serverId=" + server.ConnectServerId + "&userId=" + connectUserId; var url = "https://connect.emby.media/service/serverAuthorizations?serverId=" + server.ConnectServerId + "&userId=" + connectUserId;
@ -1370,8 +1347,7 @@
} }
}).then(onDone, onDone); }).then(onDone, onDone);
});
return deferred.promise();
}; };
self.rejectServer = function (serverId) { self.rejectServer = function (serverId) {
@ -1428,49 +1404,36 @@
self.getRegistrationInfo = function (feature, apiClient) { self.getRegistrationInfo = function (feature, apiClient) {
var deferred = DeferredBuilder.Deferred(); return self.getAvailableServers().then(function (servers) {
self.getAvailableServers().then(function (servers) {
var matchedServers = servers.filter(function (s) { var matchedServers = servers.filter(function (s) {
return stringEqualsIgnoreCase(s.Id, apiClient.serverInfo().Id); return stringEqualsIgnoreCase(s.Id, apiClient.serverInfo().Id);
}); });
if (!matchedServers.length) { if (!matchedServers.length) {
deferred.resolveWith(null, [{}]); return {};
return;
} }
var match = matchedServers[0]; var match = matchedServers[0];
if (!match.DateLastLocalConnection) { if (!match.DateLastLocalConnection) {
ApiClient.getJSON(ApiClient.getUrl('System/Endpoint')).then(function (info) { return ApiClient.getJSON(ApiClient.getUrl('System/Endpoint')).then(function (info) {
if (info.IsInNetwork) { if (info.IsInNetwork) {
updateDateLastLocalConnection(match.Id); updateDateLastLocalConnection(match.Id);
onLocalCheckSuccess(feature, apiClient, deferred); return apiClient.getRegistrationInfo(feature);
} else { } else {
deferred.resolveWith(null, [{}]); return {};
} }
}, function () {
deferred.resolveWith(null, [{}]);
}); });
return; } else {
return apiClient.getRegistrationInfo(feature);
} }
onLocalCheckSuccess(feature, apiClient, deferred);
}, function () {
deferred.reject();
}); });
return deferred.promise();
}; };
function updateDateLastLocalConnection(serverId) { function updateDateLastLocalConnection(serverId) {
@ -1489,17 +1452,6 @@
} }
} }
function onLocalCheckSuccess(feature, apiClient, deferred) {
apiClient.getRegistrationInfo(feature).then(function (result) {
deferred.resolveWith(null, [result]);
}, function () {
deferred.reject();
});
}
return self; return self;
}; };

1
dashboard-ui/scripts/mediaplayer.js
View file

@ -1076,7 +1076,6 @@
Dashboard.showModalLoadingMsg(); Dashboard.showModalLoadingMsg();
ApiClient.detectBitrate().then(function (bitrate) { ApiClient.detectBitrate().then(function (bitrate) {
Logger.log('Max bitrate auto detected to ' + bitrate); Logger.log('Max bitrate auto detected to ' + bitrate);
self.lastBitrateDetections[bitrateDetectionKey] = new Date().getTime(); self.lastBitrateDetections[bitrateDetectionKey] = new Date().getTime();
AppSettings.maxStreamingBitrate(bitrate); AppSettings.maxStreamingBitrate(bitrate);