feat(metadata): 'manual' metadata provider

server/components/UploadFileDialog.vue

@@ -73,9 +73,6 @@
                   @click="() => uploadFile_wrapper()"
                   :class="[
                     'inline-flex w-full shadow-sm sm:ml-3 sm:w-auto',
-                    currentFile === undefined
-                      ? 'text-zinc-400 bg-blue-600/10 hover:bg-blue-600/10'
-                      : 'text-white bg-blue-600 hover:bg-blue-500',
                   ]"
                 >
                   Upload

server/pages/admin/library/[id]/import.vue

@@ -1,70 +1,39 @@
 <template>
-  <div class="flex flex-col gap-y-4">
+  <div class="flex flex-col gap-y-4 max-w-lg">
-    <Listbox
+    <Listbox as="div" v-on:update:model-value="(value) => updateCurrentlySelectedVersion(value)"
-      as="div"
+      :model-value="currentlySelectedVersion">
-      class="max-w-md"
+      <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100">Select version to import</ListboxLabel>
-      v-on:update:model-value="(value) => updateCurrentlySelectedVersion(value)"
-      :model-value="currentlySelectedVersion"
-    >
-      <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100"
-        >Select version to import</ListboxLabel
-      >
       <div class="relative mt-2">
         <ListboxButton
-          class="relative w-full cursor-default rounded-md bg-zinc-950 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-800 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm sm:leading-6"
+          class="relative w-full cursor-default rounded-md bg-zinc-950 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-800 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm sm:leading-6">
-        >
           <span v-if="currentlySelectedVersion != -1" class="block truncate">{{
             versions[currentlySelectedVersion]
           }}</span>
-          <span v-else class="block truncate text-zinc-600"
+          <span v-else class="block truncate text-zinc-600">Please select a directory...</span>
-            >Please select a directory...</span
+          <span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
-          >
+            <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
-          <span
-            class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2"
-          >
-            <ChevronUpDownIcon
-              class="h-5 w-5 text-gray-400"
-              aria-hidden="true"
-            />
           </span>
         </ListboxButton>
 
-        <transition
+        <transition leave-active-class="transition ease-in duration-100" leave-from-class="opacity-100"
-          leave-active-class="transition ease-in duration-100"
+          leave-to-class="opacity-0">
-          leave-from-class="opacity-100"
-          leave-to-class="opacity-0"
-        >
           <ListboxOptions
-            class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-zinc-800 focus:outline-none sm:text-sm"
+            class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-zinc-800 focus:outline-none sm:text-sm">
-          >
+            <ListboxOption as="template" v-for="(version, versionIdx) in versions" :key="version" :value="versionIdx"
-            <ListboxOption
+              v-slot="{ active, selected }">
-              as="template"
+              <li :class="[
-              v-for="(version, versionIdx) in versions"
+                active ? 'bg-blue-600 text-white' : 'text-zinc-100',
-              :key="version"
+                'relative cursor-default select-none py-2 pl-3 pr-9',
-              :value="versionIdx"
+              ]">
-              v-slot="{ active, selected }"
+                <span :class="[
-            >
+                  selected ? 'font-semibold' : 'font-normal',
-              <li
+                  'block truncate',
-                :class="[
+                ]">{{ version }}</span>
-                  active ? 'bg-blue-600 text-white' : 'text-zinc-100',
-                  'relative cursor-default select-none py-2 pl-3 pr-9',
-                ]"
-              >
-                <span
-                  :class="[
-                    selected ? 'font-semibold' : 'font-normal',
-                    'block truncate',
-                  ]"
-                  >{{ version }}</span
-                >
 
-                <span
+                <span v-if="selected" :class="[
-                  v-if="selected"
+                  active ? 'text-white' : 'text-blue-600',
-                  :class="[
+                  'absolute inset-y-0 right-0 flex items-center pr-4',
-                    active ? 'text-white' : 'text-blue-600',
+                ]">
-                    'absolute inset-y-0 right-0 flex items-center pr-4',
-                  ]"
-                >
                   <CheckIcon class="h-5 w-5" aria-hidden="true" />
                 </span>
               </li>
@@ -74,56 +43,31 @@
       </div>
     </Listbox>
 
-    <div class="flex flex-col gap-8 max-w-md" v-if="versionSettings">
+    <div class="flex flex-col gap-8" v-if="versionSettings">
       <div>
-        <label
+        <label for="startup" class="block text-sm font-medium leading-6 text-zinc-100">Startup
-          for="startup"
+          executable/command</label>
-          class="block text-sm font-medium leading-6 text-zinc-100"
-          >Startup executable/command</label
-        >
         <p class="text-zinc-400 text-xs">Executable to launch the game</p>
         <div class="mt-2">
           <div
-            class="flex rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600 sm:max-w-md"
+            class="flex rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600">
-          >
+            <span class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm">(install_dir)/</span>
-            <span
+            <input type="text" name="startup" id="startup" v-model="versionSettings.startup"
-              class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm"
-              >(install_dir)/</span
-            >
-            <input
-              type="text"
-              name="startup"
-              id="startup"
-              v-model="versionSettings.startup"
               class="block flex-1 border-0 py-1.5 pl-1 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
