Merge pull request #1222 from MediaBrowser/dev

3.0.5768.7

1 files changed, 15 insertions, 49 deletions

diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index 18fcb4e79..c715c3f50 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -32,6 +32,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using CommonIO;
 
 namespace MediaBrowser.Server.Implementations.Sync
 {
@@ -516,60 +517,25 @@ namespace MediaBrowser.Server.Implementations.Sync
                     return false;
                 }
 
-                if (!item.RunTimeTicks.HasValue)
-                {
-                    return false;
-                }
-
                 var video = item as Video;
                 if (video != null)
                 {
-                    if (video.VideoType == VideoType.Iso || video.VideoType == VideoType.HdDvd)
-                    {
-                        return false;
-                    }
-
                     if (video.IsPlaceHolder)
                     {
                         return false;
                     }
 
-                    if (video.IsArchive)
-                    {
-                        return false;
-                    }
-
-                    if (video.IsStacked)
-                    {
-                        return false;
-                    }
-
                     if (video.IsShortcut)
                     {
                         return false;
                     }
                 }
 
-                var game = item as Game;
-                if (game != null)
-                {
-                    if (game.IsMultiPart)
-                    {
-                        return false;
-                    }
-                }
-
                 if (item is LiveTvChannel || item is IChannelItem)
                 {
                     return false;
                 }
 
-                // It would be nice to support these later
-                if (item is Game || item is Book)
-                {
-                    return false;
-                }
-
                 return true;
             }
 
@@ -784,27 +750,27 @@ namespace MediaBrowser.Server.Implementations.Sync
                     if (jobItem.IsMarkedForRemoval)
                     {
                         // Tell the device to remove it since it has been marked for removal
-                        _logger.Debug("Adding ItemIdsToRemove {0} because IsMarkedForRemoval is set.", jobItem.ItemId);
+                        _logger.Info("Adding ItemIdsToRemove {0} because IsMarkedForRemoval is set.", jobItem.ItemId);
                         removeFromDevice = true;
                     }
                     else if (user == null)
                     {
                         // Tell the device to remove it since the user is gone now
-                        _logger.Debug("Adding ItemIdsToRemove {0} because the user is no longer valid.", jobItem.ItemId);
+                        _logger.Info("Adding ItemIdsToRemove {0} because the user is no longer valid.", jobItem.ItemId);
                         removeFromDevice = true;
                     }
                     else if (!IsLibraryItemAvailable(libraryItem))
                     {
                         // Tell the device to remove it since it's no longer available
-                        _logger.Debug("Adding ItemIdsToRemove {0} because it is no longer available.", jobItem.ItemId);
+                        _logger.Info("Adding ItemIdsToRemove {0} because it is no longer available.", jobItem.ItemId);
                         removeFromDevice = true;
                     }
                     else if (job.UnwatchedOnly)
                     {
-                        if (libraryItem.IsPlayed(user) && libraryItem is Video)
+                        if (libraryItem is Video && libraryItem.IsPlayed(user))
                         {
                             // Tell the device to remove it since it has been played
-                            _logger.Debug("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.ItemId);
+                            _logger.Info("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.ItemId);
                             removeFromDevice = true;
                         }
                     }
@@ -818,8 +784,9 @@ namespace MediaBrowser.Server.Implementations.Sync
                     }
                     else
                     {
-                        _logger.Debug("Setting status to Queued for {0} because it is no longer on the device.", jobItem.ItemId);
+                        _logger.Info("Setting status to Queued for {0} because it is no longer on the device.", jobItem.ItemId);
                         jobItem.Status = SyncJobItemStatus.Queued;
+                        jobItem.Progress = 0;
                     }
                     requiresSaving = true;
                 }
@@ -889,27 +856,27 @@ namespace MediaBrowser.Server.Implementations.Sync
                     if (jobItem.IsMarkedForRemoval)
                     {
                         // Tell the device to remove it since it has been marked for removal
-                        _logger.Debug("Adding ItemIdsToRemove {0} because IsMarkedForRemoval is set.", jobItem.Id);
+                        _logger.Info("Adding ItemIdsToRemove {0} because IsMarkedForRemoval is set.", jobItem.Id);
                         removeFromDevice = true;
                     }
                     else if (user == null)
                     {
                         // Tell the device to remove it since the user is gone now
-                        _logger.Debug("Adding ItemIdsToRemove {0} because the user is no longer valid.", jobItem.Id);
+                        _logger.Info("Adding ItemIdsToRemove {0} because the user is no longer valid.", jobItem.Id);
                         removeFromDevice = true;
                     }
                     else if (!IsLibraryItemAvailable(libraryItem))
                     {
                         // Tell the device to remove it since it's no longer available
-                        _logger.Debug("Adding ItemIdsToRemove {0} because it is no longer available.", jobItem.Id);
+                        _logger.Info("Adding ItemIdsToRemove {0} because it is no longer available.", jobItem.Id);
                         removeFromDevice = true;
                     }
                     else if (job.UnwatchedOnly)
                     {
-                        if (libraryItem.IsPlayed(user) && libraryItem is Video)
+                        if (libraryItem is Video && libraryItem.IsPlayed(user))
                         {
                             // Tell the device to remove it since it has been played
-                            _logger.Debug("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.Id);
+                            _logger.Info("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.Id);
                             removeFromDevice = true;
                         }
                     }
@@ -923,8 +890,9 @@ namespace MediaBrowser.Server.Implementations.Sync
                     }
                     else
                     {
-                        _logger.Debug("Setting status to Queued for {0} because it is no longer on the device.", jobItem.Id);
+                        _logger.Info("Setting status to Queued for {0} because it is no longer on the device.", jobItem.Id);
                         jobItem.Status = SyncJobItemStatus.Queued;
+                        jobItem.Progress = 0;
                     }
                     requiresSaving = true;
                 }
@@ -997,8 +965,6 @@ namespace MediaBrowser.Server.Implementations.Sync
                 return false;
             }
 
-            // TODO: Make sure it hasn't been deleted
-
             return true;
         }