Use platform-aware path separator in WpressValidator - #830
Merged
Conversation
fredrikekelund
commented
Jan 22, 2025
| return ( | ||
| requiredFiles.every( ( file ) => fileList.includes( file ) ) && | ||
| fileList.some( ( file ) => optionalDirs.some( ( dir ) => file.startsWith( dir + '/' ) ) ) | ||
| optionalDirs.some( ( dir ) => fileList.some( ( file ) => file.startsWith( dir + path.sep ) ) ) |
Contributor
Author
There was a problem hiding this comment.
The change from '/' to path.sep is the only functional change here. I flipped the order of fileList.some and optionalDirs.some because I find it easier to read this way.
wojtekn
approved these changes
Jan 23, 2025
wojtekn
left a comment
wojtekn
left a comment
Contributor
There was a problem hiding this comment.
The change looks clear. Importing .wpress fikle works fine on Windows now. Good catch!
1 task
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Related issues
Proposed Changes
BackupHandlerWpress::listFilesusespath.joinwhen enumerating the files in a.wpressarchive (All-in-One WP Migration format). This breaksWpressValidatoron Windows because it assumes Unix style path separators in bothcanHandleandparseBackupContents.This PR fixes the problem by replacing
'/'withpath.sepand by changing the unit tests to account for both Unix and Windows-style paths.Testing Instructions
.wpressarchive on WindowsPre-merge Checklist