-              placeholder="my-game.exe"
+              placeholder="my-game.exe" />
-            />
           </div>
         </div>
       </div>
       <div>
-        <label
+        <label for="startup" class="block text-sm font-medium leading-6 text-zinc-100">Setup executable/command</label>
-          for="startup"
-          class="block text-sm font-medium leading-6 text-zinc-100"
-          >Setup executable/command</label
-        >
         <p class="text-zinc-400 text-xs">Ran once when the game is installed</p>
         <div class="mt-2">
           <div
-            class="flex rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600 sm:max-w-md"
+            class="flex rounded-md shadow-sm bg-zinc-950 ring-1 ring-inset ring-zinc-800 focus-within:ring-2 focus-within:ring-inset focus-within:ring-blue-600">
-          >
+            <span class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm">(install_dir)/</span>
-            <span
+            <input type="text" name="startup" id="startup" v-model="versionSettings.setup"
-              class="flex select-none items-center pl-3 text-zinc-500 sm:text-sm"
-              >(install_dir)/</span
-            >
-            <input
-              type="text"
-              name="startup"
-              id="startup"
-              v-model="versionSettings.setup"
               class="block flex-1 border-0 py-1.5 pl-1 bg-transparent text-zinc-100 placeholder:text-zinc-400 focus:ring-0 sm:text-sm sm:leading-6"
-              placeholder="setup.exe"
+              placeholder="setup.exe" />
-            />
           </div>
         </div>
       </div>
@@ -132,39 +76,26 @@
       </PlatformSelector>
       <SwitchGroup as="div" class="flex items-center justify-between">
         <span class="flex flex-grow flex-col">
-          <SwitchLabel
+          <SwitchLabel as="span" class="text-sm font-medium leading-6 text-zinc-100" passive>Update mode</SwitchLabel>
-            as="span"
+          <SwitchDescription as="span" class="text-sm text-zinc-400">When enabled, these files will be installed on top
-            class="text-sm font-medium leading-6 text-zinc-100"
+            of (overwriting)
-            passive
-            >Update mode</SwitchLabel
-          >
-          <SwitchDescription as="span" class="text-sm text-zinc-400"
-            >When enabled, these files will be installed on top of (overwriting)
             the previous version's. If multiple "update modes" are chained
-            together, they are applied in order.</SwitchDescription
+            together, they are applied in order.</SwitchDescription>
-          >
         </span>
-        <Switch
+        <Switch v-model="delta" :class="[
-          v-model="delta"
+          delta ? 'bg-blue-600' : 'bg-zinc-800',
-          :class="[
+          'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
-            delta ? 'bg-blue-600' : 'bg-zinc-800',
+        ]">
-            'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
+          <span aria-hidden="true" :class="[
-          ]"
+            delta ? 'translate-x-5' : 'translate-x-0',
-        >
+            'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
-          <span
+          ]" />
-            aria-hidden="true"
-            :class="[
-              delta ? 'translate-x-5' : 'translate-x-0',
-              'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
-            ]"
-          />
         </Switch>
       </SwitchGroup>
       <Disclosure as="div" class="py-2" v-slot="{ open }">
         <dt>
           <DisclosureButton
-            class="flex w-full items-start justify-between text-left text-zinc-100"
+            class="border-b border-zinc-600 pb-2 flex w-full items-start justify-between text-left text-zinc-100">
-          >
             <span class="text-base/7 font-semibold">Advanced options</span>
             <span class="ml-6 flex h-7 items-center">
               <ChevronUpIcon v-if="!open" class="size-6" aria-hidden="true" />
@@ -172,65 +103,45 @@
             </span>
           </DisclosureButton>
         </dt>
-        <DisclosurePanel as="dd" class="mt-2 flex flex-col gap-y-4">
+        <DisclosurePanel as="dd" class="bg-zinc-950/30 p-3 rounded-b-lg mt-2 flex flex-col gap-y-4">
-          <SwitchGroup as="div" class="flex items-center justify-between">
+          <!-- UMU launcher configuration -->
-            <span class="flex flex-grow flex-col">
+          <div v-if="versionSettings.platform == PlatformClient.Linux" class="flex flex-col gap-y-4">
-              <SwitchLabel
+            <SwitchGroup as="div" class="flex items-center justify-between">
-                as="span"
+              <span class="flex flex-grow flex-col">
-                class="text-sm font-medium leading-6 text-zinc-100"
+                <SwitchLabel as="span" class="text-sm font-medium leading-6 text-zinc-100" passive>Override UMU Launcher
-                passive
+                  Game ID</SwitchLabel>
-                >Override UMU Launcher Game ID</SwitchLabel
+                <SwitchDescription as="span" class="text-sm text-zinc-400">By default, Drop uses a non-ID when launching
-              >
+                  with UMU
-              <SwitchDescription as="span" class="text-sm text-zinc-400"
+                  Launcher. In order to get the right patches for some games, you
-                >By default, Drop uses a non-ID when launching with UMU
+                  may have to manually set this field.</SwitchDescription>
-                Launcher. In order to get the right patches for some games, you
+              </span>
-                may have to manually set this field.</SwitchDescription
+              <Switch v-model="umuIdEnabled" :class="[
-              >
-            </span>
-            <Switch
-              v-model="umuIdEnabled"
-              :class="[
                 umuIdEnabled ? 'bg-blue-600' : 'bg-zinc-800',
                 'relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2',
