@lvce-editor/explorer-view 2.52.0 → 2.54.0

package/dist/explorerViewWorkerMain.js

@@ -936,6 +936,7 @@ const {
   set: set$1
 } = RendererWorker;
 
+// TODO use direct connection
 const invoke = async (method, ...params) => {
   return invoke$1(method, ...params);
 };
@@ -1004,9 +1005,6 @@ const dirname = (pathSeparator, path) => {
 const dirname2 = path => {
   return dirname('/', path);
 };
-const join = (pathSeparator, ...parts) => {
-  return parts.join(pathSeparator);
-};
 const getBaseName = (pathSeparator, path) => {
   return path.slice(path.lastIndexOf(pathSeparator) + 1);
 };
@@ -1843,6 +1841,7 @@ const writeText = async text => {
   await invoke$1('ClipBoard.writeText', /* text */text);
 };
 const readNativeFiles = async () => {
+  // @ts-ignore
   return invoke$1('ClipBoard.readNativeFiles');
 };
 const writeNativeFiles = async (type, files) => {
@@ -1957,6 +1956,7 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     editingIcon: '',
     fileIconCache: Object.create(null),
     useChevrons: false,
+    confirmDelete: false,
     icons: [],
     platform,
     focus: 0,
@@ -1969,7 +1969,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     finalDeltaY: 0,
     handleOffset: 0,
     scrollBarActive: false,
-    scrollBarHeight: 0
+    scrollBarHeight: 0,
+    confirmPaste: false
   };
   set(uid, state, state);
 };
@@ -2002,6 +2003,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     editingIcon: '',
     fileIconCache: Object.create(null),
     useChevrons: false,
+    confirmDelete: false,
     icons: [],
     platform,
     focus: 0,
@@ -2014,7 +2016,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     finalDeltaY: 0,
     handleOffset: 0,
     scrollBarActive: false,
-    scrollBarHeight: 0
+    scrollBarHeight: 0,
+    confirmPaste: false
   };
   set(state.uid, state, state);
   return state;
@@ -3311,6 +3314,7 @@ const createUploadTree = async (root, fileHandles) => {
       const childTree = await createUploadTree(name, children);
       uploadTree[name] = childTree;
     } else if (isFileHandle(fileHandle)) {
+      // TODO maybe save blob and use filesystem.writeblob
       const text = await getFileHandleText(fileHandle);
       uploadTree[name] = text;
     }
@@ -3355,12 +3359,12 @@ const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) =
   return true;
 };
 
-const mergeDirents$2 = (oldDirents, newDirents) => {
+const mergeDirents$1 = (oldDirents, newDirents) => {
   return newDirents;
 };
 const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
   const childDirents = await getChildDirents(pathSeparator, root, 0);
-  const mergedDirents = mergeDirents$2(dirents, childDirents);
+  const mergedDirents = mergeDirents$1(dirents, childDirents);
   return mergedDirents;
 };
 const handleDrop$2 = async (state, fileHandles, files) => {
@@ -3408,12 +3412,12 @@ const copyFilesElectron = async (root, pathSeparator, fileHandles, files, paths)
   await applyFileOperations(operations);
 };
 
-const mergeDirents$1 = (oldDirents, newDirents) => {
+const mergeDirents = (oldDirents, newDirents) => {
   return newDirents;
 };
 const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
   const childDirents = await getChildDirents(pathSeparator, root, 0);
-  const mergedDirents = mergeDirents$1(dirents, childDirents);
+  const mergedDirents = mergeDirents(dirents, childDirents);
   return mergedDirents;
 };
 const handleDrop$1 = async (state, fileHandles, files, paths) => {
@@ -3676,41 +3680,59 @@ const handleKeyDown = (state, key) => {
   };
 };
 
