From 6ce5fcdb95513b5aa1c86553bec9b84937fea973 Mon Sep 17 00:00:00 2001
From: DecDuck <declanahofmeyr@gmail.com>
Date: Mon, 13 Oct 2025 13:02:27 +1100
Subject: [PATCH] Use 7zip for archive backend (#264)

* feat: use 7zip for archive backend

* fix: lint
---
 server/components/CarouselPagination.vue     |  6 +-
 server/package.json                          |  2 +-
 server/pnpm-lock.yaml                        | 93 ++++++++++----------
 server/pnpm-workspace.yaml                   |  3 +
 server/server/internal/metadata/giantbomb.ts |  6 +-
 5 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/server/components/CarouselPagination.vue b/server/components/CarouselPagination.vue
index fe6117de..fccc129a 100644
--- a/server/components/CarouselPagination.vue
+++ b/server/components/CarouselPagination.vue
@@ -3,11 +3,11 @@
     <button
       v-for="(_, i) in amount"
       :key="i"
-      @click="slideTo(i)"
       :class="[
         carousel.currentSlide === i ? 'bg-blue-600 w-6' : 'bg-zinc-700 w-3',
-        'transition-all cursor-pointer h-2 rounded-full'
+        'transition-all cursor-pointer h-2 rounded-full',
       ]"
+      @click="slideTo(i)"
     />
   </div>
 </template>