-              ]"
+              ]">
-            >
+                <span aria-hidden="true" :class="[
-              <span
-                aria-hidden="true"
-                :class="[
                   umuIdEnabled ? 'translate-x-5' : 'translate-x-0',
                   'pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out',
-                ]"
+                ]" />
-              />
+              </Switch>
-            </Switch>
+            </SwitchGroup>
-          </SwitchGroup>
+            <div>
-          <div>
+              <label for="umu-id" class="block text-sm font-medium leading-6 text-zinc-100">UMU Launcher ID</label>
-            <label
+              <div class="mt-2">
-              for="umu-id"
+                <input id="umu-id" name="umu-id" type="text" autocomplete="umu-id" required :disabled="!umuIdEnabled"
-              class="block text-sm font-medium leading-6 text-zinc-100"
+                  v-model="umuId" placeholder="umu-starcitizen"
-              >UMU Launcher ID</label
+                  class="block w-full rounded-md border-0 py-1.5 px-3 bg-zinc-950 disabled:bg-zinc-900/80 text-zinc-100 disabled:text-zinc-400 shadow-sm ring-1 ring-inset ring-zinc-700 disabled:ring-zinc-800 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6" />
-            >
+              </div>
-            <div class="mt-2">
-              <input
-                id="umu-id"
-                name="umu-id"
-                type="text"
-                autocomplete="umu-id"
-                required
-                :disabled="!umuIdEnabled"
-                v-model="umuId"
-                placeholder="umu-starcitizen"
-                class="block w-full rounded-md border-0 py-1.5 px-3 bg-zinc-950 disabled:bg-zinc-900/80 text-zinc-100 disabled:text-zinc-400 shadow-sm ring-1 ring-inset ring-zinc-700 disabled:ring-zinc-800 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 sm:text-sm sm:leading-6"
-              />
             </div>
           </div>
+
+          <div v-else class="text-zinc-400">
+            No advanced options for this configuration.
+          </div>
         </DisclosurePanel>
       </Disclosure>
 
-      <LoadingButton
+      <LoadingButton @click="startImport_wrapper" class="w-fit" :loading="importLoading">
-        @click="startImport_wrapper"
-        class="w-fit"
-        :loading="importLoading"
-      >
         Import
       </LoadingButton>
       <div v-if="importError" class="mt-4 w-fit rounded-md bg-red-600/10 p-4">
@@ -246,27 +157,17 @@
         </div>
       </div>
     </div>
-    <div
+    <div v-else-if="currentlySelectedVersion != -1" role="status"
-      v-else-if="currentlySelectedVersion != -1"
+      class="inline-flex text-zinc-100 font-display font-semibold items-center gap-x-4">
-      role="status"
-      class="inline-flex text-zinc-100 font-display font-semibold items-center gap-x-4"
-    >
       Loading version metadata...
-      <svg
+      <svg aria-hidden="true" class="w-6 h-6 text-transparent animate-spin fill-white" viewBox="0 0 100 101" fill="none"
-        aria-hidden="true"
+        xmlns="http://www.w3.org/2000/svg">
-        class="w-6 h-6 text-transparent animate-spin fill-white"
-        viewBox="0 0 100 101"
-        fill="none"
-        xmlns="http://www.w3.org/2000/svg"
-      >
         <path
           d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-          fill="currentColor"
+          fill="currentColor" />
-        />
         <path
           d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-          fill="currentFill"
+          fill="currentFill" />
-        />
       </svg>
       <span class="sr-only">Loading...</span>
     </div>

server/pages/admin/library/[id]/index.vue

@@ -1,8 +1,5 @@
 <template>
-    <div
+    <div v-if="game && unimportedVersions !== undefined" class="grid grid-cols-2 gap-16">
-        v-if="game && unimportedVersions !== undefined"
-        class="grid grid-cols-2 gap-16"
-    >
         <div class="grow">
             <h1 class="mt-4 text-5xl font-bold font-display text-zinc-100">
                 {{ game.mName }}
@@ -11,110 +8,66 @@
                 {{ game.mShortDescription }}
             </p>
 
-            <div
+            <div v-html="descriptionHTML" class="mt-5 pt-5 border-t border-zinc-700 prose prose-invert prose-blue">
-                v-html="descriptionHTML"
+            </div>
-                class="mt-5 pt-5 border-t border-zinc-700 prose prose-invert prose-blue"
-            ></div>
         </div>
         <div class="space-y-8">
-            <div class="px-4 py-3 bg-gray-950 rounded">
+            <div>
                 <div class="border-b border-zinc-800 pb-3">
-                    <div
+                    <div class="flex flex-wrap items-center justify-between sm:flex-nowrap">
-                        class="flex flex-wrap items-center justify-between sm:flex-nowrap"
+                        <h3 class="text-base font-semibold font-display leading-6 text-zinc-100">
-                    >
-                        <h3
-                            class="text-base font-semibold font-display leading-6 text-zinc-100"
-                        >
                             Images
                         </h3>
                         <div class="flex-shrink-0">
-                            <button
+                            <button @click="() => (showUploadModal = true)" type="button"
-                                @click="() => (showUploadModal = true)"
+                                class="relative inline-flex items-center rounded-md bg-blue-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600">
-                                type="button"
-                                class="relative inline-flex items-center rounded-md bg-blue-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600"
-                            >
                                 Upload
                             </button>
                         </div>
                     </div>
                 </div>
                 <div class="mt-3 grid grid-cols-2 grid-flow-dense gap-8">
-                    <div
+                    <div v-for="(image, imageIdx) in game.mImageLibrary" :key="image"
-                        v-for="(image, imageIdx) in game.mImageLibrary"
+                        class="group relative flex items-center">
-                        :key="image"
-                        class="group relative flex items-center"
-                    >
                         <img :src="useObject(image)" class="w-full h-auto" />
                         <div
-                            class="transition-all opacity-0 group-hover:opacity-100 absolute flex flex-col gap-y-1 top-1 right-1 bg-zinc-950/50 rounded-xl p-2"
+                            class="transition-all opacity-0 group-hover:opacity-100 absolute inset-0 flex flex-col items-center justify-center gap-y-2 bg-zinc-950/50">
-                        >
+                            <button v-if="image !== game.mBannerId" @click="() => updateBannerImage(image)"
-                            <button
-                                v-if="image !== game.mBannerId"
-                                @click="() => updateBannerImage(image)"
                                 type="button"
-                                class="inline-flex items-center gap-x-1.5 rounded-md bg-blue-600 px-1.5 py-0.5 text-sm font-semibold text-white shadow-sm hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600"
+                                class="inline-flex items-center gap-x-1.5 rounded-md bg-blue-600 px-1.5 py-0.5 text-sm font-semibold text-white shadow-sm hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600">
-                            >
                                 Set as banner
                             </button>
-                            <button
+                            <button v-if="image !== game.mCoverId" @click="() => updateCoverImage(image)" type="button"
-                                v-if="image !== game.mCoverId"
+                                class="inline-flex items-center gap-x-1.5 rounded-md bg-blue-600 px-1.5 py-0.5 text-sm font-semibold text-white shadow-sm hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600">
-                                @click="() => updateCoverImage(image)"
-                                type="button"
-                                class="inline-flex items-center gap-x-1.5 rounded-md bg-blue-600 px-1.5 py-0.5 text-sm font-semibold text-white shadow-sm hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-600"
-                            >
                                 Set as cover
                             </button>
-                            <button
+                            <button @click="() => deleteImage(image)" type="button"
-                                @click="() => deleteImage(image)"
+                                class="inline-flex items-center gap-x-1.5 rounded-md bg-red-600 px-1.5 py-0.5 text-sm font-semibold text-white shadow-sm hover:bg-red-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-600">
-                                type="button"
-                                class="inline-flex items-center gap-x-1.5 rounded-md bg-red-600 px-1.5 py-0.5 text-sm font-semibold text-white shadow-sm hover:bg-red-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-600"
-                            >
                                 Delete image
                             </button>
                         </div>
-                        <div
+                        <div v-if="image === game.mBannerId || image === game.mCoverId"
-                            v-if="
+                            class="absolute bottom-0 left-0 bg-zinc-950/75 text-zinc-100 text-sm font-semibold px-2 py-1 rounded-tr">
-                                image === game.mBannerId &&
+                            current {{ [image === game.mBannerId ? 'banner' : undefined, image === game.mCoverId ?
-                                image === game.mCoverId
+                                'cover' : undefined].filter((e) => e).join(" & ") }}
-                            "
-                            class="absolute bottom-0 left-0 bg-zinc-950/75 text-zinc-100 text-sm font-semibold px-2 py-1 rounded-tr"
-                        >
-                            current banner & cover
-                        </div>
-                        <div
-                            v-else-if="image === game.mCoverId"
-                            class="absolute bottom-0 left-0 bg-zinc-950/75 text-zinc-100 text-sm font-semibold px-2 py-1 rounded-tr"
-                        >
-                            current cover
-                        </div>
-                        <div
-                            v-else-if="image === game.mBannerId"
-                            class="absolute bottom-0 left-0 bg-zinc-950/75 text-zinc-100 text-sm font-semibold px-2 py-1 rounded-tr"
-                        >
-                            current banner
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="py-5 px-6 bg-gray-950 rounded">
+            <div>
-                <h1 class="text-2xl font-semibold font-display text-zinc-100">
+                <div class="border-b border-zinc-800 pb-3">
-                    Manage version order
+                    <div class="flex flex-wrap items-center justify-between sm:flex-nowrap">
-                </h1>
+                        <h3 class="text-base font-semibold font-display leading-6 text-zinc-100">
-                <div class="text-center w-full text-sm text-zinc-600">
+                            Version priority
-                    lowest
+                        </h3>
+                    </div>
                 </div>
