From a3e46aa96baef6141c6b7d5e54d54a6c4c9d2086 Mon Sep 17 00:00:00 2001
From: reya <reya@lume.nu>
Date: Fri, 8 Mar 2024 14:47:36 +0700
Subject: [PATCH] fix: crash when database is not exist

---
 apps/desktop2/src/components/accounts.tsx          |  3 ++-
 apps/desktop2/src/components/backup.tsx            |  2 +-
 apps/desktop2/src/routes/$account.tsx              |  2 +-
 apps/desktop2/src/routes/$account/home.tsx         |  2 +-
 apps/desktop2/src/routes/auth/create/self.lazy.tsx |  2 +-
 apps/desktop2/src/routes/auth/import.lazy.tsx      |  2 +-
 apps/desktop2/src/routes/index.tsx                 |  4 ++--
 src-tauri/src/main.rs                              | 10 +++++-----
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/apps/desktop2/src/components/accounts.tsx b/apps/desktop2/src/components/accounts.tsx
index de125ef6..34cea162 100644
--- a/apps/desktop2/src/components/accounts.tsx
+++ b/apps/desktop2/src/components/accounts.tsx
@@ -45,7 +45,8 @@ function Inactive({ pubkey }: { pubkey: string }) {
 
   const changeAccount = async (npub: string) => {
     const select = await ark.load_selected_account(npub);
-    if (select) navigate({ to: "/$account/home", params: { account: npub } });
+    if (select)
+      navigate({ to: "/$account/home/local", params: { account: npub } });
   };
 
   return (
diff --git a/apps/desktop2/src/components/backup.tsx b/apps/desktop2/src/components/backup.tsx
index 24f68e55..1f2fa91c 100644
--- a/apps/desktop2/src/components/backup.tsx
+++ b/apps/desktop2/src/components/backup.tsx
@@ -104,7 +104,7 @@ export function BackupDialog() {
                 </button>
               ) : (
                 <Link
-                  to="/$account/home"
+                  to="/$account/home/local"
                   params={{ account }}
                   search={{ guest: false }}
                   className="inline-flex h-11 w-full items-center justify-center gap-1.5 rounded-lg bg-blue-500 px-5 font-medium text-white hover:bg-blue-600"
diff --git a/apps/desktop2/src/routes/$account.tsx b/apps/desktop2/src/routes/$account.tsx
index bf3defaf..64bd2910 100644
--- a/apps/desktop2/src/routes/$account.tsx
+++ b/apps/desktop2/src/routes/$account.tsx
@@ -68,7 +68,7 @@ function Navigation() {
       data-tauri-drag-region
       className="flex h-full flex-1 items-center gap-2"
     >
-      <Link to="/$account/home" params={{ account }}>
+      <Link to="/$account/home/local" params={{ account }}>
         {({ isActive }) => (
           <div
             className={cn(
diff --git a/apps/desktop2/src/routes/$account/home.tsx b/apps/desktop2/src/routes/$account/home.tsx
index 31d1d07e..40e29761 100644
--- a/apps/desktop2/src/routes/$account/home.tsx
+++ b/apps/desktop2/src/routes/$account/home.tsx
@@ -4,7 +4,7 @@ import { useQueryClient } from "@tanstack/react-query";
 import { Link } from "@tanstack/react-router";
 import { Outlet, createFileRoute } from "@tanstack/react-router";
 
-export const Route = createFileRoute("/$account/home")({
+export const Route = createFileRoute("/$account/home/local")({
   component: Screen,
 });
 
diff --git a/apps/desktop2/src/routes/auth/create/self.lazy.tsx b/apps/desktop2/src/routes/auth/create/self.lazy.tsx
index 8549ed6a..547045f1 100644
--- a/apps/desktop2/src/routes/auth/create/self.lazy.tsx
+++ b/apps/desktop2/src/routes/auth/create/self.lazy.tsx
@@ -26,7 +26,7 @@ function Create() {
     try {
       await ark.save_account(keys);
       navigate({
-        to: "/$account/home",
+        to: "/$account/home/local",
         params: { account: keys.npub },
         search: { onboarding: true },
         replace: true,
diff --git a/apps/desktop2/src/routes/auth/import.lazy.tsx b/apps/desktop2/src/routes/auth/import.lazy.tsx
index 08f361e5..3de95d31 100644
--- a/apps/desktop2/src/routes/auth/import.lazy.tsx
+++ b/apps/desktop2/src/routes/auth/import.lazy.tsx
@@ -32,7 +32,7 @@ function Import() {
         nsec: key,
       });
       navigate({
-        to: "/$account/home",
+        to: "/$account/home/local",
         params: { account: npub },
         search: { onboarding: true },
         replace: true,
diff --git a/apps/desktop2/src/routes/index.tsx b/apps/desktop2/src/routes/index.tsx
index b768f36d..49d14601 100644
--- a/apps/desktop2/src/routes/index.tsx
+++ b/apps/desktop2/src/routes/index.tsx
@@ -15,7 +15,7 @@ export const Route = createFileRoute("/")({
       case 0:
         const guest = await ark.create_guest_account();
         throw redirect({
-          to: "/$account/home",
+          to: "/$account/home/local",
           params: { account: guest },
           search: { guest: true },
           replace: true,
@@ -26,7 +26,7 @@ export const Route = createFileRoute("/")({
         const loadAccount = await ark.load_selected_account(account);
         if (loadAccount) {
           throw redirect({
-            to: "/$account/home",
+            to: "/$account/home/local",
             params: { account },
             replace: true,
           });
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 752ea184..91b54505 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -22,7 +22,6 @@ fn main() {
     .setup(|app| {
       let _tray = tray::create_tray(app.handle()).unwrap();
       let handle = app.handle().clone();
-      let resource_dir = handle.path().resource_dir().unwrap();
       let home_dir = handle.path().home_dir().unwrap();
 
       // create data folder if not exist
@@ -30,12 +29,13 @@ fn main() {
 
       tauri::async_runtime::spawn(async move {
         // Create nostr database connection
-        let nostr_db = SQLiteDatabase::open(resource_dir.join("lume.db"))
-          .await
-          .expect("Open database failed.");
+        let sqlite = SQLiteDatabase::open(home_dir.join("Lume/lume.db")).await;
 
         // Create nostr connection
-        let client = ClientBuilder::default().database(nostr_db).build();
+        let client = match sqlite {
+          Ok(db) => ClientBuilder::default().database(db).build(),
+          Err(_) => ClientBuilder::default().build(),
+        };
 
         // Add some bootstrap relays
         // #TODO: Pull bootstrap relays from user's settings