-const getTopLevelDirents = (root, pathSeparator, excluded) => {
-  if (!root) {
-    return [];
+const generateUniqueName = (baseName, existingPaths, root) => {
+  // Handle files with extensions
+  const lastDotIndex = baseName.lastIndexOf('.');
+  const hasExtension = lastDotIndex !== -1 && lastDotIndex !== 0 && lastDotIndex !== baseName.length - 1;
+  let nameWithoutExtension;
+  let extension;
+  if (hasExtension) {
+    nameWithoutExtension = baseName.slice(0, lastDotIndex);
+    extension = baseName.slice(lastDotIndex);
+  } else {
+    nameWithoutExtension = baseName;
+    extension = '';
   }
-  return getChildDirents(pathSeparator, root, 0, excluded);
-};
 
-const mergeDirents = (oldDirents, newDirents) => {
-  const merged = [];
-  for (const newDirent of newDirents) {
-    merged.push(newDirent);
+  // Check if original name exists
+  const originalPath = join2(root, baseName);
+  if (!existingPaths.includes(originalPath)) {
+    return baseName;
+  }
+
+  // Try "original copy"
+  const copyName = `${nameWithoutExtension} copy${extension}`;
+  const copyPath = join2(root, copyName);
+  if (!existingPaths.includes(copyPath)) {
+    return copyName;
+  }
+
+  // Try "original copy 1", "original copy 2", etc.
+  let counter = 1;
+  while (true) {
+    const numberedCopyName = `${nameWithoutExtension} copy ${counter}${extension}`;
+    const numberedCopyPath = join2(root, numberedCopyName);
+    if (!existingPaths.includes(numberedCopyPath)) {
+      return numberedCopyName;
+    }
+    counter++;
   }
-  return merged;
 };
 
-// TODO add lots of tests for this
-const updateRoot = async state1 => {
-  // @ts-ignore
-  if (state1.disposed) {
-    return state1;
+const getFileOperationsCopy = (root, existingUris, files) => {
+  const operations = [];
+  for (const file of files) {
+    const baseName = getBaseName('/', file);
+    const uniqueName = generateUniqueName(baseName, existingUris, root);
+    const newUri = join2(root, uniqueName);
+    operations.push({
+      type: Copy$2,
+      from: file,
+      // TODO ensure file is uri
+      path: newUri
+    });
   }
-  // const file = nativeFiles.files[0]
-  // @ts-ignore
-  const topLevelDirents = await getTopLevelDirents(state1.root, state1.pathSeparator, []);
-  // const state2 = Viewlet.getState('Explorer')
-  // // TODO what if root changes while reading directories?
-  // if (state2.disposed || state2.root !== state1.root) {
-  //   return state2
-  // }
-  const newDirents = mergeDirents(state1.items, topLevelDirents);
-  const state3 = {
-    ...state1,
-    items: newDirents
-  };
-  return state3;
+  return operations;
 };
 
 const handlePasteCopy = async (state, nativeFiles) => {
@@ -3719,13 +3741,42 @@ const handlePasteCopy = async (state, nativeFiles) => {
   // TODO handle pasting files into broken symlink
   // TODO handle pasting files into hardlink
   // TODO what if folder is big and it takes a long time
-  for (const source of nativeFiles.files) {
-    // @ts-ignore
-    const target = join(state.pathSeperator, state.root, getBaseName(state.pathSeparator, source));
-    await copy$1(source, target);
-  }
+
+  // TODO use file operations and bulk edit
+  const {
+    items,
+    root
+  } = state;
+  const existingUris = items.map(item => item.path);
+  const operations = getFileOperationsCopy(root, existingUris, nativeFiles.files);
+  // TODO handle error?
+  await applyFileOperations(operations);
+
+  // TODO use refreshExplorer with the paths that have been affected by file operations
   // TODO only update folder at which level it changed
-  return updateRoot(state);
+  const latestState = await refresh(state);
+
+  // Focus on the first newly created file
+  const newFilePaths = operations.map(operation => operation.path);
+  if (newFilePaths.length > 0) {
+    const firstNewFilePath = newFilePaths[0];
+    const newFileIndex = getIndex(latestState.items, firstNewFilePath);
+    if (newFileIndex !== -1) {
+      return {
+        ...latestState,
+        focusedIndex: newFileIndex,
+        focused: true
+      };
+    }
+  }
+  // If there are no items, ensure focusedIndex is 0
+  if (latestState.items.length === 0) {
+    return {
+      ...latestState,
+      focusedIndex: 0
+    };
+  }
+  return latestState;
 };
 
 const handlePasteCut = async (state, nativeFiles) => {
@@ -3860,10 +3911,17 @@ const getWorkspacePath = () => {
 };
 
 const getSettings = async () => {
+  // TODO get all settings at once
   const useChevronsRaw = await invoke$1('Preferences.get', 'explorer.useChevrons');
   const useChevrons = useChevronsRaw === false ? false : true;
+  const confirmDeleteRaw = await invoke$1('Preferences.get', 'explorer.confirmdelete');
+  const confirmDelete = confirmDeleteRaw === false ? false : false;
+  const confirmPasteRaw = await invoke$1('Preferences.get', 'explorer.confirmpaste');
+  const confirmPaste = confirmPasteRaw === false ? false : false;
   return {
-    useChevrons
+    useChevrons,
+    confirmDelete,
+    confirmPaste
   };
 };
 
@@ -3992,7 +4050,8 @@ const loadContent = async (state, savedState) => {
     fileIconCache
   } = state;
   const {
-    useChevrons
+    useChevrons,
+    confirmDelete
   } = await getSettings();
   const workspacePath = await getWorkspacePath();
   const root = getSavedRoot(savedState, workspacePath);
@@ -4029,7 +4088,8 @@ const loadContent = async (state, savedState) => {
     maxLineY,
     pathSeparator,
     excluded,
-    useChevrons
+    useChevrons,
+    confirmDelete
   };
 };
 
@@ -4207,6 +4267,14 @@ const openContainingFolder = async state => {
   return state;
 };
 
+const confirmDelete = async paths => {
+  // TODO use i18n string
+  const message = paths.length === 1 ? `Are you sure you want to delete "${paths[0]}"?` : `Are you sure you want to delete ${paths.length} items?`;
+  // @ts-ignore
+  const result = await invoke$1('Confirmprompt.prompt', message);
+  return result === true;
+};
+
 const getSelectedItems = (items, focusedIndex) => {
   const dirent = items[focusedIndex];
   const selectedItems = items.filter(item => item.selected || item === dirent);
@@ -4226,13 +4294,22 @@ const removePaths = async paths => {
 const removeDirent = async state => {
   const {
     items,
-    focusedIndex
+    focusedIndex,
+    confirmDelete: confirmDelete$1
   } = state;
   const selectedItems = getSelectedItems(items, focusedIndex);
   if (selectedItems.length === 0) {
     return state;
   }
   const toRemove = getPaths(selectedItems);
+  if (confirmDelete$1) {
+    const confirmed = await confirmDelete(toRemove);
+    if (!confirmed) {
+      return state;
+    }
+  }
+
+  // TODO use file operations, bulk edit and explorer refresh
   await removePaths(toRemove);
   const newState = await refresh(state);
   return newState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "2.52.0",
+  "version": "2.54.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",