-                <draggable
+
-                    @update="() => updateVersionOrder()"
+                <div class="mt-4 text-center w-full text-sm text-zinc-600">lowest</div>
-                    :list="game.versions"
+                <draggable @update="() => updateVersionOrder()" :list="game.versions" handle=".handle"
-                    handle=".handle"
+                    class="mt-2 space-y-4">
-                    class="mt-2 space-y-4"
+                    <template #item="{ element: item }: { element: GameVersion }">
-                >
+                        <div class="w-full inline-flex items-center px-4 py-2 bg-zinc-900 rounded justify-between">
-                    <template
-                        #item="{ element: item }: { element: GameVersion }"
-                    >
-                        <div
-                            class="w-full inline-flex items-center px-4 py-2 bg-zinc-900 rounded justify-between"
-                        >
                             <div class="text-zinc-100 font-semibold">
                                 {{ item.versionName }}
                             </div>
@@ -122,51 +75,31 @@
                                 {{ item.delta ? "Upgrade mode" : "" }}
                             </div>
                             <div class="inline-flex gap-x-2">
-                                <Bars3Icon
+                                <Bars3Icon class="cursor-move w-6 h-6 text-zinc-400 handle" />
-                                    class="cursor-move w-6 h-6 text-zinc-400 handle"
+                                <button @click="() => deleteVersion(item.versionName)">
-                                />
-                                <button
-                                    @click="
-                                        () => deleteVersion(item.versionName)
-                                    "
-                                >
                                     <TrashIcon class="w-5 h-5 text-red-600" />
                                 </button>
                             </div>
                         </div>
                     </template>
                 </draggable>
-                <div
+                <div class="text-center font-bold text-zinc-400 my-3" v-if="game.versions.length == 0">
-                    class="text-center font-bold text-zinc-400 my-3"
-                    v-if="game.versions.length == 0"
-                >
                     no versions added
                 </div>
-                <div class="mt-2 text-center w-full text-sm text-zinc-600">
+                <div class="mt-2 text-center w-full text-sm text-zinc-600">highest</div>
-                    highest
-                </div>
             </div>
-            <div
+            <div v-if="unimportedVersions.length > 0" class="rounded-md bg-blue-600/10 p-4">
-                v-if="unimportedVersions.length > 0"
-                class="rounded-md bg-blue-600/10 p-4"
-            >
                 <div class="flex">
                     <div class="flex-shrink-0">
-                        <InformationCircleIcon
+                        <InformationCircleIcon class="h-5 w-5 text-blue-400" aria-hidden="true" />
-                            class="h-5 w-5 text-blue-400"
-                            aria-hidden="true"
-                        />
                     </div>
                     <div class="ml-3 flex-1 md:flex md:justify-between">
                         <p class="text-sm text-blue-400">
-                            Drop has detected you have new verions of this game
+                            Drop has detected you have new verions of this game to import.
-                            to import.
                         </p>
                         <p class="mt-3 text-sm md:ml-6 md:mt-0">
-                            <NuxtLink
+                            <NuxtLink :href="`/admin/library/${game.id}/import`"
-                                :href="`/admin/library/${game.id}/import`"
+                                class="whitespace-nowrap font-medium text-blue-400 hover:text-blue-500">
-                                class="whitespace-nowrap font-medium text-blue-400 hover:text-blue-500"
-                            >
                                 Import
                                 <span aria-hidden="true"> &rarr;</span>
                             </NuxtLink>
@@ -176,21 +109,15 @@
             </div>
         </div>
     </div>
-    <UploadFileDialog
+    <UploadFileDialog v-model="showUploadModal" :options="{ id: game.id }" accept="image/*"
-        v-model="showUploadModal"
+        endpoint="/api/v1/admin/game/image" @upload="(result) => uploadAfterImageUpload(result)" />
-        :options="{ id: game.id }"
-        accept="image/*"
-        endpoint="/api/v1/admin/game/image"
-        @upload="(result) => uploadAfterImageUpload(result)"
-    />
 </template>
 
 <script setup lang="ts">
 import { InformationCircleIcon } from "@heroicons/vue/20/solid";
 import { Bars3Icon, TrashIcon } from "@heroicons/vue/16/solid";
 import type { Game, GameVersion } from "@prisma/client";
-import {micromark} from 'micromark';
+import { micromark } from "micromark";
-import UploadFileDialog from "~/components/UploadFileDialog.vue";
 
 definePageMeta({
     layout: "admin",
@@ -205,7 +132,7 @@ const { game: rawGame, unimportedVersions } = await $fetch(
     `/api/v1/admin/game?id=${encodeURIComponent(gameId)}`,
     {
         headers,
-    },
+    }
 );
 const game = ref(rawGame);
 
@@ -244,7 +171,7 @@ async function deleteImage(id: string) {
                 gameId: game.value.id,
                 imageId: id,
             },
-        },
+        }
     );
     game.value.mImageLibrary = mImageLibrary;
     game.value.mBannerId = mBannerId;
