add extension

fairy-rockets · May 10, 2022 · cfa4164 · cfa4164
1 parent 35b6875
commit cfa4164
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/server/src/cmd/regenerate-cache.ts b/server/src/cmd/regenerate-cache.ts
@@ -14,9 +14,9 @@ async function main() {
     }
     let processed = 0;
     for (const entity of entities) {
+      console.log(`Processing: (type=${entity.type}, ${processed+1}/${entities.length}): ${entity.id}`);
       await shelf.regenerateEntityCache(entity);
       ++processed;
-      console.log(`Done: (type=${entity.type}, ${processed}/${entities.length}): ${entity.id}`);
     }
   } finally {
     await repo.close();

diff --git a/server/src/lib/media/Convert.ts b/server/src/lib/media/Convert.ts
@@ -19,6 +19,7 @@ export async function makeImageIcon(src: string, dst: string, size: number) {
   const r = await spawn('magick', [
     'convert',
     src,
+    '-coalesce',
     '-resize', `${size}x${size}^`,
     '-gravity', 'center',
     '-extent', `${size}x${size}`,

diff --git a/server/src/shelf/Shelf.ts b/server/src/shelf/Shelf.ts
@@ -155,8 +155,13 @@ class Shelf {
         return path.join(tempDir, 'medium.jpg');
       })();
       const iconPath = path.join(tempDir, 'icon.jpg');
-      const originalPath = path.join(...((await this.storage.original.fetch(entity.id))!!));
-      const probeResult = await probe(originalPath);
+      const [originalPath, probeResult] = await (async () => {
+        const [base, filename] = (await this.storage.original.fetch(entity.id))!!;
+        const probeResult = await probe(path.join(base, filename));
+        const originalPath = path.join(tempDir, `original.${probeResult.ext}`);
+        await fs.copyFile(path.join(base, filename), originalPath);
+        return [originalPath, probeResult];
+      })();
       let newEntity: Entity;
       switch (entity.type) {
         case 'image': {