From 7e636a977a47f67af9bebfcbb6ebc89035ad91bd Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 28 Aug 2014 20:49:25 -0400 Subject: [PATCH] fixes #903 - Display image info on web client detail page --- .../Entities/Audio/Audio.cs | 30 +----- .../Entities/Audio/MusicAlbum.cs | 27 +---- MediaBrowser.Controller/Entities/Photo.cs | 4 +- .../MediaBrowser.Model.Portable.csproj | 6 -- .../MediaBrowser.Model.net35.csproj | 6 -- MediaBrowser.Model/ApiClient/IApiClient.cs | 24 ----- MediaBrowser.Model/Dlna/AudioOptions.cs | 9 +- .../Drawing/ImageOrientation.cs | 1 - MediaBrowser.Model/Dto/BaseItemDto.cs | 14 ++- MediaBrowser.Model/Dto/StreamOptions.cs | 64 ------------ MediaBrowser.Model/Dto/VideoStreamOptions.cs | 99 ------------------- MediaBrowser.Model/MediaBrowser.Model.csproj | 2 - .../MediaInfo/FFProbeProvider.cs | 9 ++ .../Music/AlbumMetadataService.cs | 16 ++- .../Music/AudioDbAlbumProvider.cs | 5 +- MediaBrowser.Providers/Music/Extensions.cs | 12 +-- .../Photos/PhotoProvider.cs | 31 ++++-- .../Dto/DtoService.cs | 22 ++++- .../Localization/Server/server.json | 8 +- Nuget/MediaBrowser.Common.Internal.nuspec | 4 +- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Model.Signed.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 +- 23 files changed, 106 insertions(+), 295 deletions(-) delete mode 100644 MediaBrowser.Model/Dto/StreamOptions.cs delete mode 100644 MediaBrowser.Model/Dto/VideoStreamOptions.cs diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs index 7d54e012c..3ffdf744d 100644 --- a/MediaBrowser.Controller/Entities/Audio/Audio.cs +++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs @@ -34,6 +34,7 @@ namespace MediaBrowser.Controller.Entities.Audio public Audio() { Artists = new List(); + AlbumArtists = new List(); Tags = new List(); } @@ -90,12 +91,14 @@ namespace MediaBrowser.Controller.Entities.Audio /// The artist. public List Artists { get; set; } + public List AlbumArtists { get; set; } + [IgnoreDataMember] public List AllArtists { get { - var list = AlbumArtists; + var list = AlbumArtists.ToList(); list.AddRange(Artists); @@ -104,36 +107,11 @@ namespace MediaBrowser.Controller.Entities.Audio } } - [IgnoreDataMember] - public List AlbumArtists - { - get - { - var list = new List(); - - if (!string.IsNullOrEmpty(AlbumArtist)) - { - list.Add(AlbumArtist); - } - - return list; - } - set - { - AlbumArtist = value.FirstOrDefault(); - } - } - /// /// Gets or sets the album. /// /// The album. public string Album { get; set; } - /// - /// Gets or sets the album artist. - /// - /// The album artist. - public string AlbumArtist { get; set; } /// /// Gets the type of the media. diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs index 152d76782..82cd618dd 100644 --- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs +++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs @@ -17,8 +17,9 @@ namespace MediaBrowser.Controller.Entities.Audio public MusicAlbum() { - Artists = new List(); SoundtrackIds = new List(); + Artists = new List(); + AlbumArtists = new List(); } 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 AlbumArtists - { - get - { - var list = new List(); - - if (!string.IsNullOrEmpty(AlbumArtist)) - { - list.Add(AlbumArtist); - } - - return list; - } - set - { - AlbumArtist = value.FirstOrDefault(); - } - } + public List AlbumArtists { get; set; } /// /// 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 Artists { get; set; } /// diff --git a/MediaBrowser.Controller/Entities/Photo.cs b/MediaBrowser.Controller/Entities/Photo.cs index 542fbaa31..aa9e63791 100644 --- a/MediaBrowser.Controller/Entities/Photo.cs +++ b/MediaBrowser.Controller/Entities/Photo.cs @@ -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; } } diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index aaa44b009..62f2a7425 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -341,9 +341,6 @@ Dto\RecommendationType.cs - - Dto\StreamOptions.cs - Dto\StudioDto.cs @@ -356,9 +353,6 @@ Dto\UserItemDataDto.cs - - Dto\VideoStreamOptions.cs - Entities\BaseItemInfo.cs diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj index 6046d3606..715331436 100644 --- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -304,9 +304,6 @@ Dto\RecommendationType.cs - - Dto\StreamOptions.cs - Dto\StudioDto.cs @@ -319,9 +316,6 @@ Dto\UserItemDataDto.cs - - Dto\VideoStreamOptions.cs - Entities\BaseItemInfo.cs diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs index 3aa9b73b9..a9d0f480c 100644 --- a/MediaBrowser.Model/ApiClient/IApiClient.cs +++ b/MediaBrowser.Model/ApiClient/IApiClient.cs @@ -61,30 +61,6 @@ namespace MediaBrowser.Model.ApiClient Task GetAsync(string url, CancellationToken cancellationToken = default(CancellationToken)) where T : class; - /// - /// Gets the url needed to stream an audio file - /// - /// The options. - /// System.String. - /// options - string GetAudioStreamUrl(StreamOptions options); - - /// - /// Gets the url needed to stream a video file - /// - /// The options. - /// System.String. - /// options - string GetVideoStreamUrl(VideoStreamOptions options); - - /// - /// Formulates a url for streaming video using the HLS protocol - /// - /// The options. - /// System.String. - /// options - string GetHlsVideoStreamUrl(VideoStreamOptions options); - /// /// Reports the capabilities. /// diff --git a/MediaBrowser.Model/Dlna/AudioOptions.cs b/MediaBrowser.Model/Dlna/AudioOptions.cs index 309b67543..dd6dad261 100644 --- a/MediaBrowser.Model/Dlna/AudioOptions.cs +++ b/MediaBrowser.Model/Dlna/AudioOptions.cs @@ -1,5 +1,5 @@ -using System.Collections.Generic; -using MediaBrowser.Model.Dto; +using MediaBrowser.Model.Dto; +using System.Collections.Generic; namespace MediaBrowser.Model.Dlna { @@ -8,6 +8,11 @@ namespace MediaBrowser.Model.Dlna /// public class AudioOptions { + public AudioOptions() + { + Context = EncodingContext.Streaming; + } + public string ItemId { get; set; } public List MediaSources { get; set; } public DeviceProfile Profile { get; set; } diff --git a/MediaBrowser.Model/Drawing/ImageOrientation.cs b/MediaBrowser.Model/Drawing/ImageOrientation.cs index 3fdfaf7bf..c320a8224 100644 --- a/MediaBrowser.Model/Drawing/ImageOrientation.cs +++ b/MediaBrowser.Model/Drawing/ImageOrientation.cs @@ -3,7 +3,6 @@ namespace MediaBrowser.Model.Drawing { public enum ImageOrientation { - None = 0, TopLeft = 1, TopRight = 2, BottomRight = 3, diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index 0dfd27a72..360d2d862 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Drawing; +using MediaBrowser.Model.Entities; using MediaBrowser.Model.Extensions; using MediaBrowser.Model.Library; using MediaBrowser.Model.Providers; @@ -721,6 +722,17 @@ namespace MediaBrowser.Model.Dto /// true if [enable internet providers]; otherwise, false. public bool? LockData { get; set; } + public int? Width { get; set; } + public int? Height { 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? ImageOrientation { get; set; } + public double? Aperture { get; set; } + public double? ShutterSpeed { get; set; } + /// /// Gets a value indicating whether this instance can resume. /// diff --git a/MediaBrowser.Model/Dto/StreamOptions.cs b/MediaBrowser.Model/Dto/StreamOptions.cs deleted file mode 100644 index 9cf301270..000000000 --- a/MediaBrowser.Model/Dto/StreamOptions.cs +++ /dev/null @@ -1,64 +0,0 @@ -namespace MediaBrowser.Model.Dto -{ - /// - /// Class StreamOptions - /// - public class StreamOptions - { - /// - /// Gets or sets the audio bit rate. - /// - /// The audio bit rate. - public int? AudioBitRate { get; set; } - - /// - /// Gets or sets the audio codec. - /// Omit to copy the original stream - /// - /// The audio encoding format. - public string AudioCodec { get; set; } - - /// - /// Gets or sets the item id. - /// - /// The item id. - public string ItemId { get; set; } - - /// - /// Gets or sets the max audio channels. - /// - /// The max audio channels. - public int? MaxAudioChannels { get; set; } - - /// - /// Gets or sets the max audio sample rate. - /// - /// The max audio sample rate. - public int? MaxAudioSampleRate { get; set; } - - /// - /// Gets or sets the start time ticks. - /// - /// The start time ticks. - public long? StartTimeTicks { get; set; } - - /// - /// Gets or sets a value indicating whether the original media should be served statically - /// Only used with progressive streaming - /// - /// true if static; otherwise, false. - public bool? Static { get; set; } - - /// - /// Gets or sets the output file extension. - /// - /// The output file extension. - public string OutputFileExtension { get; set; } - - /// - /// Gets or sets the device id. - /// - /// The device id. - public string DeviceId { get; set; } - } -} diff --git a/MediaBrowser.Model/Dto/VideoStreamOptions.cs b/MediaBrowser.Model/Dto/VideoStreamOptions.cs deleted file mode 100644 index 73dc70018..000000000 --- a/MediaBrowser.Model/Dto/VideoStreamOptions.cs +++ /dev/null @@ -1,99 +0,0 @@ -namespace MediaBrowser.Model.Dto -{ - /// - /// Class VideoStreamOptions - /// - public class VideoStreamOptions : StreamOptions - { - /// - /// Gets or sets the video codec. - /// Omit to copy - /// - /// The video codec. - public string VideoCodec { get; set; } - - /// - /// Gets or sets the video bit rate. - /// - /// The video bit rate. - public int? VideoBitRate { get; set; } - - /// - /// Gets or sets the width. - /// - /// The width. - public int? Width { get; set; } - - /// - /// Gets or sets the height. - /// - /// The height. - public int? Height { get; set; } - - /// - /// Gets or sets the width of the max. - /// - /// The width of the max. - public int? MaxWidth { get; set; } - - /// - /// Gets or sets the height of the max. - /// - /// The height of the max. - public int? MaxHeight { get; set; } - - /// - /// Gets or sets the frame rate. - /// - /// The frame rate. - public double? FrameRate { get; set; } - - /// - /// Gets or sets the index of the audio stream. - /// - /// The index of the audio stream. - public int? AudioStreamIndex { get; set; } - - /// - /// Gets or sets the index of the video stream. - /// - /// The index of the video stream. - public int? VideoStreamIndex { get; set; } - - /// - /// Gets or sets the index of the subtitle stream. - /// - /// The index of the subtitle stream. - public int? SubtitleStreamIndex { get; set; } - - /// - /// Gets or sets the profile. - /// - /// The profile. - public string Profile { get; set; } - - /// - /// Gets or sets the level. - /// - /// The level. - public string Level { get; set; } - - /// - /// Gets or sets the baseline stream audio bit rate. - /// - /// The baseline stream audio bit rate. - public int? BaselineStreamAudioBitRate { get; set; } - - /// - /// Gets or sets a value indicating whether [append baseline stream]. - /// - /// true if [append baseline stream]; otherwise, false. - public bool AppendBaselineStream { get; set; } - - /// - /// Gets or sets the time stamp offset ms. Only used with HLS. - /// - /// The time stamp offset ms. - public int? TimeStampOffsetMs { get; set; } - } -} \ No newline at end of file diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index c3f02236f..a760cba05 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -152,7 +152,6 @@ - @@ -285,7 +284,6 @@ - diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs index 33b69d71a..e3324fe82 100644 --- a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs +++ b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs @@ -168,6 +168,15 @@ namespace MediaBrowser.Providers.MediaInfo return true; } + if (item is Audio) + { + // Moved to plural AlbumArtists + if (date < new DateTime(2014, 8, 28)) + { + return true; + } + } + if (item.SupportsLocalMetadata) { var video = item as Video; diff --git a/MediaBrowser.Providers/Music/AlbumMetadataService.cs b/MediaBrowser.Providers/Music/AlbumMetadataService.cs index f049c79e1..a3d9b5642 100644 --- a/MediaBrowser.Providers/Music/AlbumMetadataService.cs +++ b/MediaBrowser.Providers/Music/AlbumMetadataService.cs @@ -9,8 +9,6 @@ using MediaBrowser.Providers.Manager; using System; using System.Collections.Generic; using System.Linq; -using System.Threading; -using System.Threading.Tasks; namespace MediaBrowser.Providers.Music { @@ -104,17 +102,15 @@ namespace MediaBrowser.Providers.Music { var updateType = ItemUpdateType.None; - var albumArtist = songs + var albumArtists = songs .SelectMany(i => i.AlbumArtists) - .FirstOrDefault(i => !string.IsNullOrEmpty(i)); + .Distinct(StringComparer.OrdinalIgnoreCase) + .ToList(); - if (!string.IsNullOrEmpty(albumArtist)) + if (!item.AlbumArtists.SequenceEqual(albumArtists, StringComparer.OrdinalIgnoreCase)) { - if (!string.Equals(item.AlbumArtist, albumArtist, StringComparison.Ordinal)) - { - item.AlbumArtist = albumArtist; - updateType = updateType | ItemUpdateType.MetadataDownload; - } + item.AlbumArtists = albumArtists; + updateType = updateType | ItemUpdateType.MetadataDownload; } return updateType; diff --git a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs index ab9ac2331..3667d70cf 100644 --- a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs +++ b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs @@ -70,7 +70,10 @@ namespace MediaBrowser.Providers.Music private void ProcessResult(MusicAlbum item, Album result) { - item.AlbumArtist = result.strArtist; + if (!string.IsNullOrWhiteSpace(result.strArtist)) + { + item.AlbumArtists = new List { result.strArtist }; + } if (!string.IsNullOrEmpty(result.intYearReleased)) { diff --git a/MediaBrowser.Providers/Music/Extensions.cs b/MediaBrowser.Providers/Music/Extensions.cs index b14a1ba09..c83e69165 100644 --- a/MediaBrowser.Providers/Music/Extensions.cs +++ b/MediaBrowser.Providers/Music/Extensions.cs @@ -8,15 +8,15 @@ namespace MediaBrowser.Providers.Music { public static string GetAlbumArtist(this AlbumInfo info) { - var id = info.AlbumArtists.FirstOrDefault(); - - if (string.IsNullOrEmpty(id)) - { - return info.SongInfos.SelectMany(i => i.AlbumArtists) + var id = info.SongInfos.SelectMany(i => i.AlbumArtists) .FirstOrDefault(i => !string.IsNullOrEmpty(i)); + + if (!string.IsNullOrEmpty(id)) + { + return id; } - return id; + return info.AlbumArtists.FirstOrDefault(); } public static string GetReleaseGroupId(this AlbumInfo info) diff --git a/MediaBrowser.Providers/Photos/PhotoProvider.cs b/MediaBrowser.Providers/Photos/PhotoProvider.cs index 01d36b541..123c91d07 100644 --- a/MediaBrowser.Providers/Photos/PhotoProvider.cs +++ b/MediaBrowser.Providers/Photos/PhotoProvider.cs @@ -29,7 +29,6 @@ namespace MediaBrowser.Providers.Photos public Task FetchAsync(Photo item, MetadataRefreshOptions options, CancellationToken cancellationToken) { item.SetImagePath(ImageType.Primary, item.Path); - item.SetImagePath(ImageType.Backdrop, item.Path); // Examples: https://github.com/mono/taglib-sharp/blob/a5f6949a53d09ce63ee7495580d6802921a21f14/tests/fixtures/TagLib.Tests.Images/NullOrientationTest.cs @@ -77,7 +76,7 @@ namespace MediaBrowser.Providers.Photos } } - item.CameraManufacturer = image.ImageTag.Make; + item.CameraMake = image.ImageTag.Make; item.CameraModel = image.ImageTag.Model; var rating = image.ImageTag.Rating; @@ -105,18 +104,21 @@ namespace MediaBrowser.Providers.Photos item.ProductionYear = dateTaken.Value.Year; } - var size = _imageProcessor.GetImageSize(item.Path); - item.Height = Convert.ToInt32(size.Height); - item.Width = Convert.ToInt32(size.Width); - item.Genres = image.ImageTag.Genres.ToList(); item.Tags = image.ImageTag.Keywords.ToList(); item.Software = image.ImageTag.Software; - Model.Drawing.ImageOrientation orientation; - if (Enum.TryParse(image.ImageTag.Orientation.ToString(), true, out orientation)) + if (image.ImageTag.Orientation == TagLib.Image.ImageOrientation.None) { - item.Orientation = orientation; + item.Orientation = null; + } + else + { + Model.Drawing.ImageOrientation orientation; + if (Enum.TryParse(image.ImageTag.Orientation.ToString(), true, out orientation)) + { + item.Orientation = orientation; + } } item.ExposureTime = image.ImageTag.ExposureTime; @@ -127,6 +129,10 @@ namespace MediaBrowser.Providers.Photos _logger.ErrorException("Image Provider - Error reading image tag for {0}", e, item.Path); } + var size = _imageProcessor.GetImageSize(item.Path); + item.Height = Convert.ToInt32(size.Height); + item.Width = Convert.ToInt32(size.Width); + const ItemUpdateType result = ItemUpdateType.ImageUpdate | ItemUpdateType.MetadataImport; return Task.FromResult(result); } @@ -138,6 +144,13 @@ namespace MediaBrowser.Providers.Photos public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date) { + // Moved to plural AlbumArtists + if (date < new DateTime(2014, 8, 28)) + { + // Revamped vaptured metadata + return true; + } + return item.DateModified > date; } } diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 8bfd4ea1e..61517ce6e 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -357,6 +357,19 @@ namespace MediaBrowser.Server.Implementations.Dto { dto.SeriesName = item.SeriesName; } + private void SetPhotoProperties(BaseItemDto dto, Photo item) + { + dto.Width = item.Width; + dto.Height = item.Height; + dto.CameraMake = item.CameraMake; + dto.CameraModel = item.CameraModel; + dto.Software = item.Software; + dto.ExposureTime = item.ExposureTime; + dto.FocalLength = item.FocalLength; + dto.ImageOrientation = item.Orientation; + dto.Aperture = item.Aperture; + dto.ShutterSpeed = item.ShutterSpeed; + } private void SetMusicVideoProperties(BaseItemDto dto, MusicVideo item) { @@ -1187,21 +1200,24 @@ namespace MediaBrowser.Server.Implementations.Dto } var book = item as Book; - if (book != null) { SetBookProperties(dto, book); } - var tvChannel = item as LiveTvChannel; + var photo = item as Photo; + if (photo != null) + { + SetPhotoProperties(dto, photo); + } + var tvChannel = item as LiveTvChannel; if (tvChannel != null) { dto.MediaSources = tvChannel.GetMediaSources(true).ToList(); } var channelItem = item as IChannelItem; - if (channelItem != null) { dto.ChannelId = channelItem.ChannelId; diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index adaa30719..21eb0c1c9 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -1093,8 +1093,8 @@ "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.", "TabSupporterClub": "Supporter Club", "HeaderDonationType": "Donation type:", - "OptionMakeOneTimeDonation": "Make an additional donation", - "OptionOneTimeDescription": "This is an additional donation to the team to show extra support. It does not have any additional benefits.", + "OptionMakeOneTimeDonation": "Make a separate donation", + "OptionOneTimeDescription": "This is an additional donation to the team to show your support. It does not have any additional benefits.", "OptionLifeTimeSupporterClubMembership": "Lifetime supporter club membership", "HeaderSupporterBenefit": "Becoming a supporter club member provides additional benefits such as access to premium plugins, internet channel content, and more.", "OptionNoTrailer": "No Trailer", @@ -1108,5 +1108,7 @@ "OptionProducer": "Producer", "OptionWriter": "Writer", "LabelAirDays": "Air days:", - "LabelAirTime": "Air time:" + "LabelAirTime": "Air time:", + "HeaderMediaInfo": "Media Info", + "HeaderPhotoInfo": "Photo Info" } diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index e843c6298..935d26750 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.427 + 3.0.428 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 90a66b3c7..4c3626c8d 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.427 + 3.0.428 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec index a444d4c33..67127ea77 100644 --- a/Nuget/MediaBrowser.Model.Signed.nuspec +++ b/Nuget/MediaBrowser.Model.Signed.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Model.Signed - 3.0.427 + 3.0.428 MediaBrowser.Model - Signed Edition Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index dadc51dff..23743e2d0 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.427 + 3.0.428 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +