alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 00:55:13 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixes #903 - Display image info on web client detail page

Browse Source
This commit is contained in:
Luke Pulverenti
2014-08-28 20:49:25 -04:00
parent d2494148f7
commit 7e636a977a
23 changed files with 106 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MediaBrowser.Controller/Entities/Audio/Audio.cs
View File

@@ -34,6 +34,7 @@ namespace MediaBrowser.Controller.Entities.Audio
public Audio()
{
Artists = new List<string>();
AlbumArtists = new List<string>();
Tags = new List<string>();
}
@@ -90,12 +91,14 @@ namespace MediaBrowser.Controller.Entities.Audio
/// <value>The artist.</value>
public List<string> Artists { get; set; }
public List<string> AlbumArtists { get; set; }
[IgnoreDataMember]
public List<string> AllArtists
{
get
{
var list = AlbumArtists;
var list = AlbumArtists.ToList();
list.AddRange(Artists);
@@ -104,36 +107,11 @@ namespace MediaBrowser.Controller.Entities.Audio
}
}
[IgnoreDataMember]
public List<string> AlbumArtists
{
get
{
var list = new List<string>();
if (!string.IsNullOrEmpty(AlbumArtist))
{
list.Add(AlbumArtist);
}
return list;
}
set
{
AlbumArtist = value.FirstOrDefault();
}
}
/// <summary>
/// Gets or sets the album.
/// </summary>
/// <value>The album.</value>
public string Album { get; set; }
/// <summary>
/// Gets or sets the album artist.
/// </summary>
/// <value>The album artist.</value>
public string AlbumArtist { get; set; }
/// <summary>
/// Gets the type of the media.

27
MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
View File

@@ -17,8 +17,9 @@ namespace MediaBrowser.Controller.Entities.Audio
public MusicAlbum()
{
Artists = new List<string>();
SoundtrackIds = new List<Guid>();
Artists = new List<string>();
AlbumArtists = new List<string>();
}
public override bool SupportsAddingToPlaylist
@@ -40,7 +41,7 @@ namespace MediaBrowser.Controller.Entities.Audio
{
get
{
var list = AlbumArtists;
var list = AlbumArtists.ToList();
list.AddRange(Artists);
@@ -49,25 +50,7 @@ namespace MediaBrowser.Controller.Entities.Audio
}
}
[IgnoreDataMember]
public List<string> AlbumArtists
{
get
{
var list = new List<string>();
if (!string.IsNullOrEmpty(AlbumArtist))
{
list.Add(AlbumArtist);
}
return list;
}
set
{
AlbumArtist = value.FirstOrDefault();
}
}
public List<string> AlbumArtists { get; set; }
/// <summary>
/// Gets the tracks.
@@ -139,8 +122,6 @@ namespace MediaBrowser.Controller.Entities.Audio
return AllArtists.Contains(artist, StringComparer.OrdinalIgnoreCase);
}
public string AlbumArtist { get; set; }
public List<string> Artists { get; set; }
/// <summary>

4
MediaBrowser.Controller/Entities/Photo.cs
View File

@@ -24,14 +24,12 @@ namespace MediaBrowser.Controller.Entities
public int? Width { get; set; }
public int? Height { get; set; }
public string CameraManufacturer { get; set; }
public string CameraMake { get; set; }
public string CameraModel { get; set; }
public string Software { get; set; }
public double? ExposureTime { get; set; }
public double? FocalLength { get; set; }
public ImageOrientation? Orientation { get; set; }
public double? Aperture { get; set; }
public double? ShutterSpeed { get; set; }
}