FF-472 remove leading backslashes when needed (#185)

Author: qvalentin

src/background/methods/filesystem.ts

@@ -8,14 +8,19 @@ export const getPathWithoutName = (
     return pathWithName.substr(0, pathWithName.lastIndexOf(name.toLowerCase()));
 };
 
-
 export const removeTrailingBackslash = (path: string): string => {
     if (path.lastIndexOf("/") + 1 === path.length) {
         return path.substr(0, path.length - 1);
     }
     return path;
 };
 
+export const removeLeadingBackslash = (path: string): string => {
+    if (path.indexOf("/") === 0) {
+        return path.substr(1, path.length);
+    }
+    return path;
+};
 
 export const isFsEntityInFolder = (fsEntity: FsEntity, path: string) => {
     let fsEntityPath = getPathWithoutName(fsEntity.path, fsEntity.name);
@@ -29,8 +34,10 @@ export const getFileExtension = (fileName: string): string => {
     return reverseString(reverseString(fileName).substr(0, positionOfPoint));
 };
 
-export const isFileNameValid = (name: string) =>{
-    return !(!name ||
+export const isFileNameValid = (name: string) => {
+    return !(
+        !name ||
         name.includes("/") ||
-        name.match("[~#@*+:!?&%<>|\"^\\\\]"))
-}
+        name.match('[~#@*+:!?&%<>|"^\\\\]')
+    );
+};

src/components/pages/filesytem/upload/UploadZone.tsx

@@ -16,7 +16,11 @@ import {
 import { FsEntity } from "../../../../background/api/filesystemTypes";
 import { UploadDecisionsModalContent } from "./UploadDecisionsModalContent";
 import { divideArrayByCondition } from "../../../../background/methods/dataTypes/arrays";
-import { getPathWithoutName, isFileNameValid } from "../../../../background/methods/filesystem";
+import {
+    getPathWithoutName,
+    isFileNameValid,
+    removeLeadingBackslash
+} from "../../../../background/methods/filesystem";
 import {
     EditableEntityError,
     EditableFileWithPreflightInfo,
@@ -202,7 +206,6 @@ export const preflightResultReducer: Reducer<
                 (e) => e.path === action.payload.path
             );
             let oldPath = elementToReplace.newPath ?? elementToReplace.path;
-
             elementToReplace.newPath =
                 oldPath.substring(
                     0,
@@ -249,14 +252,18 @@ export const preflightResultReducer: Reducer<
                     elementToReplace.prefNewName ?? elementToReplace.name;
             } else {
                 console.log(
+                    "PREFLIGHT_UPDATE_NAME",
                     elementToReplace.newPath,
                     elementToReplace.prefNewPath,
-                    elementToReplace.path
+                    elementToReplace.path,
+                    elementToReplace.newName
                 );
                 let prevOldPath =
-                    elementToReplace.prefNewPath ?? elementToReplace.path;
+                    elementToReplace.prefNewPath ??
+                    removeLeadingBackslash(elementToReplace.path);
                 restOfElements = restOfElements.map((e) => {
-                    let currentPath = e.newPath ?? e.path;
+                    let currentPath =
+                        e.newPath ?? removeLeadingBackslash(e.path);
                     let currentName = e.newName ?? e.name;
                     let currentPathWithoutName = getPathWithoutName(
                         currentPath,
@@ -265,14 +272,19 @@ export const preflightResultReducer: Reducer<
 
                     let index = currentPathWithoutName.indexOf(prevOldPath);
 
+                    let pathNeedsChange = index === 0;
                     console.log(
+                        "PREFLIGHT_UPDATE_NAME",
                         prevOldPath,
                         currentPathWithoutName,
                         currentName
                     );
-                    if (index === 0) {
+                    if (pathNeedsChange) {
                         e.newPath =
-                            newPath + currentPath.substr(prevOldPath?.length);
+                            newPath +
+                            removeLeadingBackslash(currentPath).substr(
+                                prevOldPath?.length
+                            );
                         e.prefNewPath = e.newPath;
                     }
                     return e;

src/components/pages/filesytem/upload/preflightResponseParser.ts

@@ -1,19 +1,29 @@
-import { EditablePreflightEntityOrFile, PreflightEntity } from "./preflightTypes";
+import {
+    EditablePreflightEntityOrFile,
+    PreflightEntity
+} from "./preflightTypes";
 
-export const preflightResultCombine = (files: EditablePreflightEntityOrFile[], response: PreflightEntity[]) => {
+export const preflightResultCombine = (
+    files: EditablePreflightEntityOrFile[],
+    response: PreflightEntity[]
+) => {
+    console.log("[preflightResultCombine] files", files, "response", response);
+    return files.map((file: EditablePreflightEntityOrFile) => {
+        const resInfo = response.find(
+            (e) =>
+                e.path === (file.newPath ?? file.path) ||
+                "/" + e.path === (file.newPath ?? file.path)
+        );
+        // could be done better if rest returned paths with leading slashes
+        if (!resInfo) {
+            console.error("Did not found a response for the file:", file);
+        }
 
-  return files.map((file: EditablePreflightEntityOrFile) => {
-    console.log(response)
-    const resInfo = response.find((e) => (e.path === (file.newPath ?? file.path)) || ("/" + e.path === (file.newPath ?? file.path)));
-    // could be done better if rest returned paths with leading slashes
-    if (!resInfo){console.error("Did not found a response for the file:",file)}
+        file.permissionIsSufficient = resInfo?.permissionIsSufficient ?? true;
+        file.nameAlreadyInUse = resInfo?.nameAlreadyInUse ?? false;
+        file.nameIsValid = resInfo?.nameIsValid ?? true;
+        file.isFile = resInfo?.isFile ?? false;
 
-    file.permissionIsSufficient =
-      resInfo?.permissionIsSufficient ?? true;
-    file.nameAlreadyInUse = resInfo?.nameAlreadyInUse ?? false;
-    file.nameIsValid = resInfo?.nameIsValid ?? true;
-    file.isFile = resInfo?.isFile ?? true;
-
-    return file;
-  });
+        return file;
+    });
 };