fix(gui): attempt to decode unicode EXIF tags

ssube · Jul 21, 2023 · 27a21df · 27a21df
1 parent 063acc6
commit 27a21df
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/gui/src/components/Profiles.tsx b/gui/src/components/Profiles.tsx
@@ -1,4 +1,4 @@
-import { doesExist, mustExist } from '@apextoaster/js-utils';
+import { InvalidArgumentError, Maybe, doesExist, mustExist } from '@apextoaster/js-utils';
 import { Delete as DeleteIcon, ImageSearch, Save as SaveIcon } from '@mui/icons-material';
 import {
   Autocomplete,
@@ -172,21 +172,42 @@ export async function parseImageParams(file: File): Promise<Partial<Txt2ImgParam
   const tags = await ExifReader.load(file);
 
   // handle lowercase variation from my earlier mistakes
-  const makerNote = tags.MakerNote || tags['maker note'];
+  const makerNote = decodeTag(defaultTo(tags.MakerNote, tags['maker note']));
   // eslint-disable-next-line dot-notation, @typescript-eslint/strict-boolean-expressions
-  const userComment = tags.UserComment || tags['Parameters'] || tags['parameters'];
+  const userComment = decodeTag(defaultTo(defaultTo(tags.UserComment, tags['Parameters']), tags['parameters']));
 
-  if (doesExist(makerNote) && isString(makerNote.value) && isProbablyJSON(makerNote.value)) {
-    return parseJSONParams(makerNote.value);
+  if (doesExist(makerNote) && isProbablyJSON(makerNote)) {
+    return parseJSONParams(makerNote);
   }
 
-  if (doesExist(userComment) && isString(userComment.value)) {
-    return parseAutoComment(userComment.value);
+  if (doesExist(userComment)) {
+    return parseAutoComment(userComment);
   }
 
   return {};
 }
 
+export function isNumberArray(it: unknown): it is Array<number> {
+  return Array.isArray(it) && typeof it[0] === 'number';
+}
+
+export function decodeTag(tag: Maybe<ExifReader.XmpTag | (ExifReader.NumberTag & ExifReader.NumberArrayTag)>): Maybe<string> {
+  // eslint-disable-next-line no-restricted-syntax
+  if (!doesExist(tag)) {
+    return undefined;
+  }
+
+  if (isString(tag.value)) {
+    return tag.value;
+  }
+
+  if (tag.description === '[Unicode encoded text]' && isNumberArray(tag.value)) {
+    return Buffer.from(tag.value).toString('utf-8');
+  }
+
+  throw new InvalidArgumentError('tag value cannot be decoded');
+}
+
 export async function parseJSONParams(json: string): Promise<Partial<Txt2ImgParams>> {
   const data = JSON.parse(json);
   const params: Partial<Txt2ImgParams> = {

diff --git a/onnx-web.code-workspace b/onnx-web.code-workspace
@@ -102,6 +102,7 @@
 			"venv",
 			"virtualenv",
 			"VRAM",
+			"webp",
 			"zustand"
 		]
 	}