From 7694f33c82d58e9976a1eac3e359c9490a9f3855 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 2 Oct 2015 02:14:04 -0400 Subject: fix sync status display --- .../Sync/SyncJobProcessor.cs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Sync') diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs index c9099dbe79..0507b032b4 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)) -- cgit v1.2.3