aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-28 20:49:25 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-28 20:49:25 -0400
commit7e636a977a47f67af9bebfcbb6ebc89035ad91bd (patch)
tree72b83f72074bab12a93ace98f63e6f545c81e4c2 /MediaBrowser.Server.Implementations
parentd2494148f78d258ea59809c3b296234bdc64d73a (diff)
fixes #903 - Display image info on web client detail page
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/Dto/DtoService.cs22
-rw-r--r--MediaBrowser.Server.Implementations/Localization/Server/server.json8
2 files changed, 24 insertions, 6 deletions
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"
}