feat: import redists

pages/admin/library/import.vue

@@ -3,7 +3,7 @@
     <Listbox
       as="div"
       :model="currentlySelectedGame"
-      @update:model-value="(value) => updateSelectedGame_wrapper(value)"
+      @update:model-value="(value) => updateSelectedGame(value)"
     >
       <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100">
         {{ $t("library.admin.import.selectGame") }}
@@ -80,10 +80,93 @@
                 </span>
               </li>
             </ListboxOption>
+            <div
+              v-if="games.unimportedGames.length == 0"
+              class="w-full uppercase font-display font-bold text-zinc-600 p-2 text-center"
+            >
+              Nothing to import
+            </div>
           </ListboxOptions>
         </transition>
       </div>
     </Listbox>
+    <Listbox v-model="currentImportMode" as="div">
+      <ListboxLabel class="block text-sm font-medium leading-6 text-zinc-100">
+        Import as
+      </ListboxLabel>
+      <div class="relative mt-2">
+        <ListboxButton
+          class="relative inline-flex items-center 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 class="inline-flex items-top gap-x-2">
+            <component
+              :is="importModes[currentImportMode].icon"
+              class="text-blue-600 size-8 p-1 bg-zinc-800 rounded-sm mt-1"
+            />
+            <div>
+              <h1 class="text-sm font-bold text-zinc-200">
+                {{ importModes[currentImportMode].name }}
+              </h1>
+              <p class="text-xs text-zinc-400 max-w-xs">
+                {{ importModes[currentImportMode].description }}
+              </p>
+            </div>
+          </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-zinc-800 focus:outline-none sm:text-sm"
+          >
+            <ListboxOption
+              v-for="[mode, metadata] in Object.entries(importModes)"
+              :key="mode"
+              v-slot="{ active }"
+              as="template"
+              :value="mode"
+            >
+              <li
+                :class="[
+                  active ? 'bg-blue-600 text-white' : 'text-zinc-100',
+                  'relative cursor-default select-none py-2 pl-3 pr-9',
+                ]"
+              >
+                <span
+                  :class="[
+                    mode == currentImportMode ? 'font-semibold' : 'font-normal',
+                    'inline-flex items-center gap-x-2 block truncate py-1 w-full',
+                  ]"
+                  >{{ metadata.name }}
+
+                  <span
+                    v-if="mode == currentImportMode"
+                    :class="[
+                      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>
+                </span>
+              </li>
+            </ListboxOption>
+          </ListboxOptions>
+        </transition>
+      </div>
+    </Listbox>
+
     <div class="flex items-center justify-between gap-x-8">
       <span class="flex grow flex-col">
         <label
@@ -113,192 +196,19 @@
       </div>
     </div>
 
