Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[R66] the file watcher regex are tested only against a full path #54

Merged
merged 3 commits into from
Jul 18, 2020

Conversation

bcarlin
Copy link
Member

@bcarlin bcarlin commented Jul 13, 2020

Originally, the regex filtering in the filewatcher was only able to match filenames.
In recursive mode, it was impossible to math a subpath.

During the 3.1 development cycle, I pushed some changes to match full paths. However, this had the side-effect to only allow file matching if the regex started with .* to match the subpath (ex: .*.csv). I.e. the regex myfile\.txt whould not match subpath/myfile.txt.

This PR allows both regex to work as expected:

  • myfile\.txt matches myfile.txt as well as subpath/myfile.txt
  • subdir/.+\.txt matches subdir/myfile.txt

@bcarlin bcarlin marked this pull request as draft July 13, 2020 17:10
@bcarlin bcarlin added the enhancement New feature or request label Jul 13, 2020
@bcarlin bcarlin changed the title [R66] the file watcher regex are tested only againts a full path [R66] the file watcher regex are tested only against a full path Jul 17, 2020
@bcarlin bcarlin added this to the 3.4.0 milestone Jul 17, 2020
@bcarlin
Copy link
Member Author

bcarlin commented Jul 17, 2020

@fredericBregier I think its ready!

@bcarlin bcarlin marked this pull request as ready for review July 17, 2020 21:20
Copy link
Collaborator

@fredericBregier fredericBregier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine for me

@fredericBregier fredericBregier merged commit 39e6b01 into waarp:v3.4 Jul 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants