rm move file function and fix things with rename and moving

Author: samlhuillier

electron/main/filesystem/filesystem.ts

@@ -1,5 +1,4 @@
 import * as fs from 'fs'
-import * as fsPromises from 'fs/promises'
 import * as path from 'path'
 
 import chokidar from 'chokidar'
@@ -178,39 +177,6 @@ export function readFile(filePath: string): string {
   return data
 }
 
-export const moveFileOrDirectory = async (sourcePath: string, destinationPath: string): Promise<string> => {
-  await fsPromises.access(sourcePath)
-
-  let destinationStats
-  try {
-    destinationStats = await fsPromises.lstat(destinationPath)
-  } catch (error) {
-    // Error means destination path does not exist, which is fine
-  }
-
-  let resolvedDestinationPath = destinationPath
-  if (destinationStats && destinationStats.isFile()) {
-    resolvedDestinationPath = path.dirname(destinationPath)
-  }
-
-  await fsPromises.mkdir(resolvedDestinationPath, { recursive: true })
-
-  const newPath = path.join(resolvedDestinationPath, path.basename(sourcePath))
-
-  try {
-    await fsPromises.access(newPath)
-    throw new Error(`A file already exists at destination: ${newPath}`)
-  } catch (error) {
-    if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
-      await fsPromises.rename(sourcePath, newPath)
-    } else {
-      throw error
-    }
-  }
-
-  return newPath
-}
-
 export function splitDirectoryPathIntoBaseAndRepo(fullPath: string) {
   const normalizedPath = path.normalize(fullPath)
 

electron/main/filesystem/ipcHandlers.ts

@@ -1,21 +1,14 @@
 import * as fs from 'fs'
 import * as path from 'path'
 
-import { ipcMain, BrowserWindow, dialog } from 'electron'
+import { ipcMain, dialog } from 'electron'
 import Store from 'electron-store'
 
 import WindowsManager from '../common/windowManager'
 import { StoreSchema } from '../electron-store/storeConfig'
-import { orchestrateEntryMove, updateFileInTable } from '../vector-database/tableHelperFunctions'
-
-import {
-  GetFilesInfoTree,
-  createFileRecursive,
-  isHidden,
-  GetFilesInfoListForListOfPaths,
-  startWatchingDirectory,
-  updateFileListForRenderer,
-} from './filesystem'
+import { handleFileRename, updateFileInTable } from '../vector-database/tableHelperFunctions'
+
+import { GetFilesInfoTree, createFileRecursive, isHidden, GetFilesInfoListForListOfPaths } from './filesystem'
 import { FileInfoTree, WriteFileProps, RenameFileProps, FileInfoWithContent } from './types'
 
 const registerFileHandlers = (store: Store<StoreSchema>, _windowsManager: WindowsManager) => {
@@ -91,36 +84,7 @@ const registerFileHandlers = (store: Store<StoreSchema>, _windowsManager: Window
       throw new Error('Window info not found.')
     }
 
-    windowsManager.watcher?.unwatch(windowInfo?.vaultDirectoryForWindow)
-
-    if (process.platform === 'win32') {
-      windowsManager.watcher?.close().then(() => {
-        fs.rename(renameFileProps.oldFilePath, renameFileProps.newFilePath, (err) => {
-          if (err) {
-            throw err
-          }
-
-          // Re-start watching all paths in array
-          const win = BrowserWindow.fromWebContents(event.sender)
-          if (win) {
-            windowsManager.watcher = startWatchingDirectory(win, windowInfo.vaultDirectoryForWindow)
-            updateFileListForRenderer(win, windowInfo.vaultDirectoryForWindow)
-          }
-        })
-      })
-    } else {
-      // On non-Windows platforms, directly perform the rename operation
-      fs.rename(renameFileProps.oldFilePath, renameFileProps.newFilePath, (err) => {
-        if (err) {
-          throw err
-        }
-        // Re-watch the vault directory after renaming
-        windowsManager.watcher?.add(windowInfo?.vaultDirectoryForWindow)
-      })
-    }
-
-    // then need to trigger reindexing of folder
-    windowInfo.dbTableClient.updateDBItemsWithNewFilePath(renameFileProps.oldFilePath, renameFileProps.newFilePath)
+    await handleFileRename(windowsManager, windowInfo, renameFileProps, event.sender)
   })
 
   ipcMain.handle('index-file-in-database', async (event, filePath: string) => {
@@ -151,14 +115,6 @@ const registerFileHandlers = (store: Store<StoreSchema>, _windowsManager: Window
     }
   })
 
