increase limit && change reading order to favor XMP

qdraw · Nov 11, 2024 · c2a8fee · c2a8fee
1 parent f735364
commit c2a8fee
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git 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<Directory> allExifItems)
+	public static string? GetObjectName(List<Directory> allExifItems)
 	{
-		var iptcDirectory = allExifItems.OfType<IptcDirectory>().FirstOrDefault();
-
-		var objectName = iptcDirectory?.Tags.FirstOrDefault(
-			p => p.Name == "Object Name")?.Description;
-
-		if ( !string.IsNullOrEmpty(objectName) )
-		{
-			return objectName;
-		}
-
 		// Xmp readings
 		var xmpDirectory = allExifItems.OfType<XmpDirectory>().FirstOrDefault();
-		return GetXmpData(xmpDirectory, "dc:title[1]");
+		var xmpTitle = GetXmpData(xmpDirectory, "dc:title[1]");
+		if ( !string.IsNullOrEmpty(xmpTitle) )
+		{
+			return xmpTitle;
+		}	
+
+		var iptcDirectory = allExifItems.OfType<IptcDirectory>().FirstOrDefault();
+		var iptcObjectName = iptcDirectory?.Tags.FirstOrDefault(
+			p => p.Name == "Object Name")?.Description;
+		return iptcObjectName;
 	}
 
-	public static string GetCaptionAbstract(List<Directory> allExifItems)
+	public static string? GetCaptionAbstract(List<Directory> allExifItems)
 	{
-		var iptcDirectory = allExifItems.OfType<IptcDirectory>().FirstOrDefault();
-		var caption = iptcDirectory?.GetDescription(IptcDirectory.TagCaption);
+		var xmpDirectory = allExifItems.OfType<XmpDirectory>().FirstOrDefault();
+		var xmpCaption = GetXmpData(xmpDirectory, "dc:description[1]");
 
-		if ( !string.IsNullOrEmpty(caption) )
+		if ( !string.IsNullOrEmpty(xmpCaption) )
 		{
-			return caption;
+			return xmpCaption;
 		}
 
-		var xmpDirectory = allExifItems.OfType<XmpDirectory>().FirstOrDefault();
-		return GetXmpData(xmpDirectory, "dc:description[1]");
+		var iptcDirectory = allExifItems.OfType<IptcDirectory>().FirstOrDefault();
+		var caption = iptcDirectory?.GetDescription(IptcDirectory.TagCaption);
+		return caption;
 	}
 
 	public static string GetExifKeywords(List<Directory> allExifItems)

diff --git a/...ky/starsky/clientapp/src/components/organisms/detail-view-sidebar/detail-view-sidebar.tsx b/...ky/starsky/clientapp/src/components/organisms/detail-view-sidebar/detail-view-sidebar.tsx
@@ -96,6 +96,7 @@ const DetailViewSidebar: React.FunctionComponent<IDetailViewSidebarProps> = memo
       });
       setCollections(collectionsList);
     }
+
     // For the display
     const [formEnabled, setFormEnabled] = React.useState(true);
     useEffect(() => {
@@ -216,7 +217,7 @@ const DetailViewSidebar: React.FunctionComponent<IDetailViewSidebarProps> = memo
           <h4>{MessageInfoName}</h4>
           <FormControl
             onBlur={handleChange}
-            maxlength={1024}
+            maxlength={5000}
             name="description"
             reference={descriptionReference}
             contentEditable={formEnabled}