chore: Add "Under Construction" page for community and news

Signed-off-by: quexeky <git@quexeky.dev>

.github/workflows/release.yml

@@ -51,9 +51,40 @@ jobs:
         if: matrix.platform == 'ubuntu-22.04' || matrix.platform == 'ubuntu-22.04-arm' # This must match the platform value defined above.
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf xdg-utils
         # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
 
+
+      - name: Import Apple Developer Certificate
+        if: matrix.platform == 'macos-latest'
+        env:
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
+          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+          security set-keychain-settings -t 3600 -u build.keychain
+          
+          curl https://droposs.org/drop.crt --output drop.pem
+          sudo security authorizationdb write com.apple.trust-settings.user allow
+          security add-trusted-cert -r trustRoot -k build.keychain -p codeSign -u -1 drop.pem
+          sudo security authorizationdb remove com.apple.trust-settings.user
+
+          security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
+          security find-identity -v -p codesigning build.keychain
+
+      - name: Verify Certificate
+        if: matrix.platform == 'macos-latest'
+        run: |
+          CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep "Drop OSS")
+          CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}')
+          echo "CERT_ID=$CERT_ID" >> $GITHUB_ENV
+          echo "Certificate imported. Using identity: $CERT_ID"
+
       - name: install frontend dependencies
         run: yarn install # change this to npm, pnpm or bun depending on which one you use.
 
@@ -62,11 +93,12 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
           APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_SIGNING_IDENTITY: ${{ env.APPLE_SIGNING_IDENTITY }}
+          APPLE_SIGNING_IDENTITY: ${{ env.CERT_ID }}
+          NO_STRIP: true
         with:
           tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'Auto-release v__VERSION__'
           releaseBody: 'See the assets to download this version and install. This release was created automatically.'
           releaseDraft: false
           prerelease: true
-          args: ${{ matrix.args }}
+          args: ${{ matrix.args }}

.gitignore

@@ -26,4 +26,7 @@ dist-ssr
 .output
 
 src-tauri/flamegraph.svg
