diff --git a/starsky/starsky.foundation.readmeta/ReadMetaHelpers/ReadMetaExif.cs b/starsky/starsky.foundation.readmeta/ReadMetaHelpers/ReadMetaExif.cs index 1eed9fd0e0..f72da114ed 100644 --- a/starsky/starsky.foundation.readmeta/ReadMetaHelpers/ReadMetaExif.cs +++ b/starsky/starsky.foundation.readmeta/ReadMetaHelpers/ReadMetaExif.cs @@ -557,35 +557,35 @@ private static string GetXmpData(Directory? exifItem, string propertyPath) return result; } - public static string GetObjectName(List allExifItems) + public static string? GetObjectName(List allExifItems) { - var iptcDirectory = allExifItems.OfType().FirstOrDefault(); - - var objectName = iptcDirectory?.Tags.FirstOrDefault( - p => p.Name == "Object Name")?.Description; - - if ( !string.IsNullOrEmpty(objectName) ) - { - return objectName; - } - // Xmp readings var xmpDirectory = allExifItems.OfType().FirstOrDefault(); - return GetXmpData(xmpDirectory, "dc:title[1]"); + var xmpTitle = GetXmpData(xmpDirectory, "dc:title[1]"); + if ( !string.IsNullOrEmpty(xmpTitle) ) + { + return xmpTitle; + } + + var iptcDirectory = allExifItems.OfType().FirstOrDefault(); + var iptcObjectName = iptcDirectory?.Tags.FirstOrDefault( + p => p.Name == "Object Name")?.Description; + return iptcObjectName; } - public static string GetCaptionAbstract(List allExifItems) + public static string? GetCaptionAbstract(List allExifItems) { - var iptcDirectory = allExifItems.OfType().FirstOrDefault(); - var caption = iptcDirectory?.GetDescription(IptcDirectory.TagCaption); + var xmpDirectory = allExifItems.OfType().FirstOrDefault(); + var xmpCaption = GetXmpData(xmpDirectory, "dc:description[1]"); - if ( !string.IsNullOrEmpty(caption) ) + if ( !string.IsNullOrEmpty(xmpCaption) ) { - return caption; + return xmpCaption; } - var xmpDirectory = allExifItems.OfType().FirstOrDefault(); - return GetXmpData(xmpDirectory, "dc:description[1]"); + var iptcDirectory = allExifItems.OfType().FirstOrDefault(); + var caption = iptcDirectory?.GetDescription(IptcDirectory.TagCaption); + return caption; } public static string GetExifKeywords(List allExifItems) diff --git a/starsky/starsky/clientapp/src/components/organisms/detail-view-sidebar/detail-view-sidebar.tsx b/starsky/starsky/clientapp/src/components/organisms/detail-view-sidebar/detail-view-sidebar.tsx index 3e9b7bac8c..85dc04c746 100644 --- a/starsky/starsky/clientapp/src/components/organisms/detail-view-sidebar/detail-view-sidebar.tsx +++ b/starsky/starsky/clientapp/src/components/organisms/detail-view-sidebar/detail-view-sidebar.tsx @@ -96,6 +96,7 @@ const DetailViewSidebar: React.FunctionComponent = memo }); setCollections(collectionsList); } + // For the display const [formEnabled, setFormEnabled] = React.useState(true); useEffect(() => { @@ -216,7 +217,7 @@ const DetailViewSidebar: React.FunctionComponent = memo

{MessageInfoName}