open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add multiselect help text

Browse Source
pull/702/head
Luke Pulverenti 9 years ago
parent ffe8af4c37
commit 04cc4eaf68
4 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File

14
MediaBrowser.Dlna/Didl/DidlBuilder.cs
Unescape View File

@ -996,6 +996,10 @@ namespace MediaBrowser.Dlna.Didl
//} //}
var inputFormat = (Path.GetExtension(imageInfo.Path) ?? string.Empty)
.TrimStart('.')
.Replace("jpeg", "jpg", StringComparison.OrdinalIgnoreCase);
return new ImageDownloadInfo return new ImageDownloadInfo
{ {
ItemId = item.Id.ToString("N"), ItemId = item.Id.ToString("N"),
@ -1003,7 +1007,7 @@ namespace MediaBrowser.Dlna.Didl
ImageTag = tag, ImageTag = tag,
Width = width, Width = width,
Height = height, Height = height,
File = imageInfo.Path, Format = inputFormat,
ItemImageInfo = imageInfo ItemImageInfo = imageInfo
}; };
} }
@ -1019,7 +1023,7 @@ namespace MediaBrowser.Dlna.Didl
internal bool IsDirectStream; internal bool IsDirectStream;
internal string File; internal string Format;
internal ItemImageInfo ItemImageInfo; internal ItemImageInfo ItemImageInfo;
} }
@ -1082,14 +1086,10 @@ namespace MediaBrowser.Dlna.Didl
width = Convert.ToInt32(newSize.Width); width = Convert.ToInt32(newSize.Width);
height = Convert.ToInt32(newSize.Height); height = Convert.ToInt32(newSize.Height);
var inputFormat = (Path.GetExtension(info.File) ?? string.Empty)
.TrimStart('.')
.Replace("jpeg", "jpg", StringComparison.OrdinalIgnoreCase);
var normalizedFormat = format var normalizedFormat = format
.Replace("jpeg", "jpg", StringComparison.OrdinalIgnoreCase); .Replace("jpeg", "jpg", StringComparison.OrdinalIgnoreCase);
if (string.Equals(inputFormat, normalizedFormat, StringComparison.OrdinalIgnoreCase)) if (string.Equals(info.Format, normalizedFormat, StringComparison.OrdinalIgnoreCase))
{ {
info.IsDirectStream = maxWidth >= width.Value && maxHeight >= height.Value; info.IsDirectStream = maxWidth >= width.Value && maxHeight >= height.Value;
} }

2
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
Unescape View File

@ -936,7 +936,7 @@ namespace MediaBrowser.Server.Implementations.Connect
{ {
var length = response.ContentLength; var length = response.ContentLength;
if (length != new FileInfo(user.GetImageInfo(ImageType.Primary, 0).Path).Length) if (length != _fileSystem.GetFileInfo(user.GetImageInfo(ImageType.Primary, 0).Path).Length)
{ {
changed = true; changed = true;
} }

7
MediaBrowser.Server.Implementations/Sync/MediaSync.cs
Unescape View File

@ -84,12 +84,7 @@ namespace MediaBrowser.Server.Implementations.Sync
foreach (var localItem in localItems) foreach (var localItem in localItems)
{ {
// TODO: Remove this after a while if (remoteIds.Contains(localItem.FileId, StringComparer.OrdinalIgnoreCase))
if (string.IsNullOrWhiteSpace(localItem.FileId))
{
jobItemIds.Add(localItem.SyncJobItemId);
}
else if (remoteIds.Contains(localItem.FileId, StringComparer.OrdinalIgnoreCase))
{ {
jobItemIds.Add(localItem.SyncJobItemId); jobItemIds.Add(localItem.SyncJobItemId);
} }

24
MediaBrowser.Server.Implementations/Sync/SyncManager.cs
Unescape View File

@ -750,27 +750,27 @@ namespace MediaBrowser.Server.Implementations.Sync
if (jobItem.IsMarkedForRemoval) if (jobItem.IsMarkedForRemoval)
{ {
// Tell the device to remove it since it has been marked for removal // 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; removeFromDevice = true;
} }
else if (user == null) else if (user == null)
{ {
// Tell the device to remove it since the user is gone now // 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; removeFromDevice = true;
} }
else if (!IsLibraryItemAvailable(libraryItem)) else if (!IsLibraryItemAvailable(libraryItem))
{ {
// Tell the device to remove it since it's no longer available // 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; removeFromDevice = true;
} }
else if (job.UnwatchedOnly) 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 // 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; removeFromDevice = true;
} }
} }
@ -784,7 +784,7 @@ namespace MediaBrowser.Server.Implementations.Sync
} }
else 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.Status = SyncJobItemStatus.Queued;
} }
requiresSaving = true; requiresSaving = true;
@ -855,27 +855,27 @@ namespace MediaBrowser.Server.Implementations.Sync
if (jobItem.IsMarkedForRemoval) if (jobItem.IsMarkedForRemoval)
{ {
// Tell the device to remove it since it has been marked for removal // 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; removeFromDevice = true;
} }
else if (user == null) else if (user == null)
{ {
// Tell the device to remove it since the user is gone now // 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; removeFromDevice = true;
} }
else if (!IsLibraryItemAvailable(libraryItem)) else if (!IsLibraryItemAvailable(libraryItem))
{ {
// Tell the device to remove it since it's no longer available // 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; removeFromDevice = true;
} }
else if (job.UnwatchedOnly) 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 // 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; removeFromDevice = true;
} }
} }
@ -889,7 +889,7 @@ namespace MediaBrowser.Server.Implementations.Sync
} }
else 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.Status = SyncJobItemStatus.Queued;
} }
requiresSaving = true; requiresSaving = true;

Write Preview
Loading…
Cancel
Save