@@ -265,7 +192,7 @@ async function deleteVersion(versionName: string) {
     });
     game.value.versions.splice(
         game.value.versions.findIndex((e) => e.versionName === versionName),
-        1,
+        1
     );
 }
 

server/pages/admin/library/import.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="flex flex-col gap-y-4">
+  <div class="flex flex-col gap-y-6 w-full max-w-md">
-    <Listbox as="div" class="max-w-md" v-on:update:model-value="(value) => updateSelectedGame_wrapper(value)"
+    <Listbox as="div" v-on:update:model-value="(value) => updateSelectedGame_wrapper(value)"
       :model="currentlySelectedGame">
       <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100">Select game to import</ListboxLabel>
       <div class="relative mt-2">
@@ -43,77 +43,97 @@
       </div>
     </Listbox>
 
-    <Listbox as="div" class="max-w-md" v-if="metadataResults && metadataResults.length > 0"
+    <div v-if="currentlySelectedGame !== -1" class="flex flex-col gap-y-4">
-      v-model="currentlySelectedMetadata">
+      <!-- without metadata option -->
-      <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100">Select game</ListboxLabel>
+      <div>
-      <div class="relative mt-2">
+        <LoadingButton @click="() => importGame_wrapper(false)" class="w-fit" :loading="importLoading">Import without
-        <ListboxButton
+          metadata
-          class="relative w-full cursor-default rounded-md bg-zinc-950 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-800 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm sm:leading-6">
+        </LoadingButton>
-          <GameSearchResultWidget v-if="currentlySelectedMetadata != -1"
-            :game="metadataResults[currentlySelectedMetadata]" />
-          <span v-else class="block truncate text-zinc-600">Please select a game...</span>
-          <span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
-            <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
-          </span>
-        </ListboxButton>
 
-        <transition leave-active-class="transition ease-in duration-100" leave-from-class="opacity-100"
-          leave-to-class="opacity-0">
-          <ListboxOptions
-            class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm">
-            <ListboxOption as="template" v-for="(result, resultIdx) in metadataResults" :key="result.id"
-              :value="resultIdx" v-slot="{ active, selected }">
-              <li :class="[
-                active ? 'bg-blue-600 text-white' : 'text-zinc-100',
-                'relative cursor-default select-none py-2 pl-3 pr-9',
-              ]">
-                <GameSearchResultWidget :game="result" />
-              </li>
-            </ListboxOption>
-          </ListboxOptions>
-        </transition>
       </div>
-    </Listbox>
-    <div v-else-if="gameSearchResultsLoading" role="status"
-      class="inline-flex text-zinc-100 font-display font-semibold items-center gap-x-4">
-      Loading game results...
-      <svg aria-hidden="true" class="w-6 h-6 text-transparent animate-spin fill-white" viewBox="0 0 100 101" fill="none"
-        xmlns="http://www.w3.org/2000/svg">
-        <path
-          d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-          fill="currentColor" />
-        <path
-          d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-          fill="currentFill" />
-      </svg>
-      <span class="sr-only">Loading...</span>
-    </div>
 
-    <div v-if="gameSearchResultsError" class="w-fit rounded-md bg-red-600/10 p-4">
+      <!-- divider -->
-      <div class="flex">
+      <div class="inline-flex items-center gap-x-4 text-zinc-600 font-display font-bold">
-        <div class="flex-shrink-0">
+        <div class="h-[1px] grow bg-zinc-800" />OR
-          <XCircleIcon class="h-5 w-5 text-red-600" aria-hidden="true" />
+        <div class="h-[1px] grow bg-zinc-800" />
-        </div>
-        <div class="ml-3">
-          <h3 class="text-sm font-medium text-red-600">
-            {{ gameSearchResultsError }}
-          </h3>
-        </div>
       </div>
-    </div>
 
-    <div v-if="currentlySelectedGame !== -1 && currentlySelectedMetadata !== -1">
+      <!-- with metadata option -->
-      <LoadingButton @click="() => importGame_wrapper()" class="w-fit" :loading="importLoading">Import</LoadingButton>
+      <div class="flex flex-col gap-y-4">
+        <Listbox as="div" v-if="metadataResults && metadataResults.length > 0" v-model="currentlySelectedMetadata">
+          <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100">Select game</ListboxLabel>
+          <div class="relative mt-2">
+            <ListboxButton
+              class="relative w-full cursor-default rounded-md bg-zinc-950 py-1.5 pl-3 pr-10 text-left text-zinc-100 shadow-sm ring-1 ring-inset ring-zinc-800 focus:outline-none focus:ring-2 focus:ring-blue-600 sm:text-sm sm:leading-6">
+              <GameSearchResultWidget v-if="currentlySelectedMetadata != -1"
+                :game="metadataResults[currentlySelectedMetadata]" />
+              <span v-else class="block truncate text-zinc-600">Please select a game...</span>
+              <span class="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
+                <ChevronUpDownIcon class="h-5 w-5 text-gray-400" aria-hidden="true" />
+              </span>
+            </ListboxButton>
 
