starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 14:03:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

add LocalFileInfo.Id

Browse Source
This commit is contained in:
Luke Pulverenti
2014-10-24 00:54:35 -04:00
parent 5a5b48feff
commit c8a735bcb1
84 changed files with 659 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Common.IO;
using MediaBrowser.Common;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Drawing;
@@ -40,8 +41,9 @@ namespace MediaBrowser.Server.Implementations.Dto
private readonly Func<IChannelManager> _channelManagerFactory;
private readonly ISyncManager _syncManager;
private readonly IApplicationHost _appHost;
public DtoService(ILogger logger, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IImageProcessor imageProcessor, IServerConfigurationManager config, IFileSystem fileSystem, IProviderManager providerManager, Func<IChannelManager> channelManagerFactory, ISyncManager syncManager)
public DtoService(ILogger logger, ILibraryManager libraryManager, IUserDataManager userDataRepository, IItemRepository itemRepo, IImageProcessor imageProcessor, IServerConfigurationManager config, IFileSystem fileSystem, IProviderManager providerManager, Func<IChannelManager> channelManagerFactory, ISyncManager syncManager, IApplicationHost appHost)
{
_logger = logger;
_libraryManager = libraryManager;
@@ -53,6 +55,7 @@ namespace MediaBrowser.Server.Implementations.Dto
_providerManager = providerManager;
_channelManagerFactory = channelManagerFactory;
_syncManager = syncManager;
_appHost = appHost;
}
/// <summary>
@@ -96,7 +99,10 @@ namespace MediaBrowser.Server.Implementations.Dto
throw new ArgumentNullException("fields");
}
var dto = new BaseItemDto();
var dto = new BaseItemDto
{
ServerId = _appHost.SystemId
};
dto.SupportsPlaylists = item.SupportsAddingToPlaylist;
@@ -260,43 +266,6 @@ namespace MediaBrowser.Server.Implementations.Dto
.Count();
}
public UserDto GetUserDto(User user)
{
if (user == null)
{
throw new ArgumentNullException("user");
}
var dto = new UserDto
{
Id = user.Id.ToString("N"),
Name = user.Name,
HasPassword = !String.IsNullOrEmpty(user.Password),
LastActivityDate = user.LastActivityDate,
LastLoginDate = user.LastLoginDate,
Configuration = user.Configuration
};
var image = user.GetImageInfo(ImageType.Primary, 0);
if (image != null)
{
dto.PrimaryImageTag = GetImageCacheTag(user, image);
try
{
AttachPrimaryImageAspectRatio(dto, user);
}
catch (Exception ex)
{
// Have to use a catch-all unfortunately because some .net image methods throw plain Exceptions
_logger.ErrorException("Error generating PrimaryImageAspectRatio for {0}", ex, user.Name);
}
}
return dto;
}
/// <summary>
/// Gets client-side Id of a server-side BaseItem
/// </summary>
@@ -893,9 +862,13 @@ namespace MediaBrowser.Server.Implementations.Dto
}
}
if (item.Parent != null && fields.Contains(ItemFields.ParentId))
if (fields.Contains(ItemFields.ParentId))
{
dto.ParentId = GetDtoId(item.Parent);
var displayParent = item.DisplayParent;
if (displayParent != null)
{
dto.ParentId = GetDtoId(displayParent);
}
}
dto.ParentIndexNumber = item.ParentIndexNumber;