-  ipcMain.handle('move-file-or-dir', async (event, sourcePath: string, destinationPath: string) => {
-    const windowInfo = windowsManager.getWindowInfoForContents(event.sender)
-    if (!windowInfo) {
-      throw new Error('Window info not found.')
-    }
-    orchestrateEntryMove(windowInfo.dbTableClient, sourcePath, destinationPath)
-  })
-
   ipcMain.handle('get-files', async (_event, filePaths: string[]): Promise<FileInfoWithContent[]> => {
     const fileItems = GetFilesInfoListForListOfPaths(filePaths)
     const fileContents = fileItems.map((fileItem) => fs.readFileSync(fileItem.path, 'utf-8'))

electron/main/vector-database/tableHelperFunctions.ts

@@ -1,17 +1,20 @@
 import * as fs from 'fs'
+import * as fsPromises from 'fs/promises'
 
+import { BrowserWindow } from 'electron'
 import { chunkMarkdownByHeadingsAndByCharsIfBig } from '../common/chunking'
 import {
   GetFilesInfoList,
-  GetFilesInfoTree,
   flattenFileInfoTree,
-  moveFileOrDirectory,
   readFile,
+  updateFileListForRenderer,
+  startWatchingDirectory,
 } from '../filesystem/filesystem'
-import { FileInfo, FileInfoTree } from '../filesystem/types'
+import { FileInfo, FileInfoTree, RenameFileProps } from '../filesystem/types'
 
 import LanceDBTableWrapper, { convertRecordToDBType } from './lanceTableWrapper'
 import { DBEntry, DatabaseFields } from './schema'
+import WindowsManager from '../common/windowManager'
 
 const convertFileTypeToDBType = async (file: FileInfo): Promise<DBEntry[]> => {
   const fileContent = readFile(file.path)
@@ -27,6 +30,58 @@ const convertFileTypeToDBType = async (file: FileInfo): Promise<DBEntry[]> => {
   return entries
 }
 
+export const handleFileRename = async (
+  windowsManager: WindowsManager,
+  windowInfo: { vaultDirectoryForWindow: string; dbTableClient: any },
+  renameFileProps: RenameFileProps,
+  sender: Electron.WebContents,
+): Promise<void> => {
+  windowsManager.watcher?.unwatch(windowInfo.vaultDirectoryForWindow)
+
+  try {
+    await fsPromises.access(renameFileProps.newFilePath)
+    throw new Error(`A file already exists at destination: ${renameFileProps.newFilePath}`)
+  } catch (error) {
+    // If error is ENOENT (file doesn't exist), proceed with rename
+    if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+      throw error
+    }
+  }
+
+  if (process.platform === 'win32') {
+    await windowsManager.watcher?.close()
+    await new Promise<void>((resolve, reject) => {
+      fs.rename(renameFileProps.oldFilePath, renameFileProps.newFilePath, (err) => {
+        if (err) {
+          reject(err)
+          return
+        }
+
+        const win = BrowserWindow.fromWebContents(sender)
+        if (win) {
+          // eslint-disable-next-line no-param-reassign
+          windowsManager.watcher = startWatchingDirectory(win, windowInfo.vaultDirectoryForWindow)
+          updateFileListForRenderer(win, windowInfo.vaultDirectoryForWindow)
+        }
+        resolve()
+      })
+    })
+  } else {
+    await new Promise<void>((resolve, reject) => {
+      fs.rename(renameFileProps.oldFilePath, renameFileProps.newFilePath, (err) => {
+        if (err) {
+          reject(err)
+          return
+        }
+        windowsManager.watcher?.add(windowInfo.vaultDirectoryForWindow)
+        resolve()
+      })
+    })
+  }
+
+  await windowInfo.dbTableClient.updateDBItemsWithNewFilePath(renameFileProps.oldFilePath, renameFileProps.newFilePath)
+}
+
 export const convertFileInfoListToDBItems = async (filesInfoList: FileInfo[]): Promise<DBEntry[][]> => {
   const promises = filesInfoList.map(convertFileTypeToDBType)
   const filesAsChunksToAddToDB = await Promise.all(promises)
@@ -157,16 +212,6 @@ export const addFileTreeToDBTable = async (dbTable: LanceDBTableWrapper, fileTre
   await dbTable.add(dbEntries)
 }
 
-export const orchestrateEntryMove = async (table: LanceDBTableWrapper, sourcePath: string, destinationPath: string) => {
-  const fileSystemTree = GetFilesInfoTree(sourcePath)
-  await removeFileTreeFromDBTable(table, fileSystemTree)
-
-  const newDestinationPath = await moveFileOrDirectory(sourcePath, destinationPath)
-  if (newDestinationPath) {
-    await addFileTreeToDBTable(table, GetFilesInfoTree(newDestinationPath))
-  }
-}
-
 export function formatTimestampForLanceDB(date: Date): string {
   const year = date.getFullYear()
   const month = date.getMonth() + 1 // getMonth() is zero-based

electron/preload/index.ts

@@ -90,7 +90,6 @@ const fileSystem = {
   createDirectory: createIPCHandler<(dirPath: string) => Promise<void>>('create-directory'),
   checkFileExists: createIPCHandler<(filePath: string) => Promise<boolean>>('check-file-exists'),
   deleteFile: createIPCHandler<(filePath: string) => Promise<void>>('delete-file'),
-  moveFileOrDir: createIPCHandler<(sourcePath: string, destinationPath: string) => Promise<void>>('move-file-or-dir'),
   getAllFilenamesInDirectory: createIPCHandler<(dirName: string) => Promise<string[]>>('get-files-in-directory'),
   getFiles: createIPCHandler<(filePaths: string[]) => Promise<FileInfoWithContent[]>>('get-files'),
 }

src/components/Sidebars/FileSideBar/FileItemRows.tsx

@@ -4,7 +4,7 @@ import { FaChevronDown, FaChevronRight } from 'react-icons/fa'
 import posthog from 'posthog-js'
 import { isFileNodeDirectory } from '@shared/utils'
 import { useFileContext } from '@/contexts/FileContext'
-import { moveFile, removeFileExtension } from '@/lib/file'
+import { removeFileExtension } from '@/lib/file'
 import { useContentContext } from '@/contexts/ContentContext'
 import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger } from '@/components/ui/context-menu'
 import NewDirectoryComponent from '@/components/File/NewDirectory'
@@ -20,6 +20,7 @@ const FileItemRows: React.FC<ListChildComponentProps> = ({ index, style, data })
     deleteFile,
     selectedDirectory,
     setSelectedDirectory,
+    renameFile,
   } = useFileContext()
   const { openContent, createUntitledNote } = useContentContext()
   const [isNewDirectoryModalOpen, setIsNewDirectoryModalOpen] = useState(false)
@@ -54,21 +55,26 @@ const FileItemRows: React.FC<ListChildComponentProps> = ({ index, style, data })
       e.stopPropagation()
       setIsDragOver(false)
       const sourcePath = e.dataTransfer.getData('text/plain')
-      const destinationPath = isDirectory ? file.path : await window.path.dirname(file.path)
-      moveFile(sourcePath, destinationPath)
+      const destinationDirectory = isDirectory ? file.path : await window.path.dirname(file.path)
+      const destinationPath = await window.path.join(destinationDirectory, await window.path.basename(sourcePath))
+      renameFile(sourcePath, destinationPath)
     },
-    [file.path, isDirectory],
+    [file.path, isDirectory, renameFile],
   )
 
