Fix path resolution #143
Merged
Fix path resolution #143
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Making sure relative path won't contain initial separator
Signed-off-by: ubi de feo <[email protected]>
…x.sep. Signed-off-by: ubi de feo <[email protected]>
Bugfix/recursive upload patch
ubidefeo
reviewed
Dec 2, 2024
ui/arduino/store.js
Outdated
| @@ -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) | |||
There was a problem hiding this comment.
this change does not seem to affect the process of uploading recursively. I have tested both and saw no changes in the final outcome.
also here you added 1 and at line 1526 removed the slicing.
not sure what this addresses
There was a problem hiding this comment.
I think this is obsolete after your merged patch. This would remove a separator from the beginning of a relative path.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
On windows, recursively upload of folders breaks and files are uploaded with leading \ and other characters.
While manual creation of folders and uploads of files within newly created folders works, if the user tries to upload a whole folder, the recursive process creates the folder at destination, as per
createFolderaction, but the files within the folders are uploaded with an unsanitized path, containing Windows' back-slash, hence “creating” a file with a name containing a “broken” path.Slashes should be sanitized when it comes to destination path.
How to reproduce
On your local filesystem create a folder named
test_folderEnter this folder and create 2 files:
The files can be empty
Connect your board, select the folder and “upload” it as a whole.
Solution
Making sure relative path won't contain initial separator.