Fix path resolution

murilopolese · murilopolese · commit 85c937d598ca · 2024-11-27T11:15:13.000+01:00
Making sure relative path won't contain initial separator
diff --git a/ui/arduino/store.js b/ui/arduino/store.js
@@ -1509,7 +1509,7 @@ async function uploadFolder(srcPath, destPath, dataConsumer) {
   let allFiles = await disk.ilistAllFiles(srcPath)
   for (let i in allFiles) {
     const file = allFiles[i]
-    const relativePath = file.path.substring(srcPath.length)
+    const relativePath = file.path.substring(srcPath.length+1)
     if (file.type === 'folder') {
       await serial.createFolder(
         serial.getFullPath(
@@ -1523,7 +1523,7 @@ async function uploadFolder(srcPath, destPath, dataConsumer) {
         disk.getFullPath(srcPath, relativePath, ''),
         serial.getFullPath(destPath, relativePath, ''),
         (progress) => {
-          dataConsumer(progress, relativePath.slice(1))
+          dataConsumer(progress, relativePath)
         }
       )
     }

Original file line number	Diff line number	Diff line change
`@@ -1509,7 +1509,7 @@ async function uploadFolder(srcPath, destPath, dataConsumer) {`
`1509`	`1509`	`let allFiles = await disk.ilistAllFiles(srcPath)`
`1510`	`1510`	`for (let i in allFiles) {`
`1511`	`1511`	`const file = allFiles[i]`
`1512`		`- const relativePath = file.path.substring(srcPath.length)`
	`1512`	`+ const relativePath = file.path.substring(srcPath.length+1)`
`1513`	`1513`	`if (file.type === 'folder') {`
`1514`	`1514`	`await serial.createFolder(`
`1515`	`1515`	`serial.getFullPath(`
`@@ -1523,7 +1523,7 @@ async function uploadFolder(srcPath, destPath, dataConsumer) {`
`1523`	`1523`	`disk.getFullPath(srcPath, relativePath, ''),`
`1524`	`1524`	`serial.getFullPath(destPath, relativePath, ''),`
`1525`	`1525`	`(progress) => {`
`1526`		`- dataConsumer(progress, relativePath.slice(1))`
	`1526`	`+ dataConsumer(progress, relativePath)`
`1527`	`1527`	`}`
`1528`	`1528`	`)`
`1529`	`1529`	`}`