alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-19 04:34:18 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

standardize knowledge of supported image extensions

Browse Source
This commit is contained in:
Luke Pulverenti
2013-05-30 18:22:15 -04:00
parent 3387dac01d
commit 300c3b7fd6
11 changed files with 69 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs
View File

@@ -36,9 +36,10 @@ namespace MediaBrowser.Controller.Dto
dto.NowPlayingItem = DtoBuilder.GetBaseItemInfo(session.NowPlayingItem);
}
if (session.UserId.HasValue)
if (session.User != null)
{
dto.UserId = session.UserId.Value.ToString("N");
dto.UserId = session.User.Id.ToString("N");
dto.UserName = session.User.Name;
}
return dto;

5
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -42,6 +42,11 @@ namespace MediaBrowser.Controller.Entities
LocalTrailerIds = new List<Guid>();
}
/// <summary>
/// The supported image extensions
/// </summary>
public static readonly string[] SupportedImageExtensions = new[] { ".png", ".jpg", ".jpeg" };
/// <summary>
/// The trailer folder name
/// </summary>

5
MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
View File

@@ -146,8 +146,7 @@ namespace MediaBrowser.Controller.Providers
/// <returns>FileSystemInfo.</returns>
protected virtual FileSystemInfo GetImage(BaseItem item, string filenameWithoutExtension)
{
return item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.ResolveArgs.Path, filenameWithoutExtension + ".png"))
?? item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.ResolveArgs.Path, filenameWithoutExtension + ".jpg"));
return BaseItem.SupportedImageExtensions.Select(i => item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.ResolveArgs.Path, filenameWithoutExtension + i))).FirstOrDefault(i => i != null);
}
/// <summary>
@@ -159,7 +158,7 @@ namespace MediaBrowser.Controller.Providers
// Primary Image
var image = GetImage(item, "folder") ??
GetImage(item, "poster") ??
GetImage(item, "cover") ??
GetImage(item, "cover") ??
GetImage(item, "default");
if (image != null)

2
MediaBrowser.Controller/Session/SessionInfo.cs
View File

@@ -27,7 +27,7 @@ namespace MediaBrowser.Controller.Session
/// Gets or sets the user id.
/// </summary>
/// <value>The user id.</value>
public Guid? UserId { get; set; }
public User User { get; set; }
/// <summary>
/// Gets or sets the type of the client.