3.0.5518.5

4 files changed, 27 insertions, 8 deletions

diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index 4f0f42f3e..106e3c76b 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -210,9 +210,8 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
                     _libraryMonitor.ReportFileSystemChangeBeginning(path);
 
-                    var renameRelatedFiles = false;
-                    //var renameRelatedFiles = !hasRenamedFiles && 
-                    //    string.Equals(Path.GetDirectoryName(path), Path.GetDirectoryName(result.TargetPath), StringComparison.OrdinalIgnoreCase);
+                    var renameRelatedFiles = !hasRenamedFiles &&
+                        string.Equals(Path.GetDirectoryName(path), Path.GetDirectoryName(result.TargetPath), StringComparison.OrdinalIgnoreCase);
 
                     if (renameRelatedFiles)
                     {
diff --git a/MediaBrowser.Server.Implementations/Sync/MediaSync.cs b/MediaBrowser.Server.Implementations/Sync/MediaSync.cs
index efdfbb086..099e45a6e 100644
--- a/MediaBrowser.Server.Implementations/Sync/MediaSync.cs
+++ b/MediaBrowser.Server.Implementations/Sync/MediaSync.cs
@@ -82,7 +82,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             IProgress<double> progress,
             CancellationToken cancellationToken)
         {
-            var jobItems =  _syncManager.GetReadySyncItems(target.Id);
+            var jobItems =  await _syncManager.GetReadySyncItems(target.Id).ConfigureAwait(false);
             
             var numComplete = 0;
             double startingPercent = 0;
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
index 139d752fa..72dc1bdb6 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -336,11 +336,12 @@ namespace MediaBrowser.Server.Implementations.Sync
             return new[] { item };
         }
 
-        public async Task EnsureSyncJobItems(CancellationToken cancellationToken)
+        private async Task EnsureSyncJobItems(string targetId, CancellationToken cancellationToken)
         {
             var jobResult = _syncRepo.GetJobs(new SyncJobQuery
             {
-                SyncNewContent = true
+                SyncNewContent = true,
+                TargetId = targetId
             });
 
             foreach (var job in jobResult.Items)
@@ -356,7 +357,7 @@ namespace MediaBrowser.Server.Implementations.Sync
 
         public async Task Sync(IProgress<double> progress, CancellationToken cancellationToken)
         {
-            await EnsureSyncJobItems(cancellationToken).ConfigureAwait(false);
+            await EnsureSyncJobItems(null, cancellationToken).ConfigureAwait(false);
 
             // If it already has a converting status then is must have been aborted during conversion
             var result = _syncRepo.GetJobItems(new SyncJobItemQuery
@@ -375,6 +376,21 @@ namespace MediaBrowser.Server.Implementations.Sync
             // Clean files in sync temp folder that are not linked to any sync jobs
         }
 
+        public async Task SyncJobItems(string targetId, bool enableConversion, IProgress<double> progress,
+            CancellationToken cancellationToken)
+        {
+            await EnsureSyncJobItems(targetId, cancellationToken).ConfigureAwait(false);
+
+            // If it already has a converting status then is must have been aborted during conversion
+            var result = _syncRepo.GetJobItems(new SyncJobItemQuery
+            {
+                Statuses = new List<SyncJobItemStatus> { SyncJobItemStatus.Queued, SyncJobItemStatus.Converting },
+                TargetId = targetId
+            });
+
+            await SyncJobItems(result.Items, true, progress, cancellationToken).ConfigureAwait(false);
+        }
+
         public async Task SyncJobItems(SyncJobItem[] items, bool enableConversion, IProgress<double> progress, CancellationToken cancellationToken)
         {
             if (items.Length > 0)
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index fc3d54150..a2fd92bf5 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -695,8 +695,12 @@ namespace MediaBrowser.Server.Implementations.Sync
             return _userDataManager.SaveUserData(new Guid(action.UserId), item, userData, UserDataSaveReason.Import, CancellationToken.None);
         }
 
-        public List<SyncedItem> GetReadySyncItems(string targetId)
+        public async Task<List<SyncedItem>> GetReadySyncItems(string targetId)
         {
+            var processor = GetSyncJobProcessor();
+
+            await processor.SyncJobItems(targetId, false, new Progress<double>(), CancellationToken.None).ConfigureAwait(false);
+
             var jobItemResult = GetJobItems(new SyncJobItemQuery
             {
                 TargetId = targetId,