-      <div v-if="importError" class="mt-4 w-fit rounded-md bg-red-600/10 p-4">
+            <transition leave-active-class="transition ease-in duration-100" leave-from-class="opacity-100"
-        <div class="flex">
+              leave-to-class="opacity-0">
-          <div class="flex-shrink-0">
+              <ListboxOptions
-            <XCircleIcon class="h-5 w-5 text-red-600" aria-hidden="true" />
+                class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md bg-zinc-900 py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm">
+                <ListboxOption as="template" v-for="(result, resultIdx) in metadataResults" :key="result.id"
+                  :value="resultIdx" v-slot="{ active, selected }">
+                  <li :class="[
+                    active ? 'bg-blue-600 text-white' : 'text-zinc-100',
+                    'relative cursor-default select-none py-2 pl-3 pr-9',
+                  ]">
+                    <GameSearchResultWidget :game="result" />
+                  </li>
+                </ListboxOption>
+              </ListboxOptions>
+            </transition>
           </div>
-          <div class="ml-3">
+        </Listbox>
-            <h3 class="text-sm font-medium text-red-600">
+        <div v-else-if="gameSearchResultsLoading" role="status"
-              {{ importError }}
+          class="inline-flex text-zinc-100 font-display font-semibold items-center gap-x-4">
-            </h3>
+          Loading game results...
+          <svg aria-hidden="true" class="w-6 h-6 text-transparent animate-spin fill-white" viewBox="0 0 100 101"
+            fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path
+              d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+              fill="currentColor" />
+            <path
+              d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+              fill="currentFill" />
+          </svg>
+          <span class="sr-only">Loading...</span>
+        </div>
+
+        <div v-if="gameSearchResultsError" class="w-fit rounded-md bg-red-600/10 p-4">
+          <div class="flex">
+            <div class="flex-shrink-0">
+              <XCircleIcon class="h-5 w-5 text-red-600" aria-hidden="true" />
+            </div>
+            <div class="ml-3">
+              <h3 class="text-sm font-medium text-red-600">
+                {{ gameSearchResultsError }}
+              </h3>
+            </div>
+          </div>
+        </div>
+
+        <div>
+          <LoadingButton @click="() => importGame_wrapper()" class="w-fit" :loading="importLoading"
+            :disabled="currentlySelectedMetadata === -1">Import
+          </LoadingButton>
+
+          <div v-if="importError" class="mt-4 w-fit rounded-md bg-red-600/10 p-4">
+            <div class="flex">
+              <div class="flex-shrink-0">
+                <XCircleIcon class="h-5 w-5 text-red-600" aria-hidden="true" />
+              </div>
+              <div class="ml-3">
+                <h3 class="text-sm font-medium text-red-600">
+                  {{ importError }}
+                </h3>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -176,23 +196,23 @@ const router = useRouter();
 
 const importLoading = ref(false);
 const importError = ref<string | undefined>();
