Merge pull request #956 from MediaBrowser/dev

3.0.5464.40000

3 files changed, 26 insertions, 16 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index e01b8857f..ed950b1c5 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -899,21 +899,6 @@ namespace MediaBrowser.Controller.Entities
         {
             var current = this;
 
-            var currentAsPlaceHolder = current as ISupportsPlaceHolders;
-
-            if (currentAsPlaceHolder != null)
-            {
-                var newHasPlaceHolder = newItem as ISupportsPlaceHolders;
-
-                if (newHasPlaceHolder != null)
-                {
-                    if (currentAsPlaceHolder.IsPlaceHolder != newHasPlaceHolder.IsPlaceHolder)
-                    {
-                        return false;
-                    }
-                }
-            }
-
             return current.IsInMixedFolder == newItem.IsInMixedFolder;
         }
 
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 6b098cbd8..0c6125dbe 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -363,7 +363,11 @@ namespace MediaBrowser.Controller.Entities
         {
             await base.UpdateToRepository(updateReason, cancellationToken).ConfigureAwait(false);
 
-            foreach (var item in GetLocalAlternateVersionIds().Select(i => LibraryManager.GetItemById(i)))
+            var localAlternates = GetLocalAlternateVersionIds()
+                .Select(i => LibraryManager.GetItemById(i))
+                .Where(i => i != null);
+
+            foreach (var item in localAlternates)
             {
                 item.ImageInfos = ImageInfos;
                 item.Overview = Overview;
diff --git a/MediaBrowser.Controller/Sync/ISyncManager.cs b/MediaBrowser.Controller/Sync/ISyncManager.cs
index 31c3c0c6d..47339f677 100644
--- a/MediaBrowser.Controller/Sync/ISyncManager.cs
+++ b/MediaBrowser.Controller/Sync/ISyncManager.cs
@@ -23,6 +23,13 @@ namespace MediaBrowser.Controller.Sync
         QueryResult<SyncJob> GetJobs(SyncJobQuery query);
 
         /// <summary>
+        /// Gets the job items.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <returns>QueryResult&lt;SyncJobItem&gt;.</returns>
+        QueryResult<SyncJobItem> GetJobItems(SyncJobItemQuery query);
+        
+        /// <summary>
         /// Gets the job.
         /// </summary>
         /// <param name="id">The identifier.</param>
@@ -59,5 +66,19 @@ namespace MediaBrowser.Controller.Sync
         /// <param name="targetId">The target identifier.</param>
         /// <returns>DeviceProfile.</returns>
         DeviceProfile GetDeviceProfile(string targetId);
+
+        /// <summary>
+        /// Reports the synchronize job item transferred.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>Task.</returns>
+        Task ReportSyncJobItemTransferred(string id);
+
+        /// <summary>
+        /// Gets the job item.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>SyncJobItem.</returns>
+        SyncJobItem GetJobItem(string id);
     }
 }