allow multiple product strings to be matched for flash disk detection #132
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
|
@dallasmarlow @Primer42 |
| @@ -100,7 +100,7 @@ class LshwParser(txt: String) extends CommonParser[LshwRepresentation](txt) { | |||
| case size => ByteStorageUnit(size.toLong) | |||
| } | |||
| Disk(size, _type, asset.description, asset.product, asset.vendor) | |||
| case n if (n \ "@class" text) == "memory" && (n \ "product" text).toLowerCase.contains(LshwConfig.flashProduct) => | |||
| case n if (n \ "@class" text) == "memory" && LshwConfig.flashProducts.exists(s => (n \ "product" text).toLowerCase.contains(s)) => | |||
There was a problem hiding this comment.
Should (s) be (s.toLowerCase) as well? Cause currently tachION will cause a case mismatch.
There was a problem hiding this comment.
Ah never mind, I see was done above in LshwConfig.scala :)
|
@byxorna lgtm 🍜 |
|
@byxorna LGTM 🎂 |
|
Stupid question, but will this break configs using the old |
|
@Primer42 Nope, it was designed to support |
william-richard
pushed a commit
that referenced
this pull request
Mar 17, 2014
allow multiple product strings to be matched for flash disk detection
dalehamel
pushed a commit
to Shopify/collins
that referenced
this pull request
Jun 10, 2014
allow multiple product strings to be matched for flash disk detection
dalehamel
pushed a commit
to Shopify/collins
that referenced
this pull request
Jun 10, 2014
allow multiple product strings to be matched for flash disk detection
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.
Allows better support for environments with multiple models/vendors of PCIe flash disks. I will create a separate PR to update documentation indicating that
lshw.flashProductis deprecated, andlshw.flashProductsis the new feature variable.