diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-10-02 02:14:04 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-10-02 02:14:04 -0400 |
| commit | 7694f33c82d58e9976a1eac3e359c9490a9f3855 (patch) | |
| tree | b86d94afb23d4d30601801780995ae2f386e526e /MediaBrowser.Server.Implementations | |
| parent | 69888991f33a126d6ca413bbed04ecf3040e0b72 (diff) | |
fix sync status display
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/News/NewsEntryPoint.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs | 16 |
2 files changed, 8 insertions, 11 deletions
diff --git a/MediaBrowser.Server.Implementations/News/NewsEntryPoint.cs b/MediaBrowser.Server.Implementations/News/NewsEntryPoint.cs index 0266756c3..65698ec99 100644 --- a/MediaBrowser.Server.Implementations/News/NewsEntryPoint.cs +++ b/MediaBrowser.Server.Implementations/News/NewsEntryPoint.cs @@ -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)) diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs index c9099dbe7..0507b032b 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs @@ -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)) |