From fb0c6aa53002482ea0bfdf5b00048df138dc1778 Mon Sep 17 00:00:00 2001
From: Steven Vandevelde <steven.vandevelde@hey.com>
Date: Fri, 9 Feb 2024 19:23:58 +0100
Subject: [PATCH] fix: more processing issues

---
 src/Javascript/Brain/artwork.ts | 25 +------------------------
 src/Javascript/processing.ts    | 13 ++++++-------
 2 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/src/Javascript/Brain/artwork.ts b/src/Javascript/Brain/artwork.ts
index 3f2a6586..1301fb2c 100644
--- a/src/Javascript/Brain/artwork.ts
+++ b/src/Javascript/Brain/artwork.ts
@@ -2,8 +2,6 @@
 // Album Covers
 // (◕‿◕✿)
 
-import MediaInfoFactory, { MediaInfo } from "mediainfo.js"
-
 import { transformUrl } from "../urls"
 import * as processing from "../processing"
 
@@ -30,8 +28,6 @@ function decodeCacheKey(cacheKey) {
 
 
 async function findUsingTags(prep, app) {
-  const mediainfo = await mediaInfoClient()
-
   return Promise.all(
     [
       transformUrl(prep.trackHeadUrl, app),
@@ -42,7 +38,7 @@ async function findUsingTags(prep, app) {
     headUrl,
     getUrl,
     prep.trackFilename,
-    mediainfo
+    { covers: true }
 
   )).then(tags => {
     return tags?.picture
@@ -114,22 +110,3 @@ function lastFmCover(remainingMatches) {
       .catch(_ => lastFmCover(remainingMatches.slice(1)))
     : album && lastFmCover(remainingMatches.slice(1))
 }
-
-
-
-// 🛠️
-
-
-let client: MediaInfo<"object"> | null
-
-
-async function mediaInfoClient() {
-  if (client) return client
-  client = await MediaInfoFactory({
-    coverData: true,
-    locateFile: () => {
-      return "../../wasm/media-info.wasm"
-    },
-  })
-  return client
-}
diff --git a/src/Javascript/processing.ts b/src/Javascript/processing.ts
index 60e9f892..e04b7e56 100644
--- a/src/Javascript/processing.ts
+++ b/src/Javascript/processing.ts
@@ -14,7 +14,6 @@ import { transformUrl } from "./urls";
 // --------
 
 export async function processContext(context, app) {
-  const mediainfo = await mediaInfoClient();
   const initialPromise = Promise.resolve([]);
 
   return context.urlsForTags
@@ -24,7 +23,7 @@ export async function processContext(context, app) {
 
         return Promise.all([transformUrl(urls.headUrl, app), transformUrl(urls.getUrl, app)])
           .then(([headUrl, getUrl]) => {
-            return getTags(headUrl, getUrl, filename, mediainfo);
+            return getTags(headUrl, getUrl, filename, { covers: false });
           })
           .then((r) => {
             return col.concat(r);
@@ -75,11 +74,11 @@ export async function getTags(
     tokenizer.rangeRequestClient.resolvedUrl = undefined;
   }
 
-  const mmResult = await musicMetadata.parseFromTokenizer(tokenizer, { skipCovers: !covers });
-  const mmTags = pickTagsFromMusicMetadata(filename, mmResult);
+  const mmResult = await musicMetadata.parseFromTokenizer(tokenizer, { skipCovers: !covers }).catch(() => null);
+  const mmTags = mmResult && pickTagsFromMusicMetadata(filename, mmResult);
   if (mmTags) return mmTags;
 
-  const miResult = (await mediaInfoClient())
+  const miResult = await (await mediaInfoClient(covers))
     .analyzeData(getSize(headUrl), readChunk(getUrl))
     .catch((_) => null);
   const miTags = miResult && pickTagsFromMediaInfo(filename, miResult);
@@ -219,11 +218,11 @@ function pickTagsFromMusicMetadata(filename: string, result: IAudioMetadata): Ta
 // 🛠️
 // --
 
-async function mediaInfoClient() {
+async function mediaInfoClient(covers: boolean) {
   const MediaInfoFactory = await import("mediainfo.js").then(a => a.default)
 
   return await MediaInfoFactory({
-    coverData: false,
+    coverData: covers,
     locateFile: () => {
       return "../../wasm/media-info.wasm";
     },
-- 
2.51.2