fix: should not show open folder if it is not moved (#2299)

apps/electron/layers/main/src/events/db.ts

@@ -2,25 +2,37 @@ import { Subject } from 'rxjs';
 
 import type { MainEventListener } from './type';
 
+interface DBFilePathMeta {
+  workspaceId: string;
+  path: string;
+  realPath: string;
+}
+
 export const dbSubjects = {
   // emit workspace ids
   dbFileMissing: new Subject<string>(),
   // emit workspace ids
   dbFileUpdate: new Subject<string>(),
+  dbFilePathChange: new Subject<DBFilePathMeta>(),
 };
 
 export const dbEvents = {
-  onDbFileMissing: (fn: (workspaceId: string) => void) => {
+  onDBFileMissing: (fn: (workspaceId: string) => void) => {
     const sub = dbSubjects.dbFileMissing.subscribe(fn);
-
     return () => {
       sub.unsubscribe();
     };
   },
-  onDbFileUpdate: (fn: (workspaceId: string) => void) => {
+  onDBFileUpdate: (fn: (workspaceId: string) => void) => {
     const sub = dbSubjects.dbFileUpdate.subscribe(fn);
     return () => {
       sub.unsubscribe();
     };
   },
+  onDBFilePathChange: (fn: (meta: DBFilePathMeta) => void) => {
+    const sub = dbSubjects.dbFilePathChange.subscribe(fn);
+    return () => {
+      sub.unsubscribe();
+    };
+  },
 } satisfies Record<string, MainEventListener>;

apps/electron/layers/main/src/handlers/__tests__/handlers.spec.ts

@@ -160,7 +160,7 @@ describe('ensureSQLiteDB', () => {
     // wait for 1000ms for file watcher to detect file removal
     await delay(2000);
 
-    expect(sendStub).toBeCalledWith('db:onDbFileMissing', id);
+    expect(sendStub).toBeCalledWith('db:onDBFileMissing', id);
 
     // ensureSQLiteDB should recreate the db file
     workspaceDB = await ensureSQLiteDB(id);
@@ -190,10 +190,7 @@ describe('ensureSQLiteDB', () => {
     // wait for 200ms for file watcher to detect file change
     await delay(2000);
 
-    expect(sendStub).toBeCalledWith('db:onDbFileUpdate', id);
-
-    // should only call once for multiple writes
-    expect(sendStub).toBeCalledTimes(1);
+    expect(sendStub).toBeCalledWith('db:onDBFileUpdate', id);
   });
 });
 

apps/electron/layers/main/src/handlers/db/index.ts

@@ -1,3 +1,5 @@
+import fs from 'fs-extra';
+
 import { appContext } from '../../context';
 import type { NamespaceHandlers } from '../type';
 import { ensureSQLiteDB } from './ensure-db';
@@ -30,4 +32,11 @@ export const dbHandlers = {
   getDefaultStorageLocation: async () => {
     return appContext.appDataPath;
   },
+  getDBFilePath: async (_, workspaceId: string) => {
+    const workspaceDB = await ensureSQLiteDB(workspaceId);
+    return {
+      path: workspaceDB.path,
+      realPath: await fs.realpath(workspaceDB.path),
+    };
+  },
 } satisfies NamespaceHandlers;

apps/electron/layers/main/src/handlers/db/sqlite.ts

@@ -6,6 +6,7 @@ import fs from 'fs-extra';
 import * as Y from 'yjs';
 
 import type { AppContext } from '../../context';
+import { dbSubjects } from '../../events/db';
 import { logger } from '../../logger';
 import { ts } from '../../utils';
 
@@ -62,6 +63,18 @@ export class WorkspaceSQLiteDB {
       this.db.close();
     }
 
+    fs.realpath(this.path)
+      .then(realPath => {
+        dbSubjects.dbFilePathChange.next({
+          workspaceId: this.workspaceId,
+          path: this.path,
+          realPath,
+        });
+      })
+      .catch(() => {
+        // skip error
+      });
+
     // use cached version?
     const db = (this.db = sqlite(this.path));
     db.exec(schemas.join(';'));

apps/electron/layers/main/src/handlers/dialog/dialog.ts

@@ -47,6 +47,7 @@ const ErrorMessages = [
   'DB_FILE_ALREADY_LOADED',
   'DB_FILE_PATH_INVALID',
   'DB_FILE_INVALID',
+  'FILE_ALREADY_EXISTS',
   'UNKNOWN_ERROR',
 ] as const;
 
@@ -201,7 +202,7 @@ export async function loadDBFile(): Promise<LoadDBFileResult> {
 
     await fs.ensureDir(path.join(appContext.appDataPath, 'workspaces'));
 
-    await fs.symlink(filePath, linkedFilePath);
+    await fs.symlink(filePath, linkedFilePath, 'file');
     logger.info(`loadDBFile, symlink: ${filePath} -> ${linkedFilePath}`);
 
     return { workspaceId };
@@ -262,6 +263,12 @@ export async function moveDBFile(
       };
     }
 
+    if (await fs.pathExists(newFilePath)) {
+      return {
+        error: 'FILE_ALREADY_EXISTS',
+      };
+    }
+
     if (isLink) {
       // remove the old link to unblock new link
       await fs.unlink(db.path);
@@ -271,9 +278,12 @@ export async function moveDBFile(
       overwrite: true,
     });
 
-    await fs.ensureSymlink(newFilePath, db.path);
+    db.db.close();
+
+    await fs.ensureSymlink(newFilePath, db.path, 'file');
     logger.info(`openMoveDBFileDialog symlink: ${realpath} -> ${newFilePath}`);
     db.reconnectDB();
+
     return {
       filePath: newFilePath,
     };