Merge branch 'master' of https://github.com/franciscoBSalgueiro/en-cr…

…oissant

src/components/ErrorComponent.tsx

@@ -13,21 +13,25 @@ import { useNavigate } from "@tanstack/react-router";
 export default function ErrorComponent({
   error,
 }: {
-  error: any;
+  error: unknown;
 }) {
   const navigate = useNavigate();
 
   return (
     <Stack p="md">
       <Title>An error ocurred</Title>
-      {error instanceof Error && (
+      {error instanceof Error ? (
         <>
           <Text>
             <b>{error.name}:</b> {error.message}
           </Text>
           <Code>{error.stack}</Code>
           {error.cause}
         </>
+      ) : (
+        <Text>
+          <b>Unexpected Error:</b> {JSON.stringify(error)}
+        </Text>
       )}
       <Group>
         {error instanceof Error && (

src/components/files/FilesPage.tsx

@@ -12,7 +12,7 @@ import {
 import { useToggle } from "@mantine/hooks";
 import { IconPlus, IconSearch, IconX } from "@tabler/icons-react";
 import { useLoaderData } from "@tanstack/react-router";
-import { readDir, removeFile } from "@tauri-apps/api/fs";
+import { type FileEntry, readDir, removeFile } from "@tauri-apps/api/fs";
 import React, { useEffect, useState } from "react";
 import useSWR from "swr";
 import ConfirmModal from "../common/ConfirmModal";
@@ -39,9 +39,16 @@ export type MetadataOrEntry = {
 async function processFiles(
   files: MetadataOrEntry[],
 ): Promise<MetadataOrEntry[]> {
-  const filesInfo = await Promise.all(
-    files.map((f) => readFileMetadata(f.name, f.path, f.children)),
-  );
+  const filesInfo = (
+    await Promise.allSettled(
+      files.map((f) => readFileMetadata(f.name, f.path, f.children)),
+    )
+  )
+    .filter((r) => r.status === "fulfilled")
+    .map(
+      (r) =>
+        (r as PromiseFulfilledResult<FileMetadata | FileEntry | null>).value,
+    );
   for (let i = 0; i < files.length; i++) {
     const file = files[i];
     if (file.children) {

src/components/home/Databases.tsx

@@ -158,7 +158,7 @@ function Databases() {
     async () => {
       const playerDbs = playerDbNames.find((p) => p.name === name)?.databases;
       if (!databases || !playerDbs) return [];
-      const newInfo: PersonalInfo[] = await Promise.all(
+      const results = await Promise.allSettled(
         databases
           .filter((db) => playerDbs.includes(db.title || ""))
           .map(async (db, i) => {
@@ -172,15 +172,17 @@ function Databases() {
             if (players.data.length > 0) {
               player = players.data[0];
             } else {
-              throw "Player not found in database";
+              throw new Error("Player not found in database");
             }
             const info = unwrap(
               await commands.getPlayersGameInfo(db.file, player.id),
             );
             return { db, info };
           }),
       );
-      return newInfo;
+      return results
+        .filter((r) => r.status === "fulfilled")
+        .map((r) => (r as PromiseFulfilledResult<PersonalInfo>).value);
     },
   );
 

src/routes/__root.tsx

@@ -7,14 +7,15 @@ import TopBar from "@/components/TopBar";
 import { openFile } from "@/utils/files";
 import { createTab } from "@/utils/tabs";
 import { AppShell } from "@mantine/core";
+import { notifications } from "@mantine/notifications";
 import {
   Outlet,
   createRootRouteWithContext,
   useNavigate,
 } from "@tanstack/react-router";
 import { ask, message, open } from "@tauri-apps/api/dialog";
 import { listen } from "@tauri-apps/api/event";
-import { appDataDir, resolve } from "@tauri-apps/api/path";
+import { appLogDir, resolve } from "@tauri-apps/api/path";
 import { open as shellOpen } from "@tauri-apps/api/shell";
 import { checkUpdate, installUpdate } from "@tauri-apps/api/updater";
 import { appWindow } from "@tauri-apps/api/window";
@@ -143,12 +144,11 @@ function RootLayout() {
           label: "Open Logs",
           id: "logs",
           action: async () => {
-            const appDataDirPath = await appDataDir();
-            const path = await resolve(
-              appDataDirPath,
-              "logs",
-              "en-croissant.log",
-            );
+            const path = await resolve(await appLogDir(), "en-croissant.log");
+            notifications.show({
+              title: "Logs",
+              message: `Opened logs in ${path}`,
+            });
             await shellOpen(path);
           },
         },

src/utils/db.ts

@@ -181,7 +181,9 @@ export async function query_tournaments(
 export async function getDatabases(): Promise<DatabaseInfo[]> {
   const files = await readDir("db", { dir: BaseDirectory.AppData });
   const dbs = files.filter((file) => file.name?.endsWith(".db3"));
-  return await Promise.all(dbs.map((db) => getDatabase(db.path)));
+  return (await Promise.allSettled(dbs.map((db) => getDatabase(db.path))))
+    .filter((r) => r.status === "fulfilled")
+    .map((r) => (r as PromiseFulfilledResult<DatabaseInfo>).value);
 }
 
 export async function getDatabase(path: string): Promise<DatabaseInfo> {

src/utils/invoke.tsx

@@ -40,5 +40,5 @@ export function unwrap<T>(result: Result<T, string>): T {
     color: "red",
     icon: <IconX />,
   });
-  throw result.error;
+  throw new Error(result.error);
 }

src/utils/puzzles.ts

@@ -32,9 +32,7 @@ export async function getPuzzleDatabase(path: string): Promise<PuzzleDatabase> {
 export async function getPuzzleDatabases(): Promise<PuzzleDatabase[]> {
   const files = await readDir("puzzles", { dir: BaseDirectory.AppData });
   const dbs = files.filter((file) => file.name?.endsWith(".db3"));
-  return (
-    await Promise.all(
-      dbs.map((db) => getPuzzleDatabase(db.path).catch(() => null)),
-    )
-  ).filter((db) => db !== null) as PuzzleDatabase[];
+  return (await Promise.allSettled(dbs.map((db) => getPuzzleDatabase(db.path))))
+    .filter((r) => r.status === "fulfilled")
+    .map((r) => (r as PromiseFulfilledResult<PuzzleDatabase>).value);
 }