-  const clickOnFileOrDirectory = useCallback(() => {
-    if (isDirectory) {
-      handleDirectoryToggle(file.path)
-      setSelectedDirectory(file.path)
-    } else {
-      openContent(file.path)
-      posthog.capture('open_file_from_sidebar')
-    }
-  }, [file.path, isDirectory, handleDirectoryToggle, openContent, setSelectedDirectory])
+  const clickOnFileOrDirectory = useCallback(
+    (e: React.MouseEvent) => {
+      if (isDirectory) {
+        handleDirectoryToggle(file.path)
+        setSelectedDirectory(file.path)
+      } else {
+        openContent(file.path)
+        posthog.capture('open_file_from_sidebar')
+      }
+      e.stopPropagation()
+    },
+    [file.path, isDirectory, handleDirectoryToggle, openContent, setSelectedDirectory],
+  )
 
   const openNewDirectoryModal = useCallback(async () => {
     const dirPath = isDirectory ? file.path : await window.path.dirname(file.path)

src/components/Sidebars/FileSideBar/FileSidebar.tsx

@@ -4,7 +4,6 @@ import { FixedSizeList } from 'react-window'
 import { isFileNodeDirectory } from '@shared/utils'
 import { useFileContext } from '@/contexts/FileContext'
 import FileItemRows from './FileItemRows'
-import { moveFile } from '@/lib/file'
 
 const getFilesAndIndentationsForSidebar = (
   files: FileInfoTree,
@@ -32,21 +31,26 @@ interface FileExplorerProps {
 
 const FileSidebar: React.FC<FileExplorerProps> = ({ lheight }) => {
   const [listHeight, setListHeight] = useState(lheight ?? window.innerHeight - 50)
-  const { vaultFilesTree, expandedDirectories } = useFileContext()
+  const { vaultFilesTree, expandedDirectories, renameFile, setSelectedDirectory } = useFileContext()
 
   const handleDrop = async (e: React.DragEvent) => {
     e.preventDefault()
     e.stopPropagation()
     const sourcePath = e.dataTransfer.getData('text/plain')
-    const destinationPath = await window.electronStore.getVaultDirectoryForWindow()
-    moveFile(sourcePath, destinationPath)
+    const destinationDirectory = await window.electronStore.getVaultDirectoryForWindow()
+    const destinationPath = await window.path.join(destinationDirectory, await window.path.basename(sourcePath))
+    renameFile(sourcePath, destinationPath)
   }
 
   const handleDragOver = (e: React.DragEvent) => {
     e.preventDefault()
     e.stopPropagation()
   }
 
+  const handleClick = () => {
+    setSelectedDirectory(null)
+  }
+
   useEffect(() => {
     const updateHeight = () => {
       setListHeight(lheight ?? window.innerHeight - 50)
@@ -61,7 +65,12 @@ const FileSidebar: React.FC<FileExplorerProps> = ({ lheight }) => {
   const itemCount = filesAndIndentations.length
 
   return (
-    <div className="h-full grow px-1 pt-2 opacity-70" onDrop={handleDrop} onDragOver={handleDragOver}>
+    <div
+      className="h-full grow px-1 pt-2 opacity-70"
+      onDrop={handleDrop}
+      onDragOver={handleDragOver}
+      onClick={handleClick}
+    >
       <FixedSizeList
         height={listHeight}
         itemCount={itemCount}

src/lib/file.ts

@@ -19,10 +19,6 @@ export function flattenFileInfoTree(tree: FileInfoTree): FileInfo[] {
   }, [])
 }
 
-export const moveFile = async (sourcePath: string, destinationPath: string) => {
-  await window.fileSystem.moveFileOrDir(sourcePath, destinationPath)
-}
-
 export const getFilesInDirectory = async (directoryPath: string, filesTree: FileInfo[]): Promise<FileInfo[]> => {
   return filesTree.filter((file) => file.path.startsWith(directoryPath))
 }