-    <div v-if="currentlySelectedGame !== -1" class="flex flex-col gap-y-4">
-      <!-- without metadata option -->
-      <div>
-        <LoadingButton
-          class="w-fit"
-          :loading="importLoading"
-          @click="() => importGame_wrapper(false)"
-        >
-          {{ $t("library.admin.import.withoutMetadata") }}
-        </LoadingButton>
-      </div>
-
-      <!-- divider -->
-      <div
-        class="inline-flex items-center gap-x-4 text-zinc-600 font-display font-bold"
-      >
-        <div class="h-[1px] grow bg-zinc-800" />
-        {{ $t("auth.signin.or") }}
-        <div class="h-[1px] grow bg-zinc-800" />
-      </div>
-
-      <!-- with metadata option -->
-
-      <div class="flex flex-col gap-y-4">
-        <form @submit.prevent="() => searchGame()">
-          <label
-            for="searchTerm"
-            class="block text-sm/6 font-medium text-zinc-100"
-            >{{ $t("library.admin.import.search") }}</label
-          >
-          <div class="mt-2 flex">
-            <div class="-mr-px grid grow grid-cols-1 focus-within:relative">
-              <input
-                id="searchTerm"
-                v-model="gameSearchTerm"
-                type="text"
-                name="searchTerm"
-                class="col-start-1 row-start-1 block w-full rounded-l-md bg-zinc-950 py-1.5 px-3 text-base text-zinc-100 outline-1 -outline-offset-1 outline-zinc-800 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-blue-600 sm:text-sm/6"
-                :placeholder="$t('library.admin.import.searchPlaceholder')"
-              />
-            </div>
-            <LoadingButton
-              :loading="gameSearchLoading"
-              :style="'none'"
-              type="submit"
-              class="w-24 flex shrink-0 items-center justify-center gap-x-1.5 rounded-r-md bg-zinc-950 px-3 py-2 text-sm font-semibold text-zinc-100 outline-1 -outline-offset-1 outline-zinc-800 hover:bg-zinc-900 focus:relative focus:outline-2 focus:-outline-offset-2 focus:outline-blue-600"
-            >
-              <MagnifyingGlassIcon
-                class="-ml-0.5 size-4 text-gray-400"
-                aria-hidden="true"
-              />
-              {{ $t("library.admin.import.search") }}
-            </LoadingButton>
-          </div>
-        </form>
-
-        <Listbox
-          v-if="metadataResults && metadataResults.length > 0"
-          v-model="currentlySelectedMetadata"
-          as="div"
-        >
-          <ListboxLabel
-            class="block text-sm font-medium leading-6 text-zinc-100"
-            >{{ $t("library.admin.import.selectGameSearch") }}</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">
-                {{ $t("library.admin.import.selectGamePlaceholder") }}
-              </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
-                  v-for="(result, resultIdx) in metadataResults"
-                  :key="result.id"
-                  v-slot="{ active }"
-                  as="template"
-                  :value="resultIdx"
-                >
-                  <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"
-        >
-          {{ $t("library.admin.import.loading") }}
-          <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>
-        </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
-            class="w-fit"
-            :loading="importLoading"
-            :disabled="currentlySelectedMetadata === -1"
-            @click="() => importGame_wrapper()"
-          >
-            {{ $t("library.admin.import.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>
-    </div>
+    <component
+      :is="importModes[currentImportMode].component"
+      v-if="currentlySelectedGame !== -1"
+      :game-name="games.unimportedGames[currentlySelectedGame].game"
+      :loading="importLoading"
+      :error="importError"
+      @import="(v: unknown) => importModes[currentImportMode].import(v)"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
+import { ImportGame, ImportRedist } from "#components";
 import {
   Listbox,
   ListboxButton,
@@ -306,81 +216,65 @@ import {
   ListboxOption,
   ListboxOptions,
 } from "@headlessui/vue";
-import { XCircleIcon } from "@heroicons/vue/16/solid";
 import { CheckIcon, ChevronUpDownIcon } from "@heroicons/vue/20/solid";
-import { MagnifyingGlassIcon } from "@heroicons/vue/24/outline";
+import { PuzzlePieceIcon, ArchiveBoxIcon } from "@heroicons/vue/24/solid";
+import type { FetchError } from "ofetch";
 import type { GameMetadataSearchResult } from "~/server/internal/metadata/types";
 
 definePageMeta({
   layout: "admin",
 });
 
+type ImportMode = "Game" | "Redist";
+
+const importModes = shallowRef<{
+  [key in ImportMode]: {
+    name: string;
+    description: string;
+    icon: Component;
+    component: Component;
+    import: (v: unknown) => void;
+  };
+}>({
+  Game: {
+    name: "Game",
+    description: "Games can be added to user libraries, installed, and played.",
+    icon: PuzzlePieceIcon,
+    component: ImportGame,
+    import: importGame_wrapper as (v: unknown) => void,
+  },
+  Redist: {
+    name: "Redistributable",
+    description:
+      "Redistributables are packaged dependencies for games, that are installed alongside and required to play certain games.",
+    icon: ArchiveBoxIcon,
+    component: ImportRedist,
+    import: importRedist as (v: unknown) => void,
+  },
+});
+
+const currentImportMode = ref<ImportMode>("Game");
+
 const { t } = useI18n();
 
 const rawGames = await $dropFetch("/api/v1/admin/import/game");
 const games = ref(rawGames);
 const currentlySelectedGame = ref(-1);
-const gameSearchResultsLoading = ref(false);
-const gameSearchResultsError = ref<string | undefined>();
-const gameSearchTerm = ref("");
-const gameSearchLoading = ref(false);
 const bulkImportMode = ref(false);
 
 async function updateSelectedGame(value: number) {
-  if (currentlySelectedGame.value == value) return;
-  currentlySelectedGame.value = value;
-  if (currentlySelectedGame.value == -1) return;
-  const option = games.value.unimportedGames[currentlySelectedGame.value];
+  if (currentlySelectedGame.value == value || value == -1) return;
+  const option = games.value.unimportedGames[value];
   if (!option) return;
 
-  metadataResults.value = undefined;
-  currentlySelectedMetadata.value = -1;
-  gameSearchTerm.value = option.game;
-
-  await searchGame();
+  currentlySelectedGame.value = value;
 }
 
-async function searchGame() {
-  gameSearchResultsError.value = undefined;
-  gameSearchLoading.value = true;
-  try {
-    const results = await $dropFetch(
-      `/api/v1/admin/import/game/search?q=${encodeURIComponent(gameSearchTerm.value)}`,
-    );
-    metadataResults.value = results;
-    gameSearchLoading.value = false;
-  } catch (e) {
-    gameSearchLoading.value = false;
-
-    throw e;
-  }
-}
-
-function updateSelectedGame_wrapper(value: number) {
-  gameSearchResultsLoading.value = true;
-  updateSelectedGame(value)
-    .catch((error) => {
-      gameSearchResultsError.value = error.statusMessage || t("errors.unknown");
-    })
-    .finally(() => {
-      gameSearchResultsLoading.value = false;
-    });
-}
-
-const metadataResults = ref<Array<GameMetadataSearchResult> | undefined>();
-const currentlySelectedMetadata = ref(-1);
-
 const router = useRouter();
 
 const importLoading = ref(false);
 const importError = ref<string | undefined>();
-async function importGame(useMetadata: boolean) {
-  if (!metadataResults.value && useMetadata) return;
-
-  const metadata =
-    useMetadata && metadataResults.value
-      ? metadataResults.value[currentlySelectedMetadata.value]
-      : undefined;
+async function importGame(metadata: GameMetadataSearchResult | undefined) {
   const option = games.value.unimportedGames[currentlySelectedGame.value];
 
   const { taskId } = await $dropFetch("/api/v1/admin/import/game", {
@@ -397,18 +291,52 @@ async function importGame(useMetadata: boolean) {
   } else {
     games.value.unimportedGames.splice(currentlySelectedGame.value, 1);
     currentlySelectedGame.value = -1;
-    gameSearchResultsError.value = undefined;
   }
 }
-function importGame_wrapper(metadata = true) {
+async function importGame_wrapper(
+  metadata: GameMetadataSearchResult | undefined,
+) {
   importLoading.value = true;
   importError.value = undefined;
-  importGame(metadata)
-    .catch((error) => {
-      importError.value = error?.statusMessage || t("errors.unknown");
-    })
-    .finally(() => {
-      importLoading.value = false;
+  try {
+    await importGame(metadata);
+  } catch (error) {
+    console.warn(error);
+    importError.value =
+      (error as FetchError)?.statusMessage || t("errors.unknown");
+  }
+  importLoading.value = false;
+}
+
+async function importRedist(data: object) {
+  importLoading.value = true;
+  importError.value = undefined;
+  try {
+    const option = games.value.unimportedGames[currentlySelectedGame.value];
+
+    const formData = new FormData();
+    for (const [key, value] of Object.entries(data)) {
+      formData.append(key, value);
+    }
+
+    formData.append("library", option.library.id);
+    formData.append("path", option.game);
+    const redist = await $dropFetch("/api/v1/admin/import/redist", {
+      body: formData,
+      method: "POST",
     });
+
+    if (!bulkImportMode.value) {
+      router.push(`/admin/library/r/${redist.id}`);
+    } else {
+      games.value.unimportedGames.splice(currentlySelectedGame.value, 1);
+      currentlySelectedGame.value = -1;
+    }
+  } catch (error) {
+    console.warn(error);
+    importError.value =
+      (error as FetchError)?.statusMessage || t("errors.unknown");
+  }
+  importLoading.value = false;
 }
 </script>