aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Sync
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-03-21 12:53:52 -0400
committerLuke <luke.pulverenti@gmail.com>2016-03-21 12:53:52 -0400
commitb37500dca0f9932a474c2fa5b23368a88499c0d2 (patch)
tree495135f94cb95d156028e8646bb82b278d6a3ca1 /MediaBrowser.Server.Implementations/Sync
parent350024d92b2857435931acc8e5264a8e6b393078 (diff)
parent23fe6dc4be28c4d273bb22962ac769c749931090 (diff)
Merge pull request #1572 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Sync')
-rw-r--r--MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs4
-rw-r--r--MediaBrowser.Server.Implementations/Sync/SyncManager.cs11
2 files changed, 15 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
index 7086735c0..f553c8ea8 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -641,6 +641,8 @@ namespace MediaBrowser.Server.Implementations.Sync
ReadInputAtNativeFramerate = !syncOptions.EnableFullSpeedTranscoding
}, innerProgress, cancellationToken);
+
+ _syncManager.OnConversionComplete(jobItem, job);
}
catch (OperationCanceledException)
{
@@ -825,6 +827,8 @@ namespace MediaBrowser.Server.Implementations.Sync
CpuCoreLimit = syncOptions.TranscodingCpuCoreLimit
}, innerProgress, cancellationToken);
+
+ _syncManager.OnConversionComplete(jobItem, job);
}
catch (OperationCanceledException)
{
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index e22f86b11..fbbc6082a 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -1325,5 +1325,16 @@ namespace MediaBrowser.Server.Implementations.Sync
return list;
}
+
+ protected internal void OnConversionComplete(SyncJobItem item, SyncJob job)
+ {
+ var syncProvider = GetSyncProvider(item, job);
+ if (syncProvider is AppSyncProvider)
+ {
+ return;
+ }
+
+ _taskManager.QueueIfNotRunning<ServerSyncScheduledTask>();
+ }
}
}