@lvce-editor/explorer-view 2.3.0 → 2.5.0

package/dist/explorerViewWorkerMain.js

@@ -1013,6 +1013,7 @@ const get$1 = id => {
 
 const invoke = (method, ...params) => {
   const rpc = get$1(RendererWorker);
+  // @ts-ignore
   return rpc.invoke(method, ...params);
 };
 
@@ -1795,6 +1796,13 @@ const focusFirst = state => {
 const lastIndex = array => {
   return array.length - 1;
 };
+const fromAsync = async asyncIterable => {
+  const children = [];
+  for await (const value of asyncIterable) {
+    children.push(value);
+  }
+  return children;
+};
 
 const focusLast = state => {
   const {
@@ -2002,7 +2010,7 @@ const rename = () => {
 const deleteItem = () => {
   return i18nString(Delete);
 };
-const refresh = () => {
+const refresh$1 = () => {
   return i18nString(RefreshExplorer);
 };
 const collapseAll = () => {
@@ -2616,11 +2624,125 @@ const handleDragOver = (state, x, y) => {
   };
 };
 
-const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) => {
-  // TODO send to renderer worker
+const getTopLevelDirents = (root, pathSeparator, excluded) => {
+  if (!root) {
+    return [];
+  }
+  return getChildDirents(pathSeparator, {
+    depth: 0,
+    path: root,
+    type: Directory
+  }, excluded);
 };
 
 const mergeDirents$2 = (oldDirents, newDirents) => {
+  const merged = [];
+  for (const newDirent of newDirents) {
+    merged.push(newDirent);
+  }
+  return merged;
+};
+
+// TODO add lots of tests for this
+const refresh = async state1 => {
+  const topLevelDirents = await getTopLevelDirents(state1.root, state1.pathSeparator, []);
+  const newDirents = mergeDirents$2(state1.items, topLevelDirents);
+  const state3 = {
+    ...state1,
+    items: newDirents
+  };
+  return state3;
+};
+
+const applyOperation = operation => {
+  if (operation.type === 'createFolder') {
+    return mkdir(operation.path);
+  }
+  return writeFile(operation.path, operation.text);
+};
+const applyFileOperations = async operations => {
+  // TODO run operations in parallel if possible
+  for (const operation of operations) {
+    await applyOperation(operation);
+  }
+};
+
+const getChildHandles = async fileHandle => {
+  // @ts-ignore
+  const values = fileHandle.values();
+  const children = await fromAsync(values);
+  return children;
+};
+
+const getFileHandleText = async fileHandle => {
+  const file = await fileHandle.getFile();
+  const text = await file.text();
+  return text;
+};
+
+const isDirectoryHandle = fileHandle => {
+  return fileHandle.kind === 'directory';
+};
+
+const isFileHandle = fileHandle => {
+  return fileHandle.kind === 'file';
+};
+
+const createUploadTree = async (root, fileHandles) => {
+  const uploadTree = Object.create(null);
+  for (const fileHandle of fileHandles) {
+    const name = fileHandle.name;
+    if (isDirectoryHandle(fileHandle)) {
+      const children = await getChildHandles(fileHandle);
+      const childTree = await createUploadTree(name, children);
+      uploadTree[name] = childTree;
+    } else if (isFileHandle(fileHandle)) {
+      const text = await getFileHandleText(fileHandle);
+      uploadTree[name] = text;
+    }
+  }
+  return uploadTree;
+};
+
+const getFileOperations = (root, uploadTree) => {
+  const operations = [];
+  const processTree = (tree, currentPath) => {
+    for (const [path, value] of Object.entries(tree)) {
+      const fullPath = currentPath ? `${currentPath}/${path}` : path;
+      if (typeof value === 'object') {
+        operations.push({
+          type: 'createFolder',
+          path: `${root}/${fullPath}`,
+          text: ''
+        });
+        processTree(value, fullPath);
+      } else if (typeof value === 'string') {
+        operations.push({
+          type: 'createFile',
+          path: `${root}/${fullPath}`,
+          text: value
+        });
+      }
+    }
+  };
+  processTree(uploadTree, '');
+  return operations;
+};
+
+const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) => {
+  const uploadTree = await createUploadTree(root, fileSystemHandles);
+  const fileOperations = getFileOperations(root, uploadTree);
+  await applyFileOperations(fileOperations);
+
+  // TODO
+  // 1. in electron, use webutils.getPathForFile to see if a path is available
+  // 2. else, walk all files and folders recursively and upload all of them (if there are many, show a progress bar)
+
+  // TODO send file system operations to renderer worker
+  return true;
+};
+
+const mergeDirents$1 = (oldDirents, newDirents) => {
   return newDirents;
 };
 const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
@@ -2628,7 +2750,7 @@ const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
     path: root,
     depth: 0
   });
-  const mergedDirents = mergeDirents$2(dirents, childDirents);
+  const mergedDirents = mergeDirents$1(dirents, childDirents);
   return mergedDirents;
 };
 const handleDrop$2 = async (state, files) => {
@@ -2637,9 +2759,10 @@ const handleDrop$2 = async (state, files) => {
     pathSeparator,
     items
   } = state;
-  const handled = await uploadFileSystemHandles();
+  const handled = await uploadFileSystemHandles(root, pathSeparator, files);
   if (handled) {
-    return state;
+    const updated = await refresh(state);
+    return updated;
   }
   const mergedDirents = await getMergedDirents$2(root, pathSeparator, items);
   return {
@@ -2653,7 +2776,7 @@ const getFilePathElectron = async file => {
   return invoke('GetFilePathElectron.getFilePathElectron', file);
 };
 
-const mergeDirents$1 = (oldDirents, newDirents) => {
+const mergeDirents = (oldDirents, newDirents) => {
   return newDirents;
 };
 
@@ -2671,7 +2794,7 @@ const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
     path: root,
     depth: 0
   });
-  const mergedDirents = mergeDirents$1(dirents, childDirents);
+  const mergedDirents = mergeDirents(dirents, childDirents);
   return mergedDirents;
 };
 const handleDrop$1 = async (state, files) => {
@@ -2726,8 +2849,9 @@ const handleDropIntoFolder = async (state, dirent, index, files) => {
   // @ts-ignore
   for (const file of files) {
     // TODO path basename
-    const baseName = file;
+    const baseName = file.name;
     const to = dirent.path + pathSeparator + baseName;
+    // @ts-ignore
     await copy$1(file, to);
   }
   const childDirents = await getChildDirents(pathSeparator, dirent);
@@ -2777,8 +2901,15 @@ const getDropHandler = index => {
       return handleDropIndex;
   }
 };
-const handleDrop = async (state, x, y, files) => {
+
+const getFileHandles = async fileIds => {
+  const files = await invoke('FileSystemHandle.getFileHandles', fileIds);
+  return files;
+};
+
+const handleDrop = async (state, x, y, fileIds) => {
   try {
+    const files = await getFileHandles(fileIds);
     const index = getIndexFromPosition(state, x, y);
     const fn = getDropHandler(index);
     const result = await fn(state, files, index);
@@ -2828,25 +2959,6 @@ const handleIconThemeChange = state => {
   return updateIcons(state);
 };
 
-const getTopLevelDirents = (root, pathSeparator, excluded) => {
-  if (!root) {
-    return [];
-  }
-  return getChildDirents(pathSeparator, {
-    depth: 0,
-    path: root,
-    type: Directory
-  }, excluded);
-};
-
-const mergeDirents = (oldDirents, newDirents) => {
-  const merged = [];
-  for (const newDirent of newDirents) {
-    merged.push(newDirent);
-  }
-  return merged;
-};
-
 // TODO add lots of tests for this
 const updateRoot = async state1 => {
   // @ts-ignore
@@ -2855,13 +2967,13 @@ const updateRoot = async state1 => {
   }
   // const file = nativeFiles.files[0]
   // @ts-ignore
-  const topLevelDirents = await getTopLevelDirents(state1.root, state1.pathSeparator);
+  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 newDirents = mergeDirents$2(state1.items, topLevelDirents);
   const state3 = {
     ...state1,
     items: newDirents
@@ -3712,7 +3824,7 @@ const getActions = root => {
     command: 'newFolder'
   }, {
     type: Button,
-    id: refresh(),
+    id: refresh$1(),
     icon: Refresh,
     command: 'refresh'
   }, {
@@ -3813,7 +3925,7 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleDrop,
-    params: ['handleDrop', 'event.clientX', 'event.clientY', 'event.dataTransfer.files'],
+    params: ['handleDrop', 'event.clientX', 'event.clientY', 'event.dataTransfer.files2'],
     preventDefault: true
   }];
 };
@@ -4169,6 +4281,7 @@ const commandMap = {
   'Explorer.newFile': wrapCommand(newFile),
   'Explorer.newFolder': wrapCommand(newFolder),
   'Explorer.openContainingFolder': wrapCommand(openContainingFolder),
+  'Explorer.refresh': wrapCommand(refresh),
   'Explorer.removeDirent': wrapCommand(removeDirent),
   'Explorer.renameDirent': wrapCommand(renameDirent),
   'Explorer.restoreState': restoreState,

package/package.json

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