Fix scanimage -A parsing with [advanced]
#565
Merged
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
Issue #564 There are cases where `scanimage -A` outputs an additional square bracketed item on a parameter line such as: ``` --contrast -127..127 [0] [advanced] ``` The old regex only assumed this happened once - which was good enough for 6 years or so. It seems that it can happen twice. The regex has been updated to have a non-greedy match for the first one (`default`) and there is a subsequent optional non-capturing group for the second, which for want of a better name is referred here as `meta`. It turns out that this pattern has been seen before with `[read-only]` but that was benign since it was treated as a default to ignore. For that reason, the `enabled` flag has to be altered too. Associated unit test added.
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.
Issue #564
There are cases where
scanimage -Aoutputs an additional square bracketed item on a parameter line such as:The old regex only assumed this happened once - which was good enough for 6 years or so. It seems that it can happen twice.
The regex has been updated to have a non-greedy match for the first one (
default) and there is a subsequent optional group for the second, which for want of a better name is referred here asmeta.It turns out that this pattern has been seen before with
[read-only]but that was benign since it was treated as a default to ignore. For that reason, theenabledflag has to be altered too.Associated unit test added.