@@ -23,4 +23,4 @@ function slideTo(index: number) {
   const offsetIndex = index + carousel.minSlide;
   carousel.nav.slideTo(offsetIndex);
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/server/package.json b/server/package.json
index 4df6bc0c..00ed6453 100644
--- a/server/package.json
+++ b/server/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@discordapp/twemoji": "^16.0.1",
-    "@drop-oss/droplet": "3.0.1",
+    "@drop-oss/droplet": "3.2.0",
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.1.5",
     "@lobomfz/prismark": "0.0.3",
diff --git a/server/pnpm-lock.yaml b/server/pnpm-lock.yaml
index cc16c1bf..a0856075 100644
--- a/server/pnpm-lock.yaml
+++ b/server/pnpm-lock.yaml
@@ -4,6 +4,9 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+overrides:
+  droplet: link:../../.local/share/pnpm/global/5/node_modules/@drop-oss/droplet
+
 importers:
 
   .:
@@ -12,8 +15,8 @@ importers:
         specifier: ^16.0.1
         version: 16.0.1
       '@drop-oss/droplet':
-        specifier: 3.0.1
-        version: 3.0.1
+        specifier: 3.2.0
+        version: 3.2.0
       '@headlessui/vue':
         specifier: ^1.7.23
         version: 1.7.23(vue@3.5.22(typescript@5.8.3))
@@ -370,67 +373,67 @@ packages:
   '@discordapp/twemoji@16.0.1':
     resolution: {integrity: sha512-figLiBWzjS5cyrAjLaGjM8AAaowO3qvK8rg5bA2dElB4qsaPMvBVlFDMO2d3x+nC1igt7kgWH4dvNmvvUHUF8w==}
 
-  '@drop-oss/droplet-darwin-arm64@3.0.1':
-    resolution: {integrity: sha512-LXe8vsXUBL96boI78H6oXpSaPVwF4cCwJ5l/QVtsOWMebNo6gk9wICDZ+5IoR/Ol32t1a1lk+DjbD1zeGenPxg==}
+  '@drop-oss/droplet-darwin-arm64@3.2.0':
+    resolution: {integrity: sha512-dH/vRFxuLjOzYBBvDG140wKcx4LmFxBJ5iTjZrWzV641wiRjx8B38niWXuqZ2ZADkCL4muOvgRGFJ4W1N/j6jQ==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@drop-oss/droplet-darwin-universal@3.0.1':
-    resolution: {integrity: sha512-Mf2gjC24u6s8djV/3slZvwdr4+h0qBu2OYXBUSDfR4H/VJwV5TstnWVKF+U8d1hjmHE9eLO8elbGNnpQmSoTOQ==}
+  '@drop-oss/droplet-darwin-universal@3.2.0':
+    resolution: {integrity: sha512-k7Xhzs2mXrQcm3SLhLNDBkUaCWqtbQ6dyme1ubsG9PZEcvv25T//8CNVFEsHVZTKqj5nF41iSh4Wz1Qn6VxkVw==}
     engines: {node: '>= 10'}
     os: [darwin]
 
-  '@drop-oss/droplet-darwin-x64@3.0.1':
-    resolution: {integrity: sha512-4IIDl/E+hzZ2Vt9m4FMPlZEXwj1EwE6qXyUidACK6TTFqpjLpsEHKuhv1FOxGyJ8qkvagtyPCc+cs1TxoZD6FA==}
+  '@drop-oss/droplet-darwin-x64@3.2.0':
+    resolution: {integrity: sha512-GvRwQrtcC1Dq6YyXxBGSFj+WasnIa1dk9t2lCaR9OQdh3qp2did21o2poo1Sgdjg+mI2lUdgZ6w0yXJlL1vl+A==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@drop-oss/droplet-linux-arm64-gnu@3.0.1':
-    resolution: {integrity: sha512-klGvlLf1xSMT3iYsIAaBbmbir1ZJWtcVyOMUlsfc1lkJ8mgyB+PrW4BsnYj7Pp4G34n7WsOChjC8TdJDBBuBWg==}
+  '@drop-oss/droplet-linux-arm64-gnu@3.2.0':
+    resolution: {integrity: sha512-ZqH0xTEeSeJF77vy8rZDxHEV8JMaN0khdg6ptpnbBfc56J5jt6wS3NlHK8M0ZVlDqqZnXMS1vUO0b6rfmQodKw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@drop-oss/droplet-linux-arm64-musl@3.0.1':
-    resolution: {integrity: sha512-oOjvGETlrJGC1RlNhUoVS9N89Rn/0DqBauVz3BBFjJTKSd5jU3/gLzwgmfkKDGVEU5lyGPAn2WQroiESEG9wdA==}
+  '@drop-oss/droplet-linux-arm64-musl@3.2.0':
+    resolution: {integrity: sha512-TTw44PggYfp3RJkvNhXH89duuuvONEA8c8oRBCzCczRf3hDnbzCQLaB1UlnIlESsJZXXiFSDIBV2/0kkpB+Ukg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
 
-  '@drop-oss/droplet-linux-riscv64-gnu@3.0.1':
-    resolution: {integrity: sha512-Zf3gUsWq9Hqb275MOi7PJDhmJz7Qa/Y1XMen880bxPaOeDFqFOoKUxUr2/qv1MYp6tT3zO27NprGsHirYWqsyA==}
+  '@drop-oss/droplet-linux-riscv64-gnu@3.2.0':
+    resolution: {integrity: sha512-Ee/PfkoG8pm/9C3LFXJleIi5N8V5cK+44p+iDaneAo6gj5k67zYzuga3mJVswTgd3fncG1cw+xPqBl4PUWc1pg==}
     engines: {node: '>= 10'}
     cpu: [riscv64]
     os: [linux]
 
-  '@drop-oss/droplet-linux-x64-gnu@3.0.1':
-    resolution: {integrity: sha512-sskblycJdtNJVnRHjPHhwHkQUfQNaDIWDzXOzEaBPOcDKqYA7od7VMDAseqBkrKDn7l8bBUtRXFAipdsO8hffw==}
+  '@drop-oss/droplet-linux-x64-gnu@3.2.0':
+    resolution: {integrity: sha512-L2M/MEoe5Y74MTtzpEWHIvdyRSPLgM1WLzpb/xRNCWe8d6FcUFDgdMlbd6rDj5t4Q6JEzyMIHUciVRaYIv+ShA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@drop-oss/droplet-linux-x64-musl@3.0.1':
-    resolution: {integrity: sha512-lh+1M6UAf5+ET1/ZEFRsB3shFHjkT/9Ql9akr/vyUue91TWPmP71meqVkCugWDhP6lxBt56jg2VVrJfmPAsK6w==}
+  '@drop-oss/droplet-linux-x64-musl@3.2.0':
+    resolution: {integrity: sha512-F/uQUAHWbhiiAtoyKHQHPgjG7jJd8pQX6sCgdf5ufCdwFLvHEdu9pO0qN+xpzaACceIKX4Vip0vUwQwEzYhAKA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
 
-  '@drop-oss/droplet-win32-arm64-msvc@3.0.1':
-    resolution: {integrity: sha512-caQDPoDNJyyJXUEijw+hGTy0wmCrW5efTqBwnvMcQ282EOilg1d5WeJ31pfEcuLYF4MK1t9uaLcG6jZ9YLtzEQ==}
+  '@drop-oss/droplet-win32-arm64-msvc@3.2.0':
+    resolution: {integrity: sha512-x7i1KKL8vQGcXbKIyH56LCEdQxLKNEk/KFjuD/YGrbBJ/+Q+fh46hLK+Sx4I/HzPHecd5g3xc2kVgO7+DgjhYA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@drop-oss/droplet-win32-x64-msvc@3.0.1':
-    resolution: {integrity: sha512-bp8KwewF/T3JkVeJWkg86U3b0cGQD9i8k92x6HYPtnF5nLPAb2UIUEJgmYYFNPFe36RECBV7PIIG0ujdT1ELQw==}
+  '@drop-oss/droplet-win32-x64-msvc@3.2.0':
+    resolution: {integrity: sha512-lC8a456IQ0ArzX40IlStolV4GIdl26xF9PikcuQ9r+n4VDqWSHb8A0Wwj87leU3QdoMu+Y2nlA1QHKgpVSEuoQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
 
-  '@drop-oss/droplet@3.0.1':
-    resolution: {integrity: sha512-YhtgpwNqEHO8R03yf9Xb5LXuaLWkQvY+2lxOD1PwzpGI5V9PKlDE+x1IJBmdBF5bDPDGk9MxQidGtnYQuAEBEA==}
+  '@drop-oss/droplet@3.2.0':
+    resolution: {integrity: sha512-+3zw3MPriMrj8HlKAq2VTlXEPOXN0homusjmQcBRzVx7GjtGvb5Y9YIHs16qfn8zdTEDi5twrtsUBQYkVjU2bQ==}
     engines: {node: '>= 10'}
 
   '@emnapi/core@1.4.5':
@@ -6133,48 +6136,48 @@ snapshots:
       jsonfile: 5.0.0
       universalify: 0.1.2
 
-  '@drop-oss/droplet-darwin-arm64@3.0.1':
+  '@drop-oss/droplet-darwin-arm64@3.2.0':
     optional: true
 
-  '@drop-oss/droplet-darwin-universal@3.0.1':
+  '@drop-oss/droplet-darwin-universal@3.2.0':
     optional: true
 
-  '@drop-oss/droplet-darwin-x64@3.0.1':
+  '@drop-oss/droplet-darwin-x64@3.2.0':
     optional: true
 
-  '@drop-oss/droplet-linux-arm64-gnu@3.0.1':
+  '@drop-oss/droplet-linux-arm64-gnu@3.2.0':
     optional: true
 
-  '@drop-oss/droplet-linux-arm64-musl@3.0.1':
+  '@drop-oss/droplet-linux-arm64-musl@3.2.0':
     optional: true
 
-  '@drop-oss/droplet-linux-riscv64-gnu@3.0.1':
+  '@drop-oss/droplet-linux-riscv64-gnu@3.2.0':
     optional: true
 
-  '@drop-oss/droplet-linux-x64-gnu@3.0.1':
+  '@drop-oss/droplet-linux-x64-gnu@3.2.0':
     optional: true
 
-  '@drop-oss/droplet-linux-x64-musl@3.0.1':
+  '@drop-oss/droplet-linux-x64-musl@3.2.0':
     optional: true
 
-  '@drop-oss/droplet-win32-arm64-msvc@3.0.1':
+  '@drop-oss/droplet-win32-arm64-msvc@3.2.0':
     optional: true
 
-  '@drop-oss/droplet-win32-x64-msvc@3.0.1':
+  '@drop-oss/droplet-win32-x64-msvc@3.2.0':
     optional: true
 
-  '@drop-oss/droplet@3.0.1':
+  '@drop-oss/droplet@3.2.0':
     optionalDependencies:
-      '@drop-oss/droplet-darwin-arm64': 3.0.1
-      '@drop-oss/droplet-darwin-universal': 3.0.1
-      '@drop-oss/droplet-darwin-x64': 3.0.1
-      '@drop-oss/droplet-linux-arm64-gnu': 3.0.1
-      '@drop-oss/droplet-linux-arm64-musl': 3.0.1
-      '@drop-oss/droplet-linux-riscv64-gnu': 3.0.1
-      '@drop-oss/droplet-linux-x64-gnu': 3.0.1
-      '@drop-oss/droplet-linux-x64-musl': 3.0.1
-      '@drop-oss/droplet-win32-arm64-msvc': 3.0.1
-      '@drop-oss/droplet-win32-x64-msvc': 3.0.1
+      '@drop-oss/droplet-darwin-arm64': 3.2.0
+      '@drop-oss/droplet-darwin-universal': 3.2.0
+      '@drop-oss/droplet-darwin-x64': 3.2.0
+      '@drop-oss/droplet-linux-arm64-gnu': 3.2.0
+      '@drop-oss/droplet-linux-arm64-musl': 3.2.0
+      '@drop-oss/droplet-linux-riscv64-gnu': 3.2.0
+      '@drop-oss/droplet-linux-x64-gnu': 3.2.0
+      '@drop-oss/droplet-linux-x64-musl': 3.2.0
+      '@drop-oss/droplet-win32-arm64-msvc': 3.2.0
+      '@drop-oss/droplet-win32-x64-msvc': 3.2.0
 
   '@emnapi/core@1.4.5':
     dependencies:
diff --git a/server/pnpm-workspace.yaml b/server/pnpm-workspace.yaml
index cab79d98..c98ca1f2 100644
--- a/server/pnpm-workspace.yaml
+++ b/server/pnpm-workspace.yaml
@@ -1 +1,4 @@
+overrides:
+  droplet: link:../../.local/share/pnpm/global/5/node_modules/@drop-oss/droplet
+
 shamefullyHoist: true
diff --git a/server/server/internal/metadata/giantbomb.ts b/server/server/internal/metadata/giantbomb.ts
index aa7e6d60..5a789852 100644
--- a/server/server/internal/metadata/giantbomb.ts
+++ b/server/server/internal/metadata/giantbomb.ts
@@ -191,7 +191,7 @@ export class GiantBombProvider implements MetadataProvider {
 
         const res = await publisher(pub.name);
         if (res === undefined) {
-          context?.logger.warn(`Failed to import publisher "${pub}"`);
+          context?.logger.warn(`Failed to import publisher "${pub.name}"`);
           continue;
         }
         context?.logger.info(`Imported publisher "${pub.name}"`);
@@ -208,10 +208,10 @@ export class GiantBombProvider implements MetadataProvider {
 
         const res = await developer(dev.name);
         if (res === undefined) {
-          context?.logger.warn(`Failed to import developer "${dev}"`);
+          context?.logger.warn(`Failed to import developer "${dev.name}"`);
           continue;
         }
-        context?.logger.info(`Imported developer "${dev}"`);
+        context?.logger.info(`Imported developer "${dev.name}"`);
         developers.push(res);
       }
     }