highperfocused/lume
1
0
Fork 0
mirror of https://github.com/lumehq/lume.git synced 2025-04-09 20:39:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: crash when database is not exist

Browse Source
This commit is contained in:
reya 2024-03-08 14:47:36 +07:00
parent a4fdcfdf0b
commit a3e46aa96b
8 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/desktop2/src/components/accounts.tsx
View File

@ -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 (

2
apps/desktop2/src/components/backup.tsx
View File

@ -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"

2
apps/desktop2/src/routes/$account.tsx
View File

@ -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(

2
apps/desktop2/src/routes/$account/home.tsx
View File

@ -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,
});

2
apps/desktop2/src/routes/auth/create/self.lazy.tsx
View File

@ -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,

2
apps/desktop2/src/routes/auth/import.lazy.tsx
View File

@ -32,7 +32,7 @@ function Import() {
nsec: key,
});
navigate({
to: "/$account/home",
to: "/$account/home/local",
params: { account: npub },
search: { onboarding: true },
replace: true,

4
apps/desktop2/src/routes/index.tsx
View File

@ -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,
});

10
src-tauri/src/main.rs
View File

@ -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