aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Sync
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-10-02 02:14:04 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-10-02 02:14:04 -0400
commit7694f33c82d58e9976a1eac3e359c9490a9f3855 (patch)
treeb86d94afb23d4d30601801780995ae2f386e526e /MediaBrowser.Server.Implementations/Sync
parent69888991f33a126d6ca413bbed04ecf3040e0b72 (diff)
fix sync status display
Diffstat (limited to 'MediaBrowser.Server.Implementations/Sync')
-rw-r--r--MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs16
1 files changed, 6 insertions, 10 deletions
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))