alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 09:04:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix sync status display

Browse Source
This commit is contained in:
Luke Pulverenti
2015-10-02 02:14:04 -04:00
parent 69888991f3
commit 7694f33c82
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Server.Implementations/News/NewsEntryPoint.cs
View File

@@ -79,7 +79,8 @@ namespace MediaBrowser.Server.Implementations.News
var requestOptions = new HttpRequestOptions
{
Url = "http://emby.media/community/index.php?/blog/rss/1-media-browser-developers-blog",
Progress = new Progress<double>()
Progress = new Progress<double>(),
UserAgent = "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.42 Safari/537.36"
};
using (var stream = await _httpClient.Get(requestOptions).ConfigureAwait(false))

16
MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
View File

@@ -178,9 +178,13 @@ namespace MediaBrowser.Server.Implementations.Sync
job.Progress = null;
}
if (jobItems.All(i => i.Status == SyncJobItemStatus.Queued))
if (jobItems.Any(i => i.Status == SyncJobItemStatus.Transferring))
{
job.Status = SyncJobStatus.Queued;
job.Status = SyncJobStatus.Transferring;
}
else if (jobItems.Any(i => i.Status == SyncJobItemStatus.Converting))
{
job.Status = SyncJobStatus.Converting;
}
else if (jobItems.All(i => i.Status == SyncJobItemStatus.Failed))
{
@@ -194,14 +198,6 @@ namespace MediaBrowser.Server.Implementations.Sync
{
job.Status = SyncJobStatus.ReadyToTransfer;
}
else if (jobItems.All(i => i.Status == SyncJobItemStatus.Transferring))
{
job.Status = SyncJobStatus.Transferring;
}
else if (jobItems.Any(i => i.Status == SyncJobItemStatus.Converting))
{
job.Status = SyncJobStatus.Converting;
}
else if (jobItems.All(i => i.Status == SyncJobItemStatus.Cancelled || i.Status == SyncJobItemStatus.Failed || i.Status == SyncJobItemStatus.Synced || i.Status == SyncJobItemStatus.RemovedFromDevice))
{
if (jobItems.Any(i => i.Status == SyncJobItemStatus.Failed))