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 now playing screen

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-20 12:52:37 -05:00
parent 668418e69b
commit 4589e01159
22 changed files with 245 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View file

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.1.118",
"_release": "1.1.118",
"version": "1.1.119",
"_release": "1.1.119",
"_resolution": {
"type": "version",
"tag": "1.1.118",
"commit": "e43c750bd0a2cdb109e4b12ae561960118381e51"
"tag": "1.1.119",
"commit": "d3d62a7f416a3b980bf98000830d2ee6203a1658"
},
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51",

13
dashboard-ui/bower_components/emby-apiclient/apiclient.js vendored
View file

@ -2123,6 +2123,19 @@
return self.getJSON(url);
};
self.getItemDownloadUrl = function (itemId) {
if (!itemId) {
throw new Error("itemId cannot be empty");
}
var url = "Items/" + itemId + "/Download";
return self.getUrl(url, {
api_key: self.accessToken()
});
};
self.getSessions = function (options) {
var url = self.getUrl("Sessions", options);

2
dashboard-ui/bower_components/emby-apiclient/connectionmanager.js vendored
View file

@ -216,7 +216,7 @@
return connectUser;
};
var minServerVersion = '3.0.8000';
var minServerVersion = '3.0.8500';
self.minServerVersion = function (val) {
if (val) {

15
dashboard-ui/bower_components/emby-apiclient/localassetmanager.js vendored
View file

@ -203,7 +203,14 @@
}
function addOrUpdateLocalItem(localItem) {
return itemrepository.set(localItem.Id, localItem);
console.log('addOrUpdateLocalItem Start');
return itemrepository.set(localItem.Id, localItem).then(function (res) {
console.log('addOrUpdateLocalItem Success');
return Promise.resolve(true);
}, function (error) {
console.log('addOrUpdateLocalItem Error');
return Promise.resolve(false);
});
}
function createLocalItem(libraryItem, serverInfo, jobItem) {
@ -342,6 +349,11 @@
return transfermanager.isDownloadFileInQueue(path);
}
function getDownloadItemCount() {
return transfermanager.getDownloadItemCount();
}
function translateFilePath(path) {
return Promise.resolve(path);
}
@ -471,6 +483,7 @@
getServerItems: getServerItems,
getItemFileSize: getItemFileSize,
isDownloadFileInQueue: isDownloadFileInQueue,
getDownloadItemCount: getDownloadItemCount,
getViews: getViews,
getViewItems: getViewItems,
resyncTransfers: resyncTransfers

2
dashboard-ui/bower_components/emby-apiclient/sync/itemrepository.js vendored
View file

@ -90,7 +90,7 @@
function clear() {
return dbPromise.then(function (db) {
var tx = db.transaction(dbName, 'readwrite');
tx.objectStore(dbName).clear(key);
tx.objectStore(dbName).clear();
return tx.complete;
});
}

50
dashboard-ui/bower_components/emby-apiclient/sync/mediasync.js vendored
View file

@ -178,7 +178,7 @@
});
}
function getNewMedia(apiClient, serverInfo, options) {
function getNewMedia(apiClient, serverInfo, options, downloadCount) {
console.log('[mediasync] Begin getNewMedia');
@ -186,10 +186,15 @@
var p = Promise.resolve();
var maxDownloads = 10;
var currentCount = downloadCount;
jobItems.forEach(function (jobItem) {
p = p.then(function () {
return getNewItem(jobItem, apiClient, serverInfo, options);
});
if (currentCount++ <= maxDownloads) {
p = p.then(function () {
return getNewItem(jobItem, apiClient, serverInfo, options);
});
}
});
return p.then(function () {
@ -344,6 +349,7 @@
return localassetmanager.addOrUpdateLocalItem(localItem);
}, function (err) {
console.log('[mediasync] Error getImages: ' + err.toString());
return Promise.resolve();
});
}
@ -368,9 +374,15 @@
console.log('[mediasync] downloadImage ' + itemId + ' ' + imageType + '_' + index.toString());
return localassetmanager.downloadImage(localItem, imageUrl, serverId, itemId, imageType, index);
return localassetmanager.downloadImage(localItem, imageUrl, serverId, itemId, imageType, index).then(function (result) {
return Promise.resolve();
}, function (err) {
console.log('[mediasync] Error downloadImage: ' + err.toString());
return Promise.resolve();
});
}, function (err) {
console.log('[mediasync] Error downloadImage: ' + err.toString());
return Promise.resolve();
});
}
@ -450,26 +462,28 @@
return processDownloadStatus(apiClient, serverInfo, options).then(function () {
if (options.syncCheckProgressOnly === true) {
return Promise.resolve();
}
return localassetmanager.getDownloadItemCount().then(function (downloadCount) {
return reportOfflineActions(apiClient, serverInfo).then(function () {
if (options.syncCheckProgressOnly === true && downloadCount > 2) {
return Promise.resolve();
}
//// Do the first data sync
//return syncData(apiClient, serverInfo, false).then(function () {
return reportOfflineActions(apiClient, serverInfo).then(function () {
// Download new content
return getNewMedia(apiClient, serverInfo, options).then(function () {
// Download new content
return getNewMedia(apiClient, serverInfo, options, downloadCount).then(function () {
// Do the second data sync
return syncData(apiClient, serverInfo, false).then(function () {
console.log('[mediasync]************************************* Exit sync');
return Promise.resolve();
// Do the second data sync
return syncData(apiClient, serverInfo, false).then(function () {
console.log('[mediasync]************************************* Exit sync');
return Promise.resolve();
});
});
//});
});
//});
});
}, function (err) {
console.error(err.toString());
});
};
};