alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-15 22:56:18 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

3.0.5588.1

Browse Source
This commit is contained in:
Luke Pulverenti
2015-04-22 09:28:45 -04:00
parent 4a6bd9eb75
commit b82081e4b2
7 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
MediaBrowser.Server.Implementations/Sync/SyncManager.cs
View File

@@ -512,7 +512,7 @@ namespace MediaBrowser.Server.Implementations.Sync
var video = item as Video;
if (video != null)
{
if (video.VideoType == VideoType.Iso || video.VideoType == VideoType.BluRay || video.VideoType == VideoType.Dvd || video.VideoType == VideoType.HdDvd)
if (video.VideoType == VideoType.Iso || video.VideoType == VideoType.HdDvd)
{
return false;
}
@@ -758,6 +758,8 @@ namespace MediaBrowser.Server.Implementations.Sync
var requiresSaving = false;
var removeFromDevice = false;
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId);
if (request.LocalItemIds.Contains(jobItem.ItemId, StringComparer.OrdinalIgnoreCase))
{
var job = _repo.GetJob(jobItem.JobId);
@@ -775,23 +777,18 @@ namespace MediaBrowser.Server.Implementations.Sync
_logger.Debug("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);
removeFromDevice = true;
}
else if (job.UnwatchedOnly)
{
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId);
if (IsLibraryItemAvailable(libraryItem))
if (libraryItem.IsPlayed(user) && libraryItem is Video)
{
if (libraryItem.IsPlayed(user) && libraryItem is Video)
{
// Tell the device to remove it since it has been played
_logger.Debug("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.ItemId);
removeFromDevice = true;
}
}
else
{
// 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);
// Tell the device to remove it since it has been played
_logger.Debug("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.ItemId);
removeFromDevice = true;
}
}
@@ -866,6 +863,8 @@ namespace MediaBrowser.Server.Implementations.Sync
var requiresSaving = false;
var removeFromDevice = false;
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId);
if (request.SyncJobItemIds.Contains(jobItem.Id, StringComparer.OrdinalIgnoreCase))
{
var job = _repo.GetJob(jobItem.JobId);
@@ -883,23 +882,18 @@ namespace MediaBrowser.Server.Implementations.Sync
_logger.Debug("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);
removeFromDevice = true;
}
else if (job.UnwatchedOnly)
{
var libraryItem = _libraryManager.GetItemById(jobItem.ItemId);
if (IsLibraryItemAvailable(libraryItem))
if (libraryItem.IsPlayed(user) && libraryItem is Video)
{
if (libraryItem.IsPlayed(user) && libraryItem is Video)
{
// Tell the device to remove it since it has been played
_logger.Debug("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.Id);
removeFromDevice = true;
}
}
else
{
// 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);
// Tell the device to remove it since it has been played
_logger.Debug("Adding ItemIdsToRemove {0} because it has been marked played.", jobItem.Id);
removeFromDevice = true;
}
}