-async function importGame() {
+async function importGame(metadata: boolean) {
   if (!metadataResults.value) return;
 
   const game = await $fetch("/api/v1/admin/import/game", {
     method: "POST",
     body: {
       path: games.unimportedGames[currentlySelectedGame.value],
-      metadata: metadataResults.value[currentlySelectedMetadata.value],
+      metadata: metadata ? metadataResults.value[currentlySelectedMetadata.value] : undefined,
     },
   });
 
   router.push(`/admin/library/${game.id}`);
 }
-function importGame_wrapper() {
+function importGame_wrapper(metadata = true) {
   importLoading.value = true;
   importError.value = undefined;
-  importGame()
+  importGame(metadata)
     .catch((error) => {
       importError.value = error?.statusMessage || "An unknown error occurred.";
     })

server/pages/admin/library/index.vue

@@ -66,7 +66,7 @@
       >
         <div class="flex flex-1 flex-row p-4 gap-x-4">
           <img
-            class="mx-auto h-16 w-16 flex-shrink-0 rounded-md"
+            class="h-16 w-16 flex-shrink-0 rounded-md"
             :src="useObject(game.mIconId)"
             alt=""
           />

server/prisma/migrations/20241226065709_rename_custom_to_manual/migration.sql

@@ -0,0 +1,16 @@
+/*
+  Warnings:
+
+  - The values [Custom] on the enum `MetadataSource` will be removed. If these variants are still used in the database, this will fail.
+
+*/
+-- AlterEnum
+BEGIN;
+CREATE TYPE "MetadataSource_new" AS ENUM ('Manual', 'GiantBomb');
+ALTER TABLE "Game" ALTER COLUMN "metadataSource" TYPE "MetadataSource_new" USING ("metadataSource"::text::"MetadataSource_new");
+ALTER TABLE "Developer" ALTER COLUMN "metadataSource" TYPE "MetadataSource_new" USING ("metadataSource"::text::"MetadataSource_new");
+ALTER TABLE "Publisher" ALTER COLUMN "metadataSource" TYPE "MetadataSource_new" USING ("metadataSource"::text::"MetadataSource_new");
+ALTER TYPE "MetadataSource" RENAME TO "MetadataSource_old";
+ALTER TYPE "MetadataSource_new" RENAME TO "MetadataSource";
+DROP TYPE "MetadataSource_old";
+COMMIT;

server/prisma/schema/content.prisma

@@ -1,5 +1,5 @@
 enum MetadataSource {
-    Custom
+    Manual
     GiantBomb
 }
 

server/server/api/v1/admin/import/game/index.post.ts

@@ -18,11 +18,6 @@ export default defineEventHandler(async (h3) => {
       statusCode: 400,
       statusMessage: "Path missing from body",
     });
-  if (!metadata.id || !metadata.sourceId)
-    throw createError({
-      statusCode: 400,
-      statusMessage: "Metadata IDs missing from body",
-    });
 
   const validPath = await libraryManager.checkUnimportedGamePath(path);
   if (!validPath)
@@ -31,6 +26,9 @@ export default defineEventHandler(async (h3) => {
       statusMessage: "Invalid unimported game path",
     });
 
-  const game = await h3.context.metadataHandler.createGame(metadata, path);
+  if (!metadata || !metadata.id || !metadata.sourceId) {
-  return game;
+    return await h3.context.metadataHandler.createGameWithoutMetadata(path);
+  } else {
+    return await h3.context.metadataHandler.createGame(metadata, path);
+  }
 });

server/server/internal/metadata/index.ts

@@ -76,6 +76,21 @@ export class MetadataHandler {
     return successfulResults;
   }
 
+  async createGameWithoutMetadata(libraryBasePath: string) {
+    return await this.createGame(
+      {
+        id: "",
+        name: libraryBasePath,
+        icon: "",
+        description: "",
+        year: 0,
+        sourceId: "manual",
+        sourceName: "Manual",
+      },
+      libraryBasePath
+    );
+  }
+
   async createGame(
     result: InternalGameMetadataResult,
     libraryBasePath: string
@@ -103,6 +118,7 @@ export class MetadataHandler {
     try {
       metadata = await provider.fetchGame({
         id: result.id,
+        name: result.name,
         // wrap in anonymous functions to keep references to this
         publisher: (name: string) => this.fetchPublisher(name),
         developer: (name: string) => this.fetchDeveloper(name),

server/server/internal/metadata/manual.ts

@@ -0,0 +1,63 @@
+import { MetadataSource } from "@prisma/client";
+import { MetadataProvider } from ".";
+import {
+  GameMetadataSearchResult,
+  _FetchGameMetadataParams,
+  GameMetadata,
+  _FetchPublisherMetadataParams,
+  PublisherMetadata,
+  _FetchDeveloperMetadataParams,
+  DeveloperMetadata,
+} from "./types";
+import * as jdenticon from "jdenticon";
+
+export class ManualMetadataProvider implements MetadataProvider {
+  id() {
+    return "manual";
+  }
+  name() {
+    return "Manual";
+  }
+  source() {
+    return MetadataSource.Manual;
+  }
+  async search(query: string) {
+    return [];
+  }
+  async fetchGame({
+    name,
+    publisher,
+    developer,
+    createObject,
+  }: _FetchGameMetadataParams): Promise<GameMetadata> {
+    const icon = jdenticon.toPng(name, 512);
+    const iconId = createObject(icon);
+
+    return {
+      id: "manual",
+      name,
+      shortDescription: "Default description.",
+      description: "# Default description.",
+      released: new Date(),
+      publishers: [],
+      developers: [],
+      reviewCount: 0,
+      reviewRating: 0,
+
+      icon: iconId,
+      coverId: iconId,
+      bannerId: iconId,
+      images: [iconId],
+    };
+  }
+  async fetchPublisher(
+    params: _FetchPublisherMetadataParams
+  ): Promise<PublisherMetadata> {
+    throw new Error("Method not implemented.");
+  }
+  async fetchDeveloper(
+    params: _FetchDeveloperMetadataParams
+  ): Promise<DeveloperMetadata> {
+    throw new Error("Method not implemented.");
+  }
+}

server/server/plugins/metadata.ts

@@ -1,22 +1,25 @@
 import { MetadataHandler, MetadataProvider } from "../internal/metadata";
 import { GiantBombProvider } from "../internal/metadata/giantbomb";
+import { ManualMetadataProvider } from "../internal/metadata/manual";
 
 export const metadataHandler = new MetadataHandler();
 
-const providerCreators: Array<() => MetadataProvider> = [() => new GiantBombProvider()];
+const providerCreators: Array<() => MetadataProvider> = [
+  () => new GiantBombProvider(),
+  () => new ManualMetadataProvider(),
+];
 
 export default defineNitroPlugin(async (nitro) => {
-    for (const creator of providerCreators) {
+  for (const creator of providerCreators) {
-        try {
+    try {
-            const instance = creator();
+      const instance = creator();
-            metadataHandler.addProvider(instance);
+      metadataHandler.addProvider(instance);
-        }
+    } catch (e) {
-        catch (e) {
+      console.warn(e);
-            console.warn(e);
-        }
     }
+  }
 
-    nitro.hooks.hook('request', (h3) => {
+  nitro.hooks.hook("request", (h3) => {
-        h3.context.metadataHandler = metadataHandler;
+    h3.context.metadataHandler = metadataHandler;
-    })
+  });
 });