Track filter fix #363
Merged
Track filter fix #363
Conversation
This file contains 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
Add a week unit for the track filter move option, in addition to the existing day, hour, minute and second units. Allow combination of units for track filter move option, e.g. 1w2d3h4m-5s = 1 week + 2 days + 3 hours + 4 minutes - 5 seconds. This matches historical use, and is expected by the GUI. Add the week unit to the GUI track filter ui. Change the limits on the track filter move specs: week: +/-10000 (unit didn't exit before) day,hour,minute,second: +/- 100000 (+/-2000 for day before, +/-100 on others). This resolves GPSBabel#357. This resolves GPSBabel#358.
|
|
||
| QRegularExpression re("^([+-]?\\d+)([dhms])$", QRegularExpression::CaseInsensitiveOption); | ||
| QRegularExpression re("^([+-]?\\d+)([wdhms])(?:([+-]?\\d+)([wdhms]))?(?:([+-]?\\d+)([wdhms]))?(?:([+-]?\\d+)([wdhms]))?(?:([+-]?\\d+)([wdhms]))?$", QRegularExpression::CaseInsensitiveOption); |
There was a problem hiding this comment.
I can't read this regex now, but can it ever match a unit into match[0] but not have a value so that the offset below will walk off the end of match? Maybe track,move=+1024 (no units)
Otherwise, lgtm. Thanx
There was a problem hiding this comment.
I don't think so.
- match.captured(0) is the whole match. we don't use 0.
- we use pairs of match with indexes 1 & 2, 3 & 4, ...
- since the first index in a pair is < the lastCapturedIndex we are guaranteed that
the second index in a pair is <= lastCapturedIndex. So even if the re can capture matches not in pairs (ignoring 0) we won't index off the end. - the re is anchored by ^ and $ so we shouldn't get partial matches (with a few caveats).
- the re is build of units of ([+-]?\d+)([wdhms]). The first group has to find one or more digits due to the + quantifier, and the second group has to match one of the supplied characters due to the implicit quantifier of 1. So we either get 0 matches or 2 from each of these units.
GPSBabelDeveloper
approved these changes
May 24, 2019
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.
Fix compatibility for track filter GUI<->CLI.
Add a week unit for the track filter move option,
in addition to the existing day, hour, minute and second units.
Allow combination of units for track filter move option, e.g.
1w2d3h4m-5s = 1 week + 2 days + 3 hours + 4 minutes - 5 seconds.
This matches historical use, and is expected by the GUI.
Add the week unit to the GUI track filter ui.
Change the limits on the track filter move specs:
week: +/-10000 (unit didn't exit before)
day,hour,minute,second: +/- 100000 (+/-2000 for day before, +/-100 for others before).
This resolves #357.
This resolves #358.