-src-tauri/perf*
+src-tauri/perf*
+
+/*.AppImage
+/squashfs-root

.gitmodules

@@ -1,9 +1,6 @@
-[submodule "drop-base"]
-	path = drop-base
-	url = https://github.com/drop-oss/drop-base
 [submodule "src-tauri/tailscale/libtailscale"]
 	path = src-tauri/tailscale/libtailscale
 	url = https://github.com/tailscale/libtailscale.git
-[submodule "src-tauri/umu/umu-launcher"]
+[submodule "libs/drop-base"]
-	path = src-tauri/umu/umu-launcher
+	path = libs/drop-base
-	url = https://github.com/Open-Wine-Components/umu-launcher.git
+	url = https://github.com/drop-oss/drop-base.git

build.mjs

@@ -0,0 +1,48 @@
+import fs from "fs";
+import process from "process";
+import childProcess from "child_process";
+import createLogger from "pino";
+
+const OUTPUT = "./.output";
+const logger = createLogger({ transport: { target: "pino-pretty" } });
+
+async function spawn(exec, opts) {
+  const output = childProcess.spawn(exec, { ...opts, shell: true });
+  output.stdout.on("data", (data) => {
+    process.stdout.write(data);
+  });
+  output.stderr.on("data", (data) => {
+    process.stderr.write(data);
+  });
+
+  return await new Promise((resolve, reject) => {
+    output.on("error", (err) => reject(err));
+    output.on("exit", () => resolve());
+  });
+}
+
+const views = fs.readdirSync(".").filter((view) => {
+  const expectedPath = `./${view}/package.json`;
+  return fs.existsSync(expectedPath);
+});
+
+fs.mkdirSync(OUTPUT, { recursive: true });
+
+for (const view of views) {
+  const loggerChild = logger.child({});
+  process.chdir(`./${view}`);
+
+  loggerChild.info(`Install deps for "${view}"`);
+  await spawn("yarn");
+
+  loggerChild.info(`Building "${view}"`);
+  await spawn("yarn build", {
+    env: { ...process.env, NUXT_APP_BASE_URL: `/${view}/` },
+  });
+
+  process.chdir("..");
+
+  fs.cpSync(`./${view}/.output/public`, `${OUTPUT}/${view}`, {
+    recursive: true,
+  });
+}

composables/app-state.ts

@@ -1,3 +0,0 @@
-import type { AppState } from "~/types";
-
-export const useAppState = () => useState<AppState>("state");

main/app.vue

@@ -10,8 +10,6 @@
 import "~/composables/downloads.js";
 
 import { invoke } from "@tauri-apps/api/core";
-import { AppStatus } from "~/types";
-import { listen } from "@tauri-apps/api/event";
 import { useAppState } from "./composables/app-state.js";
 import {
   initialNavigation,
@@ -21,18 +19,26 @@ import {
 const router = useRouter();
 
 const state = useAppState();
-try {
-  state.value = JSON.parse(await invoke("fetch_state"));
-} catch (e) {
-  console.error("failed to parse state", e);
-}
 
-router.beforeEach(async () => {
+async function fetchState() {
   try {
     state.value = JSON.parse(await invoke("fetch_state"));
+    if (!state.value)
+      throw createError({
+        statusCode: 500,
+        statusMessage: `App state is: ${state.value}`,
+        fatal: true,
+      });
   } catch (e) {
     console.error("failed to parse state", e);
+    throw e;
   }
+}
+await fetchState();
+
+// This is inefficient but apparently we do it lol
+router.beforeEach(async () => {
+  await fetchState();
 });
 
 setupHooks();

main/components/GameStatusButton.vue

@@ -1,52 +1,78 @@
 <template>
   <!-- Do not add scale animations to this: https://stackoverflow.com/a/35683068 -->
   <div class="inline-flex divide-x divide-zinc-900">
-    <button type="button" @click="() => buttonActions[props.status.type]()" :class="[
+    <button
-      styles[props.status.type],
+      type="button"
-      showDropdown ? 'rounded-l-md' : 'rounded-md',
+      @click="() => buttonActions[props.status.type]()"
-      'inline-flex uppercase font-display items-center gap-x-2 px-4 py-3 text-md font-semibold shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
+      :class="[
-    ]">
+        styles[props.status.type],
-      <component :is="buttonIcons[props.status.type]" class="-mr-0.5 size-5" aria-hidden="true" />
+        showDropdown ? 'rounded-l-md' : 'rounded-md',
+        'inline-flex uppercase font-display items-center gap-x-2 px-4 py-3 text-md font-semibold shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
+      ]"
+    >
+      <component
+        :is="buttonIcons[props.status.type]"
+        class="-mr-0.5 size-5"
+        aria-hidden="true"
+      />
       {{ buttonNames[props.status.type] }}
     </button>
-    <Menu v-if="showDropdown" as="div" class="relative inline-block text-left grow">
+    <Menu
+      v-if="showDropdown"
+      as="div"
+      class="relative inline-block text-left grow"
+    >
       <div class="h-full">
-        <MenuButton :class="[
+        <MenuButton
-          styles[props.status.type],
+          :class="[
-          'inline-flex w-full h-full justify-center items-center rounded-r-md px-1 py-2 text-sm font-semibold shadow-sm group',
+            styles[props.status.type],
-          'focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
+            'inline-flex w-full h-full justify-center items-center rounded-r-md px-1 py-2 text-sm font-semibold shadow-sm group',
-        ]">
+            'focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2',
+          ]"
+        >
           <ChevronDownIcon class="size-5" aria-hidden="true" />
         </MenuButton>
       </div>
 
-      <transition enter-active-class="transition ease-out duration-100" enter-from-class="transform opacity-0 scale-95"
+      <transition
-        enter-to-class="transform opacity-100 scale-100" leave-active-class="transition ease-in duration-75"
+        enter-active-class="transition ease-out duration-100"
-        leave-from-class="transform opacity-100 scale-100" leave-to-class="transform opacity-0 scale-95">
+        enter-from-class="transform opacity-0 scale-95"
+        enter-to-class="transform opacity-100 scale-100"
+        leave-active-class="transition ease-in duration-75"
+        leave-from-class="transform opacity-100 scale-100"
+        leave-to-class="transform opacity-0 scale-95"
+      >
         <MenuItems
-          class="absolute right-0 z-[500] mt-2 w-32 origin-top-right rounded-md bg-zinc-900 shadow-lg ring-1 ring-zinc-100/5 focus:outline-none">
+          class="absolute right-0 z-[500] mt-2 w-32 origin-top-right rounded-md bg-zinc-900 shadow-lg ring-1 ring-zinc-100/5 focus:outline-none"
+        >
           <div class="py-1">
-            <MenuItem v-slot="{ active }">
+            <MenuItem v-if="showOptions" v-slot="{ active }">
-            <button @click="() => emit('options')" :class="[
+              <button
-              active
+                @click="() => emit('options')"
-                ? 'bg-zinc-800 text-zinc-100 outline-none'
+                :class="[
-                : 'text-zinc-400',
+                  active
-              'w-full block px-4 py-2 text-sm inline-flex justify-between',
+                    ? 'bg-zinc-800 text-zinc-100 outline-none'
-            ]">
+                    : 'text-zinc-400',
-              Options
+                  'w-full block px-4 py-2 text-sm inline-flex justify-between',
-              <Cog6ToothIcon class="size-5" />
+                ]"
-            </button>
+              >
+                Options
+                <Cog6ToothIcon class="size-5" />
+              </button>
             </MenuItem>
             <MenuItem v-slot="{ active }">
-            <button @click="() => emit('uninstall')" :class="[
+              <button
-              active
+                @click="() => emit('uninstall')"
-                ? 'bg-zinc-800 text-zinc-100 outline-none'
+                :class="[
-                : 'text-zinc-400',
+                  active
-              'w-full block px-4 py-2 text-sm inline-flex justify-between',
+                    ? 'bg-zinc-800 text-zinc-100 outline-none'
-            ]">
+                    : 'text-zinc-400',
-              Uninstall
+                  'w-full block px-4 py-2 text-sm inline-flex justify-between',
-              <TrashIcon class="size-5" />
+                ]"
-            </button>
+              >
+                Uninstall
+                <TrashIcon class="size-5" />
+              </button>
             </MenuItem>
           </div>
         </MenuItems>
@@ -61,6 +87,7 @@ import {
   ChevronDownIcon,
   PlayIcon,
   QueueListIcon,
+  ServerIcon,
   StopIcon,
   WrenchIcon,
 } from "@heroicons/vue/20/solid";
@@ -78,7 +105,7 @@ const emit = defineEmits<{
   (e: "uninstall"): void;
   (e: "kill"): void;
   (e: "options"): void;
-  (e: "resume"): void
+  (e: "resume"): void;
 }>();
 
 const showDropdown = computed(
@@ -88,6 +115,10 @@ const showDropdown = computed(
     props.status.type === GameStatusEnum.PartiallyInstalled
 );
 
+const showOptions = computed(
+  () => props.status.type === GameStatusEnum.Installed
+);
+
 const styles: { [key in GameStatusEnum]: string } = {
   [GameStatusEnum.Remote]:
     "bg-blue-600 text-white hover:bg-blue-500 focus-visible:outline-blue-600 hover:bg-blue-500",
@@ -95,6 +126,8 @@ const styles: { [key in GameStatusEnum]: string } = {
     "bg-zinc-800 text-white hover:bg-zinc-700 focus-visible:outline-zinc-700 hover:bg-zinc-700",
   [GameStatusEnum.Downloading]:
     "bg-zinc-800 text-white hover:bg-zinc-700 focus-visible:outline-zinc-700 hover:bg-zinc-700",
+  [GameStatusEnum.Validating]:
+    "bg-zinc-800 text-white hover:bg-zinc-700 focus-visible:outline-zinc-700 hover:bg-zinc-700",
   [GameStatusEnum.SetupRequired]:
     "bg-yellow-600 text-white hover:bg-yellow-500 focus-visible:outline-yellow-600 hover:bg-yellow-500",
   [GameStatusEnum.Installed]:
@@ -106,42 +139,45 @@ const styles: { [key in GameStatusEnum]: string } = {
   [GameStatusEnum.Running]:
     "bg-zinc-800 text-white hover:bg-zinc-700 focus-visible:outline-zinc-700 hover:bg-zinc-700",
   [GameStatusEnum.PartiallyInstalled]:
-    "bg-gray-600 text-white hover:bg-gray-500 focus-visible:outline-gray-600 hover:bg-gray-500"
+    "bg-blue-600 text-white hover:bg-blue-500 focus-visible:outline-blue-600 hover:bg-blue-500",
 };
 
 const buttonNames: { [key in GameStatusEnum]: string } = {
   [GameStatusEnum.Remote]: "Install",
   [GameStatusEnum.Queued]: "Queued",
   [GameStatusEnum.Downloading]: "Downloading",
+  [GameStatusEnum.Validating]: "Validating",
   [GameStatusEnum.SetupRequired]: "Setup",
   [GameStatusEnum.Installed]: "Play",
   [GameStatusEnum.Updating]: "Updating",
   [GameStatusEnum.Uninstalling]: "Uninstalling",
   [GameStatusEnum.Running]: "Stop",
-  [GameStatusEnum.PartiallyInstalled]: "Resume"
+  [GameStatusEnum.PartiallyInstalled]: "Resume",
 };
 
 const buttonIcons: { [key in GameStatusEnum]: Component } = {
   [GameStatusEnum.Remote]: ArrowDownTrayIcon,
   [GameStatusEnum.Queued]: QueueListIcon,
   [GameStatusEnum.Downloading]: ArrowDownTrayIcon,
+  [GameStatusEnum.Validating]: ServerIcon,
   [GameStatusEnum.SetupRequired]: WrenchIcon,
   [GameStatusEnum.Installed]: PlayIcon,
   [GameStatusEnum.Updating]: ArrowDownTrayIcon,
   [GameStatusEnum.Uninstalling]: TrashIcon,
   [GameStatusEnum.Running]: StopIcon,
-  [GameStatusEnum.PartiallyInstalled]: ArrowDownTrayIcon
+  [GameStatusEnum.PartiallyInstalled]: ArrowDownTrayIcon,
 };
 
 const buttonActions: { [key in GameStatusEnum]: () => void } = {
   [GameStatusEnum.Remote]: () => emit("install"),
   [GameStatusEnum.Queued]: () => emit("queue"),
   [GameStatusEnum.Downloading]: () => emit("queue"),
+  [GameStatusEnum.Validating]: () => emit("queue"),
   [GameStatusEnum.SetupRequired]: () => emit("launch"),
   [GameStatusEnum.Installed]: () => emit("launch"),
   [GameStatusEnum.Updating]: () => emit("queue"),
-  [GameStatusEnum.Uninstalling]: () => { },
+  [GameStatusEnum.Uninstalling]: () => {},
   [GameStatusEnum.Running]: () => emit("kill"),
-  [GameStatusEnum.PartiallyInstalled]: () => emit("resume")
+  [GameStatusEnum.PartiallyInstalled]: () => emit("resume"),
 };
 </script>

main/components/Header.vue

@@ -37,7 +37,7 @@
               <component class="h-5" :is="item.icon" />
             </HeaderWidget>
           </li>
-          <OfflineHeaderWidget v-if="state.status === AppStatus.Offline" />
+          <OfflineHeaderWidget v-if="state?.status === AppStatus.Offline" />
           <HeaderUserWidget />
         </ol>
       </div>

main/components/HeaderUserWidget.vue

@@ -1,5 +1,5 @@
 <template>
-  <Menu v-if="state.user" as="div" class="relative inline-block">
+  <Menu v-if="state?.user" as="div" class="relative inline-block">
     <MenuButton>
       <HeaderWidget>
         <div class="inline-flex items-center text-zinc-300 hover:text-white">
@@ -87,7 +87,7 @@ router.afterEach(() => {
 
 const state = useAppState();
 const profilePictureUrl: string = await useObject(
-  state.value.user?.profilePictureObjectId ?? ""
+  state.value?.user?.profilePictureObjectId ?? ""
 );
 const adminUrl: string = await invoke("gen_drop_url", {
   path: "/admin",

main/components/LibrarySearch.vue

@@ -1,72 +1,59 @@
 <template>
-  <div>
+  <div class="flex flex-col h-full">
     <div class="mb-3 inline-flex gap-x-2">
-      <div
+      <div class="relative transition-transform duration-300 hover:scale-105 active:scale-95">
-        class="relative transition-transform duration-300 hover:scale-105 active:scale-95"
+        <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
-      >
+          <MagnifyingGlassIcon class="h-5 w-5 text-zinc-400" aria-hidden="true" />
-        <div
-          class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3"
-        >
-          <MagnifyingGlassIcon
-            class="h-5 w-5 text-zinc-400"
-            aria-hidden="true"
-          />
         </div>
-        <input
+        <input type="text" v-model="searchQuery"
-          type="text"
-          v-model="searchQuery"
           class="block w-full rounded-lg border-0 bg-zinc-800/50 py-2 pl-10 pr-3 text-zinc-100 placeholder:text-zinc-500 focus:bg-zinc-800 focus:ring-2 focus:ring-inset focus:ring-blue-500 sm:text-sm sm:leading-6"
-          placeholder="Search library..."
+          placeholder="Search library..." />
-        />
       </div>
-      <button
+      <button @click="() => calculateGames(true)"
-        @click="() => calculateGames(true)"
+        class="p-1 flex items-center justify-center transition-transform duration-300 size-10 hover:scale-110 active:scale-90 rounded-lg bg-zinc-800/50 text-zinc-100">
-        class="p-1 flex items-center justify-center transition-transform duration-300 size-10 hover:scale-110 active:scale-90 rounded-lg bg-zinc-800/50 text-zinc-100"
-      >
         <ArrowPathIcon class="size-4" />
       </button>
     </div>
 
     <TransitionGroup name="list" tag="ul" class="flex flex-col gap-y-1.5">
-      <NuxtLink
+      <NuxtLink v-for="(nav, navIndex) in filteredNavigation" :key="nav.id" :class="[
-        v-for="nav in filteredNavigation"
+        'transition-all duration-300 rounded-lg flex items-center py-2 px-3 hover:scale-105 active:scale-95 hover:shadow-lg hover:shadow-zinc-950/50',
-        :key="nav.id"
+        navIndex === currentNavigation
-        :class="[
+          ? 'bg-zinc-800 text-zinc-100 shadow-md shadow-zinc-950/20'
-          'transition-all duration-300 rounded-lg flex items-center py-2 px-3 hover:scale-105 active:scale-95 hover:shadow-lg hover:shadow-zinc-950/50',
+          : nav.isInstalled.value
-          nav.index === currentNavigation
-            ? 'bg-zinc-800 text-zinc-100 shadow-md shadow-zinc-950/20'
-            : nav.isInstalled.value
             ? 'text-zinc-300 hover:bg-zinc-800/90 hover:text-zinc-200'
             : 'text-zinc-500 hover:bg-zinc-800/70 hover:text-zinc-300',
-        ]"
+      ]" :href="nav.route">
-        :href="nav.route"
-      >
         <div class="flex items-center w-full gap-x-3">
-          <div
+          <div class="flex-none transition-transform duration-300 hover:-rotate-2">
-            class="flex-none transition-transform duration-300 hover:-rotate-2"
+            <img class="size-8 object-cover bg-zinc-900 rounded-lg transition-all duration-300 shadow-sm"
-          >
+              :src="icons[nav.id]" alt="" />
-            <img
-              class="size-8 object-cover bg-zinc-900 rounded-lg transition-all duration-300 shadow-sm"
-              :src="icons[nav.id]"
-              alt=""
-            />
           </div>
           <div class="flex flex-col flex-1">
-            <p
+            <p class="truncate text-xs font-display leading-5 flex-1 font-semibold">
-              class="truncate text-xs font-display leading-5 flex-1 font-semibold"
-            >
               {{ nav.label }}
             </p>
-            <p
+            <p class="text-xs font-medium" :class="[gameStatusTextStyle[games[nav.id].status.value.type]]">
-              class="text-xs font-medium"
-              :class="[gameStatusTextStyle[games[nav.id].status.value.type]]"
-            >
               {{ gameStatusText[games[nav.id].status.value.type] }}
             </p>
           </div>
         </div>
       </NuxtLink>
     </TransitionGroup>
+    <div v-if="loading" class="h-full grow flex p-8 justify-center text-zinc-100">
+      <div role="status">
+        <svg aria-hidden="true" class="w-6 h-6 text-transparent animate-spin fill-zinc-600" 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>
   </div>
 </template>
 
@@ -80,19 +67,21 @@ import { listen } from "@tauri-apps/api/event";
 // Style information
 const gameStatusTextStyle: { [key in GameStatusEnum]: string } = {
   [GameStatusEnum.Installed]: "text-green-500",
-  [GameStatusEnum.Downloading]: "text-blue-500",
+  [GameStatusEnum.Downloading]: "text-zinc-400",
+  [GameStatusEnum.Validating]: "text-blue-300",
   [GameStatusEnum.Running]: "text-green-500",
   [GameStatusEnum.Remote]: "text-zinc-500",
-  [GameStatusEnum.Queued]: "text-blue-500",
+  [GameStatusEnum.Queued]: "text-zinc-400",
-  [GameStatusEnum.Updating]: "text-blue-500",
+  [GameStatusEnum.Updating]: "text-zinc-400",
   [GameStatusEnum.Uninstalling]: "text-zinc-100",
   [GameStatusEnum.SetupRequired]: "text-yellow-500",
-  [GameStatusEnum.PartiallyInstalled]: "text-gray-600",
+  [GameStatusEnum.PartiallyInstalled]: "text-gray-400",
 };
 const gameStatusText: { [key in GameStatusEnum]: string } = {
   [GameStatusEnum.Remote]: "Not installed",
   [GameStatusEnum.Queued]: "Queued",
   [GameStatusEnum.Downloading]: "Downloading...",
+  [GameStatusEnum.Validating]: "Validating...",
   [GameStatusEnum.Installed]: "Installed",
   [GameStatusEnum.Updating]: "Updating...",
   [GameStatusEnum.Uninstalling]: "Uninstalling...",
@@ -105,6 +94,7 @@ const router = useRouter();
 
 const searchQuery = ref("");
 
+const loading = ref(false);
 const games: {
   [key: string]: { game: Game; status: Ref<GameStatus, GameStatus> };
 } = {};
@@ -113,7 +103,10 @@ const icons: { [key: string]: string } = {};
 const rawGames: Ref<Game[], Game[]> = ref([]);
 
 async function calculateGames(clearAll = false) {
-  if (clearAll) rawGames.value = [];
+  if (clearAll) {
+    rawGames.value = [];
+    loading.value = true;
+  }
   // If we update immediately, the navigation gets re-rendered before we
   // add all the necessary state, and it freaks tf out
   const newGames = await invoke<typeof rawGames.value>("fetch_library");
@@ -125,10 +118,22 @@ async function calculateGames(clearAll = false) {
     if (icons[game.id]) continue;
     icons[game.id] = await useObject(game.mIconObjectId);
   }
+  loading.value = false;
   rawGames.value = newGames;
 }
 
-await calculateGames();
+// Wait up to 300 ms for the library to load, otherwise
+// show the loading state while we while
+await new Promise<void>((r) => {
+  let hasResolved = false;
+  const resolveFunc = () => {
+    if (!hasResolved) r();
+    hasResolved = true
+
+  }
+  calculateGames(true).then(resolveFunc);
+  setTimeout(resolveFunc, 300);
+})
 
 const navigation = computed(() =>
   rawGames.value.map((game) => {
@@ -136,8 +141,7 @@ const navigation = computed(() =>
 
     const isInstalled = computed(
       () =>
-        status.value.type == GameStatusEnum.Installed ||
+        status.value.type != GameStatusEnum.Remote
-        status.value.type == GameStatusEnum.SetupRequired
     );
 
     const item = {
@@ -150,9 +154,11 @@ const navigation = computed(() =>
     return item;
   })
 );
-const { currentNavigation, recalculateNavigation } = useCurrentNavigationIndex(
+
-  navigation.value
+const route = useRoute();
-);
+const currentNavigation = computed(() => {
+  return navigation.value.findIndex((e) => e.route == route.path)
+});
 
 const filteredNavigation = computed(() => {
   if (!searchQuery.value)
@@ -167,9 +173,7 @@ listen("update_library", async (event) => {
   console.log("Updating library");
   let oldNavigation = navigation.value[currentNavigation.value];
   await calculateGames();
-  recalculateNavigation();
+  if (oldNavigation.route !== navigation.value[currentNavigation.value].route) {
-  if (oldNavigation !== navigation.value[currentNavigation.value]) {
-    console.log("Triggered");
     router.push("/library");
   }
 });

main/composables/app-state.ts

@@ -0,0 +1,3 @@
+import type { AppState } from "~/types";
+
+export const useAppState = () => useState<AppState | undefined>("state");

main/composables/game.ts

@@ -43,6 +43,7 @@ export const useGame = async (gameId: string) => {
       gameStatusRegistry[gameId] = ref(parseStatus(data.status));
 
       listen(`update_game/${gameId}`, (event) => {
+        console.log(event);
         const payload: {
           status: SerializedGameStatus;
           version?: GameVersion;

main/composables/state-navigation.ts

@@ -65,7 +65,13 @@ export function setupHooks() {
   */
 }
 
-export function initialNavigation(state: Ref<AppState>) {
+export function initialNavigation(state: ReturnType<typeof useAppState>) {
+  if (!state.value)
+    throw createError({
+      statusCode: 500,
+      statusMessage: "App state not valid",
+      fatal: true,
+    });
   const router = useRouter();
 
   switch (state.value.status) {

main/error.vue

@@ -7,6 +7,7 @@
         class="mx-auto w-full max-w-7xl px-6 pt-6 sm:pt-10 lg:col-span-2 lg:col-start-1 lg:row-start-1 lg:px-8"
       >
         <Logo class="h-10 w-auto sm:h-12" />
+        
       </header>
       <main
         class="mx-auto w-full max-w-7xl px-6 py-24 sm:py-32 lg:col-span-2 lg:col-start-1 lg:row-start-2 lg:px-8"

main/nuxt.config.ts

@@ -13,5 +13,9 @@ export default defineNuxtConfig({
 
   ssr: false,
 
-  extends: [["./drop-base"]],
+  extends: [["../libs/drop-base"]],
+
+  app: {
+    baseURL: "/main",
+  }
 });

main/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "view",
+  "private": true,
+  "version": "0.3.2",
+  "type": "module",
+  "scripts": {
+    "build": "nuxt generate",
+    "dev": "nuxt dev",
+    "postinstall": "nuxt prepare",
+    "tauri": "tauri"
+  },
+  "dependencies": {
+    "@headlessui/vue": "^1.7.23",
+    "@heroicons/vue": "^2.1.5",
+    "@nuxtjs/tailwindcss": "^6.12.2",
+    "@tauri-apps/api": "^2.7.0",
+    "koa": "^2.16.1",
+    "markdown-it": "^14.1.0",
+    "micromark": "^4.0.1",
+    "nuxt": "^3.16.0",
+    "scss": "^0.2.4",
+    "vue-router": "latest",
+    "vuedraggable": "^4.1.0"
+  },
+  "devDependencies": {
+    "@tailwindcss/forms": "^0.5.9",
+    "@tailwindcss/typography": "^0.5.15",
+    "@types/markdown-it": "^14.1.2",
+    "autoprefixer": "^10.4.20",
+    "postcss": "^8.4.47",
+    "sass-embedded": "^1.79.4",
+    "tailwindcss": "^3.4.13",
+    "typescript": "^5.8.3",
+    "vue-tsc": "^2.2.10"
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+}

main/pages/community/index.vue

@@ -0,0 +1,16 @@
+<template>
+    <div class="mx-auto flex flex-col items-center gap-y-4 max-w-2xl py-32 sm:py-48 lg:py-56">
+        <div>
+            <Wordmark />
+        </div>
+        <div class="text-center">
+            <h1 class="text-balance text-4xl font-bold font-display tracking-tight text-zinc-100 sm:text-6xl">
+                Under construction
+            </h1>
+            <p class="mt-6 text-lg leading-8 text-zinc-400">
+                Yes, we know. We're working on it <a class="text-white" target="_blank"
+                    href="https://github.com/Drop-OSS/drop-app/issues/52">here.</a>
+            </p>
+        </div>
+    </div>
+</template>

main/pages/library/[id]/index.vue

@@ -243,7 +243,10 @@
             </div>
           </Listbox>
         </div>
-        <div v-else class="mt-1 rounded-md bg-red-600/10 p-4">
+        <div
+          v-else-if="versionOptions === null || versionOptions?.length == 0"
+          class="mt-1 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" />
@@ -256,6 +259,27 @@
             </div>
           </div>
         </div>
+        <div v-else class="w-full flex items-center justify-center p-4">
+          <div role="status">
+            <svg
+              aria-hidden="true"
+              class="w-7 h-7 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>
         <div v-if="installDirs">
           <Listbox as="div" v-model="installDir">
             <ListboxLabel class="block text-sm/6 font-medium text-zinc-100"
@@ -368,6 +392,13 @@
     </template>
   </ModalTemplate>
 
+  <!-- 
+  Dear future DecDuck,
+  This v-if is necessary for Vue rendering reasons
+  (it tries to access the game version for not installed games)
+  You have already tried to remove it
+  Don't.  
+  -->
   <GameOptionsModal
     v-if="status.type === GameStatusEnum.Installed"
     v-model="configureModalOpen"
@@ -503,13 +534,13 @@ async function installFlow() {
   installDirs.value = undefined;
 
   try {
-    versionOptions.value = await invoke("fetch_game_verion_options", {
+    versionOptions.value = await invoke("fetch_game_version_options", {
       gameId: game.value.id,
     });
-    console.log(versionOptions.value);
     installDirs.value = await invoke("fetch_download_dir_stats");
   } catch (error) {
     installError.value = (error as string).toString();
+    versionOptions.value = undefined;
   }
 }
 

main/pages/news/index.vue

@@ -0,0 +1,16 @@
+<template>
+    <div class="mx-auto flex flex-col items-center gap-y-4 max-w-2xl py-32 sm:py-48 lg:py-56">
+        <div>
+            <Wordmark />
+        </div>
+        <div class="text-center">
+            <h1 class="text-balance text-4xl font-bold font-display tracking-tight text-zinc-100 sm:text-6xl">
+                Under construction
+            </h1>
+            <p class="mt-6 text-lg leading-8 text-zinc-400">
+                Yes, we know. We're working on it <a class="text-white" target="_blank"
+                    href="https://github.com/Drop-OSS/drop-app/issues/52">here.</a>
+            </p>
+        </div>
+    </div>
+</template>

main/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  // https://nuxt.com/docs/guide/concepts/typescript
+  "extends": "./.nuxt/tsconfig.json",
+  "exclude": ["src-tauri/**/*"]
+}

main/types.ts

@@ -54,12 +54,13 @@ export enum GameStatusEnum {
   Remote = "Remote",
   Queued = "Queued",
   Downloading = "Downloading",
+  Validating = "Validating",
   Installed = "Installed",
   Updating = "Updating",
   Uninstalling = "Uninstalling",
   SetupRequired = "SetupRequired",
   Running = "Running",
-  PartiallyInstalled = "PartiallyInstalled"
+  PartiallyInstalled = "PartiallyInstalled",
 }
 
 export type GameStatus = {

optimize-appimage.sh

@@ -0,0 +1,22 @@
+## This script is largely useless, because there's not much we can do about AppImage size
+
+ARCH=$(uname -m)
+
+# build tauri apps
+# NO_STRIP=true yarn tauri build -- --verbose
+
+# unpack appimage
+APPIMAGE=$(ls ./src-tauri/target/release/bundle/appimage/*.AppImage)
+"$APPIMAGE" --appimage-extract
+
+# strip binary
+APPIMAGE_UNPACK="./squashfs-root"
+find $APPIMAGE_UNPACK -type f -exec strip -s {} \;
+
+APPIMAGETOOL=$(echo "obsolete-appimagetool-$ARCH.AppImage")
+wget -O $APPIMAGETOOL "https://github.com/AppImage/AppImageKit/releases/download/13/$APPIMAGETOOL"
+chmod +x $APPIMAGETOOL
+
+APPIMAGE_OUTPUT=$(./$APPIMAGETOOL $APPIMAGE_UNPACK | grep ".AppImage" | grep squashfs-root | awk '{ print $6 }')
+
+mv $APPIMAGE_OUTPUT "$APPIMAGE"

package.json

@@ -1,46 +1,22 @@
 {
   "name": "drop-app",
   "private": true,
-  "version": "0.3.1-mac",
   "type": "module",
   "scripts": {
-    "build": "nuxt build",
+    "build": "node ./build.mjs",
-    "dev": "nuxt dev",
-    "generate": "nuxt generate",
-    "preview": "nuxt preview",
-    "postinstall": "nuxt prepare",
     "tauri": "tauri"
   },
   "dependencies": {
-    "@headlessui/vue": "^1.7.23",
+    "@tauri-apps/api": "^2.7.0",
-    "@heroicons/vue": "^2.1.5",
+    "@tauri-apps/plugin-deep-link": "^2.4.1",
-    "@nuxtjs/tailwindcss": "^6.12.2",
+    "@tauri-apps/plugin-dialog": "^2.3.2",
-    "@tauri-apps/api": ">=2.0.0",
-    "@tauri-apps/plugin-deep-link": "~2",
-    "@tauri-apps/plugin-dialog": "^2.0.1",
     "@tauri-apps/plugin-opener": "^2.4.0",
-    "@tauri-apps/plugin-os": "~2",
+    "@tauri-apps/plugin-os": "^2.3.0",
-    "@tauri-apps/plugin-shell": "^2.2.1",
+    "@tauri-apps/plugin-shell": "^2.3.0",
-    "koa": "^2.16.1",
+    "pino": "^9.7.0",
-    "markdown-it": "^14.1.0",
+    "pino-pretty": "^13.1.1"
-    "micromark": "^4.0.1",
-    "nuxt": "^3.16.0",
-    "scss": "^0.2.4",
-    "vue": "latest",
-    "vue-router": "latest",
-    "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@tailwindcss/forms": "^0.5.9",
+    "@tauri-apps/cli": "^2.7.1"
-    "@tailwindcss/typography": "^0.5.15",
+  }
-    "@tauri-apps/cli": ">=2.0.0",
-    "@types/markdown-it": "^14.1.2",
-    "autoprefixer": "^10.4.20",
-    "postcss": "^8.4.47",
-    "sass-embedded": "^1.79.4",
-    "tailwindcss": "^3.4.13",
-    "typescript": "^5.8.3",
-    "vue-tsc": "^2.2.10"
-  },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

src-tauri/Cargo.lock

@@ -898,7 +898,7 @@ dependencies = [
  "bitflags 2.9.1",
  "core-foundation 0.10.1",
  "core-graphics-types",
- "foreign-types",
+ "foreign-types 0.5.0",
  "libc",
 ]
 
@@ -1284,7 +1284,7 @@ dependencies = [
 
 [[package]]
 name = "drop-app"
-version = "0.3.1-mac"
+version = "0.3.2"
 dependencies = [
  "atomic-instant-full",
  "bitcode",
@@ -1301,16 +1301,18 @@ dependencies = [
  "hex 0.4.3",
  "http 1.3.1",
  "http-serde 2.1.1",
+ "humansize",
  "known-folders",
  "log",
  "log4rs",
  "md5",
  "native_model",
+ "page_size",
  "parking_lot 0.12.3",
  "rand 0.9.1",
  "rayon",
  "regex",
- "reqwest 0.12.16",
+ "reqwest 0.12.22",
  "reqwest-middleware 0.4.2",
  "reqwest-middleware-cache",
  "reqwest-websocket",
@@ -1323,6 +1325,7 @@ dependencies = [
  "sha1",
  "shared_child",
  "slice-deque",
+ "sysinfo",
  "tar",
  "tauri",
  "tauri-build",
@@ -1585,6 +1588,15 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared 0.1.1",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.5.0"
@@ -1592,7 +1604,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
 dependencies = [
  "foreign-types-macros",
- "foreign-types-shared",
+ "foreign-types-shared 0.3.1",
 ]
 
 [[package]]
@@ -1606,6 +1618,12 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "foreign-types-shared"
 version = "0.3.1"
@@ -2294,6 +2312,15 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "humansize"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
+dependencies = [
+ "libm",
+]
+
 [[package]]
 name = "humantime"
 version = "2.2.0"
@@ -2354,6 +2381,7 @@ dependencies = [
  "hyper 1.6.0",
  "hyper-util",
  "rustls",
+ "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
@@ -2361,6 +2389,22 @@ dependencies = [
  "webpki-roots",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.6.0",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-util"
 version = "0.1.13"
@@ -2773,9 +2817,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.172"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libloading"
@@ -2787,6 +2831,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
 [[package]]
 name = "libredox"
 version = "0.1.3"
@@ -3049,6 +3099,23 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework 2.11.1",
+ "security-framework-sys",
+ "tempfile",
+]
+
 [[package]]
 name = "native_model"
 version = "0.6.1"
@@ -3141,6 +3208,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -3337,6 +3413,16 @@ dependencies = [
  "objc2-core-foundation",
 ]
 
+[[package]]
+name = "objc2-io-kit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a"
+dependencies = [
+ "libc",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "objc2-io-surface"
 version = "0.3.1"
@@ -3467,6 +3553,50 @@ dependencies = [
  "pathdiff",
 ]
 
+[[package]]
+name = "openssl"
+version = "0.10.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+dependencies = [
+ "bitflags 2.9.1",
+ "cfg-if",
+ "foreign-types 0.3.2",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -3523,6 +3653,16 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "page_size"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "pango"
 version = "0.18.3"
@@ -4280,9 +4420,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.16"
+version = "0.12.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf597b113be201cb2269b4c39b39a804d01b99ee95a4278f0ed04e45cff1c71"
+checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -4295,22 +4435,23 @@ dependencies = [
  "http-body-util",
  "hyper 1.6.0",
  "hyper-rustls",
+ "hyper-tls",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
- "mime",
+ "native-tls",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
  "rustls",
+ "rustls-native-certs",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 1.0.2",
  "tokio",
+ "tokio-native-tls",
  "tokio-rustls",
  "tokio-util",
  "tower",
@@ -4349,7 +4490,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "http 1.3.1",
- "reqwest 0.12.16",
+ "reqwest 0.12.22",
  "serde",
  "thiserror 1.0.69",
  "tower-service",
@@ -4384,7 +4525,7 @@ dependencies = [
  "async-tungstenite",
  "bytes",
  "futures-util",
- "reqwest 0.12.16",
+ "reqwest 0.12.22",
  "thiserror 2.0.12",
  "tokio",
  "tokio-util",
@@ -4547,6 +4688,18 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework 3.2.0",
+]
+
 [[package]]
 name = "rustls-pki-types"
 version = "1.12.0"
@@ -4589,6 +4742,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "schannel"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "schemars"
 version = "0.8.22"
@@ -4622,6 +4784,42 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.9.1",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
+dependencies = [
+ "bitflags 2.9.1",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "selectors"
 version = "0.24.0"
@@ -4991,7 +5189,7 @@ dependencies = [
  "bytemuck",
  "cfg_aliases",
  "core-graphics",
- "foreign-types",
+ "foreign-types 0.5.0",
  "js-sys",
  "log",
  "objc2 0.5.2",
@@ -5179,6 +5377,20 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "sysinfo"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d"
+dependencies = [
+ "libc",
+ "memchr",
+ "ntapi",
+ "objc2-core-foundation",
+ "objc2-io-kit",
+ "windows",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -5291,9 +5503,9 @@ dependencies = [
 
 [[package]]
 name = "tauri"
-version = "2.6.2"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "124e129c9c0faa6bec792c5948c89e86c90094133b0b9044df0ce5f0a8efaa0d"
+checksum = "352a4bc7bf6c25f5624227e3641adf475a6535707451b09bb83271df8b7a6ac7"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5318,7 +5530,7 @@ dependencies = [
  "percent-encoding",
  "plist",
  "raw-window-handle",
- "reqwest 0.12.16",
+ "reqwest 0.12.22",
  "serde",
  "serde_json",
  "serde_repr",
@@ -5342,9 +5554,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f025c389d3adb83114bec704da973142e82fc6ec799c7c750c5e21cefaec83"
+checksum = "182d688496c06bf08ea896459bf483eb29cdff35c1c4c115fb14053514303064"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -5364,9 +5576,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5df493a1075a241065bc865ed5ef8d0fbc1e76c7afdc0bf0eccfaa7d4f0e406"
+checksum = "b54a99a6cd8e01abcfa61508177e6096a4fe2681efecee9214e962f2f073ae4a"
 dependencies = [
  "base64 0.22.1",
  "brotli",
@@ -5391,9 +5603,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f237fbea5866fa5f2a60a21bea807a2d6e0379db070d89c3a10ac0f2d4649bbc"
+checksum = "7945b14dc45e23532f2ded6e120170bbdd4af5ceaa45784a6b33d250fbce3f9e"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -5573,9 +5785,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e7bb73d1bceac06c20b3f755b2c8a2cb13b20b50083084a8cf3700daf397ba4"
+checksum = "2b1cc885be806ea15ff7b0eb47098a7b16323d9228876afda329e34e2d6c4676"
 dependencies = [
  "cookie",
  "dpi",
@@ -5595,9 +5807,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "902b5aa9035e16f342eb64f8bf06ccdc2808e411a2525ed1d07672fa4e780bad"
+checksum = "fe653a2fbbef19fe898efc774bc52c8742576342a33d3d028c189b57eb1d2439"
 dependencies = [
  "gtk",
  "http 1.3.1",
@@ -5622,9 +5834,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41743bbbeb96c3a100d234e5a0b60a46d5aa068f266160862c7afdbf828ca02e"
+checksum = "9330c15cabfe1d9f213478c9e8ec2b0c76dab26bb6f314b8ad1c8a568c1d186e"
 dependencies = [
  "anyhow",
  "brotli",
@@ -5849,6 +6061,16 @@ dependencies = [
  "syn 2.0.101",
 ]
 
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.26.2"
@@ -5953,9 +6175,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.4"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdb0c213ca27a9f57ab69ddb290fd80d970922355b83ae380b395d3986b8a2e"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
 dependencies = [
  "bitflags 2.9.1",
  "bytes",
@@ -6260,6 +6482,12 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "version-compare"
 version = "0.2.0"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drop-app"
-version = "0.3.1-mac"
+version = "0.3.2"
 description = "The client application for the open-source, self-hosted game distribution platform Drop"
 authors = ["Drop OSS"]
 edition = "2024"
@@ -70,6 +70,9 @@ tauri-plugin-opener = "2.4.0"
 bitcode = "0.6.6"
 reqwest-websocket = "0.5.0"
 futures-lite = "2.6.0"
+page_size = "0.6.0"
+sysinfo = "0.36.1"
+humansize = "2.1.3"
 # tailscale = { path = "./tailscale" }
 
 [dependencies.dynfmt]
@@ -77,7 +80,7 @@ version = "0.1.5"
 features = ["curly"]
 
 [dependencies.tauri]
-version = "2.1.1"
+version = "2.7.0"
 features = ["protocol-asset", "tray-icon"]
 
 [dependencies.tokio]
@@ -101,9 +104,9 @@ version = "2"
 features = ["other_errors"] # You can also use "yaml_enc" or "bin_enc"
 
 [dependencies.reqwest]
-version = "0.12"
+version = "0.12.22"
 default-features = false
-features = ["json", "http2", "blocking", "rustls-tls-webpki-roots"]
+features = ["json", "http2", "blocking", "rustls-tls", "native-tls-alpn", "rustls-tls-native-roots"]
 
 [dependencies.serde]
 version = "1"

src-tauri/src/database/commands.rs

@@ -7,7 +7,7 @@ use std::{
 use serde_json::Value;
 
 use crate::{
-    database::db::borrow_db_mut_checked, error::download_manager_error::DownloadManagerError,
+    database::{db::borrow_db_mut_checked, scan::scan_install_dirs}, error::download_manager_error::DownloadManagerError,
 };
 
 use super::{
@@ -59,6 +59,8 @@ pub fn add_download_dir(new_dir: PathBuf) -> Result<(), DownloadManagerError<()>
     lock.applications.install_dirs.push(new_dir);
     drop(lock);
 
+    scan_install_dirs();
+
     Ok(())
 }
 

src-tauri/src/database/db.rs

@@ -10,7 +10,7 @@ use chrono::Utc;
 use log::{debug, error, info, warn};
 use native_model::{Decode, Encode};
 use rustbreak::{DeSerError, DeSerializer, PathDatabase, RustbreakError};
-use serde::{de::DeserializeOwned, Serialize};
+use serde::{Serialize, de::DeserializeOwned};
 use url::Url;
 
 use crate::DB;
@@ -67,17 +67,18 @@ impl DatabaseImpls for DatabaseInterface {
 
         let exists = fs::exists(db_path.clone()).unwrap();
 
-        if exists { match PathDatabase::load_from_path(db_path.clone()) {
+        if exists {
-            Ok(db) => db,
+            match PathDatabase::load_from_path(db_path.clone()) {
-            Err(e) => handle_invalid_database(e, db_path, games_base_dir, cache_dir),
+                Ok(db) => db,
-        } } else {
+                Err(e) => handle_invalid_database(e, db_path, games_base_dir, cache_dir),
+            }
+        } else {
             let default = Database::new(games_base_dir, None, cache_dir);
             debug!(
                 "Creating database at path {}",
                 db_path.as_os_str().to_str().unwrap()
             );
-            PathDatabase::create_at_path(db_path, default)
+            PathDatabase::create_at_path(db_path, default).expect("Database could not be created")
-                .expect("Database could not be created")
         }
     }
 
@@ -121,24 +122,24 @@ fn handle_invalid_database(
 pub struct DBRead<'a>(RwLockReadGuard<'a, Database>);
 pub struct DBWrite<'a>(ManuallyDrop<RwLockWriteGuard<'a, Database>>);
 impl<'a> Deref for DBWrite<'a> {
-    type Target = RwLockWriteGuard<'a, Database>;
+    type Target = Database;
 
     fn deref(&self) -> &Self::Target {
         &self.0
     }
 }
+impl<'a> DerefMut for DBWrite<'a> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
 impl<'a> Deref for DBRead<'a> {
-    type Target = RwLockReadGuard<'a, Database>;
+    type Target = Database;
 
     fn deref(&self) -> &Self::Target {
         &self.0
     }
 }
-impl DerefMut for DBWrite<'_> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
 impl Drop for DBWrite<'_> {
     fn drop(&mut self) {
         unsafe {
@@ -154,6 +155,7 @@ impl Drop for DBWrite<'_> {
         }
     }
 }
+
 pub fn borrow_db_checked<'a>() -> DBRead<'a> {
     match DB.borrow_data() {
         Ok(data) => DBRead(data),

src-tauri/src/database/mod.rs

@@ -2,3 +2,4 @@ pub mod commands;
 pub mod db;
 pub mod debug;
 pub mod models;
+pub mod scan;

src-tauri/src/database/models.rs

@@ -1,8 +1,14 @@
-use crate::database::models::data::Database;
+/**
-
+ * NEXT BREAKING CHANGE
+ * 
+ * UPDATE DATABASE TO USE RPMSERDENAMED
+ * 
+ * WE CAN'T DELETE ANY FIELDS
+ */
 pub mod data {
     use std::path::PathBuf;
 
+    
     use native_model::native_model;
     use serde::{Deserialize, Serialize};
 
@@ -18,16 +24,14 @@ pub mod data {
     pub type DatabaseApplications = v2::DatabaseApplications;
     pub type DatabaseCompatInfo = v2::DatabaseCompatInfo;
 
-    use std::{collections::HashMap, process::Command};
+    use std::collections::HashMap;
-
-    use crate::process::process_manager::UMU_LAUNCHER_EXECUTABLE;
 
     pub mod v1 {
         use crate::process::process_manager::Platform;
         use serde_with::serde_as;
         use std::{collections::HashMap, path::PathBuf};
 
-        use super::{Serialize, Deserialize, native_model};
+        use super::{Deserialize, Serialize, native_model};
 
         fn default_template() -> String {
             "{}".to_owned()
@@ -115,6 +119,7 @@ pub mod data {
             Downloading { version_name: String },
             Uninstalling {},
             Updating { version_name: String },
+            Validating { version_name: String },
             Running {},
         }
 
@@ -174,7 +179,10 @@ pub mod data {
 
         use serde_with::serde_as;
 
-        use super::{Serialize, Deserialize, native_model, Settings, DatabaseAuth, v1, GameVersion, DownloadableMetadata, ApplicationTransientStatus};
+        use super::{
+            ApplicationTransientStatus, DatabaseAuth, Deserialize, DownloadableMetadata,
+            GameVersion, Serialize, Settings, native_model, v1,
+        };
 
         #[native_model(id = 1, version = 2, with = native_model::rmp_serde_1_3::RmpSerde)]
         #[derive(Serialize, Deserialize, Clone, Default)]
@@ -206,7 +214,7 @@ pub mod data {
                     applications: value.applications,
                     prev_database: value.prev_database,
                     cache_dir: value.cache_dir,
-                    compat_info: crate::database::models::Database::create_new_compat_info(),
+                    compat_info: None,
                 }
             }
         }
@@ -258,6 +266,7 @@ pub mod data {
             pub install_dirs: Vec<PathBuf>,
             // Guaranteed to exist if the game also exists in the app state map
             pub game_statuses: HashMap<String, GameDownloadStatus>,
+            
             pub game_versions: HashMap<String, HashMap<String, GameVersion>>,
             pub installed_game_version: HashMap<String, DownloadableMetadata>,
 
@@ -283,7 +292,10 @@ pub mod data {
     mod v3 {
         use std::path::PathBuf;
 
-        use super::{Serialize, Deserialize, native_model, Settings, DatabaseAuth, DatabaseApplications, DatabaseCompatInfo, v2};
+        use super::{
+            DatabaseApplications, DatabaseAuth, DatabaseCompatInfo, Deserialize, Serialize,
+            Settings, native_model, v2,
+        };
         #[native_model(id = 1, version = 3, with = native_model::rmp_serde_1_3::RmpSerde)]
         #[derive(Serialize, Deserialize, Clone, Default)]
         pub struct Database {
@@ -297,6 +309,7 @@ pub mod data {
             pub cache_dir: PathBuf,
             pub compat_info: Option<DatabaseCompatInfo>,
         }
+
         impl From<v2::Database> for Database {
             fn from(value: v2::Database) -> Self {
                 Self {
@@ -306,22 +319,13 @@ pub mod data {
                     applications: value.applications.into(),
                     prev_database: value.prev_database,
                     cache_dir: value.cache_dir,
-                    compat_info: Database::create_new_compat_info(),
+                    compat_info: None,
                 }
             }
         }
     }
+
     impl Database {
-        fn create_new_compat_info() -> Option<DatabaseCompatInfo> {
-            #[cfg(target_os = "windows")]
-            return None;
-
-            let has_umu_installed = Command::new(UMU_LAUNCHER_EXECUTABLE).spawn().is_ok();
-            Some(DatabaseCompatInfo {
-                umu_installed: has_umu_installed,
-            })
-        }
-
         pub fn new<T: Into<PathBuf>>(
             games_base_dir: T,
             prev_database: Option<PathBuf>,
@@ -340,7 +344,7 @@ pub mod data {
                 auth: None,
                 settings: Settings::default(),
                 cache_dir,
-                compat_info: Database::create_new_compat_info(),
+                compat_info: None,
             }
         }
     }

src-tauri/src/database/scan.rs

@@ -0,0 +1,52 @@
+use std::fs;
+
+use log::warn;
+
+use crate::{
+    database::{
+        db::borrow_db_mut_checked,
+        models::data::v1::{DownloadType, DownloadableMetadata},
+    },
+    games::{
+        downloads::drop_data::{v1::DropData, DROP_DATA_PATH},
+        library::set_partially_installed_db,
+    },
+};
+
+pub fn scan_install_dirs() {
+    let mut db_lock = borrow_db_mut_checked();
+    for install_dir in db_lock.applications.install_dirs.clone() {
+        let Ok(files) = fs::read_dir(install_dir) else {
+            continue;
+        };
+        for game in files.into_iter().flatten() {
+            let drop_data_file = game.path().join(DROP_DATA_PATH);
+            if !drop_data_file.exists() {
+                continue;
+            }
+            let game_id = game.file_name().into_string().unwrap();
+            let Ok(drop_data) = DropData::read(&game.path()) else {
+                warn!(
+                    ".dropdata exists for {}, but couldn't read it. is it corrupted?",
+                    game.file_name().into_string().unwrap()
+                );
+                continue;
+            };
+            if db_lock.applications.game_statuses.contains_key(&game_id) {
+                continue;
+            }
+
+            let metadata = DownloadableMetadata::new(
+                drop_data.game_id,
+                Some(drop_data.game_version),
+                DownloadType::Game,
+            );
+            set_partially_installed_db(
+                &mut db_lock,
+                &metadata,
+                drop_data.base_path.to_str().unwrap().to_string(),
+                None,
+            );
+        }
+    }
+}

src-tauri/src/download_manager/download_manager_builder.rs

@@ -124,11 +124,16 @@ impl DownloadManagerBuilder {
         self.current_download_agent = None;
 
         let mut download_thread_lock = self.current_download_thread.lock().unwrap();
-        *download_thread_lock = None;
+
+        if let Some(unfinished_thread) = download_thread_lock.take()
+            && !unfinished_thread.is_finished()
+        {
+            unfinished_thread.join().unwrap();
+        }
         drop(download_thread_lock);
     }
 
-    fn stop_and_wait_current_download(&self) {
+    fn stop_and_wait_current_download(&self) -> bool {
         self.set_status(DownloadManagerStatus::Paused);
         if let Some(current_flag) = &self.active_control_flag {
             current_flag.set(DownloadThreadControlFlag::Stop);
@@ -136,8 +141,10 @@ impl DownloadManagerBuilder {
 
         let mut download_thread_lock = self.current_download_thread.lock().unwrap();
         if let Some(current_download_thread) = download_thread_lock.take() {
-            current_download_thread.join().unwrap();
+            return current_download_thread.join().is_ok();
-        }
+        };
+
+        true
     }
 
     fn manage_queue(mut self) -> Result<(), ()> {
@@ -213,10 +220,6 @@ impl DownloadManagerBuilder {
             && self.download_queue.read().front().unwrap()
                 == &self.current_download_agent.as_ref().unwrap().metadata()
         {
-            debug!(
-                "Current download agent: {:?}",
-                self.current_download_agent.as_ref().unwrap().metadata()
-            );
             return;
         }
 
@@ -254,13 +257,17 @@ impl DownloadManagerBuilder {
                     }
                 };
 
-                // If the download gets cancel
+                // If the download gets canceled
+                // immediately return, on_cancelled gets called for us earlier
                 if !download_result {
-                    download_agent.on_incomplete(&app_handle);
                     return;
                 }
 
-                let validate_result = match download_agent.validate() {
+                if download_agent.control_flag().get() == DownloadThreadControlFlag::Stop {
+                    return;
+                }
+
+                let validate_result = match download_agent.validate(&app_handle) {
                     Ok(v) => v,
                     Err(e) => {
                         error!(
@@ -274,6 +281,10 @@ impl DownloadManagerBuilder {
                     }
                 };
 
+                if download_agent.control_flag().get() == DownloadThreadControlFlag::Stop {
+                    return;
+                }
+
                 if validate_result {
                     download_agent.on_complete(&app_handle);
                     sender
@@ -316,6 +327,7 @@ impl DownloadManagerBuilder {
             self.stop_and_wait_current_download();
             self.remove_and_cleanup_front_download(&current_agent.metadata());
         }
+        self.push_ui_queue_update();
         self.set_status(DownloadManagerStatus::Error);
     }
     fn manage_cancel_signal(&mut self, meta: &DownloadableMetadata) {

src-tauri/src/download_manager/downloadable.rs

@@ -14,14 +14,14 @@ use super::{
 
 pub trait Downloadable: Send + Sync {
     fn download(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError>;
+    fn validate(&self, app_handle: &AppHandle) -> Result<bool, ApplicationDownloadError>;
+
     fn progress(&self) -> Arc<ProgressObject>;
     fn control_flag(&self) -> DownloadThreadControl;
-    fn validate(&self) -> Result<bool, ApplicationDownloadError>;
     fn status(&self) -> DownloadStatus;
     fn metadata(&self) -> DownloadableMetadata;
     fn on_initialised(&self, app_handle: &AppHandle);
     fn on_error(&self, app_handle: &AppHandle, error: &ApplicationDownloadError);
     fn on_complete(&self, app_handle: &AppHandle);
-    fn on_incomplete(&self, app_handle: &AppHandle);
     fn on_cancelled(&self, app_handle: &AppHandle);
 }

src-tauri/src/download_manager/util/download_thread_control_flag.rs

@@ -38,9 +38,9 @@ impl DownloadThreadControl {
         }
     }
     pub fn get(&self) -> DownloadThreadControlFlag {
-        self.inner.load(Ordering::Relaxed).into()
+        self.inner.load(Ordering::Acquire).into()
     }
     pub fn set(&self, flag: DownloadThreadControlFlag) {
-        self.inner.store(flag.into(), Ordering::Relaxed);
+        self.inner.store(flag.into(), Ordering::Release);
     }
 }

src-tauri/src/download_manager/util/progress_object.rs

@@ -1,8 +1,8 @@
 use std::{
     sync::{
+        Arc, Mutex,
         atomic::{AtomicUsize, Ordering},
         mpsc::Sender,
-        Arc, Mutex,
     },
     time::{Duration, Instant},
 };
@@ -23,9 +23,10 @@ pub struct ProgressObject {
     //last_update: Arc<RwLock<Instant>>,
     last_update_time: Arc<AtomicInstant>,
     bytes_last_update: Arc<AtomicUsize>,
-    rolling: RollingProgressWindow<250>,
+    rolling: RollingProgressWindow<1>,
 }
 
+#[derive(Clone)]
 pub struct ProgressHandle {
     progress: Arc<AtomicUsize>,
     progress_object: Arc<ProgressObject>,
@@ -39,20 +40,20 @@ impl ProgressHandle {
         }
     }
     pub fn set(&self, amount: usize) {
-        self.progress.store(amount, Ordering::Relaxed);
+        self.progress.store(amount, Ordering::Release);
     }
     pub fn add(&self, amount: usize) {
         self.progress
-            .fetch_add(amount, std::sync::atomic::Ordering::Relaxed);
+            .fetch_add(amount, std::sync::atomic::Ordering::AcqRel);
         calculate_update(&self.progress_object);
     }
     pub fn skip(&self, amount: usize) {
         self.progress
-            .fetch_add(amount, std::sync::atomic::Ordering::Relaxed);
+            .fetch_add(amount, std::sync::atomic::Ordering::Acquire);
         // Offset the bytes at last offset by this amount
         self.progress_object
             .bytes_last_update
-            .fetch_add(amount, Ordering::Relaxed);
+            .fetch_add(amount, Ordering::Acquire);
         // Dont' fire update
     }
 }
@@ -60,7 +61,6 @@ impl ProgressHandle {
 impl ProgressObject {
     pub fn new(max: usize, length: usize, sender: Sender<DownloadManagerSignal>) -> Self {
         let arr = Mutex::new((0..length).map(|_| Arc::new(AtomicUsize::new(0))).collect());
-        // TODO: consolidate this calculation with the set_max function below
         Self {
             max: Arc::new(Mutex::new(max)),
             progress_instances: Arc::new(arr),
@@ -81,19 +81,18 @@ impl ProgressObject {
             .lock()
             .unwrap()
             .iter()
-            .map(|instance| instance.load(Ordering::Relaxed))
+            .map(|instance| instance.load(Ordering::Acquire))
             .sum()
     }
-    pub fn reset(&self, size: usize) {
+    pub fn reset(&self) {
         self.set_time_now();
-        self.set_size(size);
         self.bytes_last_update.store(0, Ordering::Release);
         self.rolling.reset();
         self.progress_instances
             .lock()
             .unwrap()
             .iter()
-            .for_each(|x| x.store(0, Ordering::Release));
+            .for_each(|x| x.store(0, Ordering::SeqCst));
     }
     pub fn get_max(&self) -> usize {
         *self.max.lock().unwrap()
@@ -127,9 +126,9 @@ pub fn calculate_update(progress: &ProgressObject) {
     let max = progress.get_max();
     let bytes_at_last_update = progress
         .bytes_last_update
-        .swap(current_bytes_downloaded, Ordering::Relaxed);
+        .swap(current_bytes_downloaded, Ordering::Acquire);
 
-    let bytes_since_last_update = current_bytes_downloaded - bytes_at_last_update;
+    let bytes_since_last_update = current_bytes_downloaded.saturating_sub(bytes_at_last_update);
 
     let kilobytes_per_second = bytes_since_last_update / (time_since_last_update as usize).max(1);
 

src-tauri/src/download_manager/util/rolling_progress_updates.rs

@@ -26,7 +26,7 @@ impl<const S: usize> RollingProgressWindow<S> {
             .iter()
             .enumerate()
             .filter(|(i, _)| i < &current)
-            .map(|(_, x)| x.load(Ordering::Relaxed))
+            .map(|(_, x)| x.load(Ordering::Acquire))
             .sum::<usize>()
             / S
     }

src-tauri/src/error/application_download_error.rs

@@ -1,30 +1,49 @@
 use std::{
     fmt::{Display, Formatter},
-    io,
+    io, sync::Arc,
 };
 
 use serde_with::SerializeDisplay;
+use humansize::{format_size, BINARY};
 
 use super::remote_access_error::RemoteAccessError;
 
 // TODO: Rename / separate from downloads
 #[derive(Debug, SerializeDisplay)]
 pub enum ApplicationDownloadError {
+    NotInitialized,
     Communication(RemoteAccessError),
+    DiskFull(u64, u64),
+    #[allow(dead_code)]
     Checksum,
     Lock,
-    IoError(io::ErrorKind),
+    IoError(Arc<io::Error>),
     DownloadError,
 }
 
 impl Display for ApplicationDownloadError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
+            ApplicationDownloadError::NotInitialized => write!(f, "Download not initalized, did something go wrong?"),
+            ApplicationDownloadError::DiskFull(required, available) => write!(
+                f,
+                "Game requires {}, {} remaining left on disk.",
+                format_size(*required, BINARY),
+                format_size(*available, BINARY),
+            ),
             ApplicationDownloadError::Communication(error) => write!(f, "{error}"),
-            ApplicationDownloadError::Lock => write!(f, "failed to acquire lock. Something has gone very wrong internally. Please restart the application"),
+            ApplicationDownloadError::Lock => write!(
-            ApplicationDownloadError::Checksum => write!(f, "checksum failed to validate for download"),
+                f,
+                "failed to acquire lock. Something has gone very wrong internally. Please restart the application"
+            ),
+            ApplicationDownloadError::Checksum => {
+                write!(f, "checksum failed to validate for download")
+            }
             ApplicationDownloadError::IoError(error) => write!(f, "io error: {error}"),
-            ApplicationDownloadError::DownloadError => write!(f, "download failed. See Download Manager status for specific error"),
+            ApplicationDownloadError::DownloadError => write!(
+                f,
+                "Download failed. See Download Manager status for specific error"
+            ),
         }
     }
 }

src-tauri/src/error/process_error.rs

@@ -6,7 +6,6 @@ use serde_with::SerializeDisplay;
 pub enum ProcessError {
     NotInstalled,
     AlreadyRunning,
-    NotDownloaded,
     InvalidID,
     InvalidVersion,
     IOError(Error),
@@ -20,7 +19,6 @@ impl Display for ProcessError {
         let s = match self {
             ProcessError::NotInstalled => "Game not installed",
             ProcessError::AlreadyRunning => "Game already running",
-            ProcessError::NotDownloaded => "Game not downloaded",
             ProcessError::InvalidID => "Invalid game ID",
             ProcessError::InvalidVersion => "Invalid game version",
             ProcessError::IOError(error) => &error.to_string(),