tools: de-duplicate and regroup identical hwdb entries #695
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
Previously we ran system-hwdb update but didn't actually install the hwdb file. This only worked on my machine thanks to an existing symlink but didn't actually work anywhere else. Only install the hwdb file, we shouldn't need to install the udev rule since it hardly ever changes.
Previously we'd create a uinput device for each of our tablets, then query udev if the property is set. This takes a long time, in parts thanks to the 300ms sleep to wait for the uinput device to be ready. With now over 500 tablet files and most of those having multiple matches we're looking at at minimum 500*0.3 seconds for a test run which isn't really useful for a test like this. Instead - let's query systemd-hwdb directly: construct a query string our udev rule and query systemd-hwdb for the properties, then ensure we have the ones we expect. Closes linuxwacom#675
This should have no functional effect but it reduces the hwdb file from ~10k lines to under 700 non-comment lines. Entries with identical properties are now grouped together into one list of fallthrough-match strings with the property assignments once the VID changes. Entries with identical match strings (Huion, Gaomon, etc.) are grouped together into one list of tablet name comments followed by the match string. Entries are now visually separated by VID too to make it easier to spot the grouping, and the entries are now in this form: libwacom:name:*:input:b0003v056Ap5222* # ISDv4 5222 libwacom:name:*:input:b0003v056Ap5229* # ISDv4 5229 libwacom:name:*:input:b0003v056Ap522A* # ISDv4 5229 ID_INPUT=1 ID_INPUT_TABLET=1 ID_INPUT_JOYSTICK=0 Or for where multiple tablets share the same hwdb match: # TM156W # U16 TP(4K) # U16(4K) # WH850 libwacom:name:*:input:b0003v256Cp0064* # WH851 libwacom:name:*:input:b0003v256Cp0066* # Inspiroy 2 S libwacom:name:*:input:b0003v256Cp0067* # Inspiroy 2 M - H951P libwacom:name:*:input:b0003v256Cp0068* # Inspiroy 2 L - H1061P
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.
This sit on top of #694, only the last commit matters.
This should have no functional effect but it reduces the hwdb file from
~10k lines to under 700 non-comment lines.
Entries with identical properties are now grouped together into one
list of fallthrough-match strings with the property assignments once the
VID changes.
Entries with identical match strings (Huion, Gaomon, etc.) are grouped
together into one list of tablet name comments followed by the match
string.
Entries are now visually separated by VID too to make it easier to spot
the grouping, and the entries are now in this form:
Or for where multiple tablets share the same hwdb match: