pocketbook: simplify device model detection #11721
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
To avoid avoid having to manually handle the multiple ways a model name reported by inkview can be formatted.
Frenzie
approved these changes
Apr 26, 2024
|
Can it be a hash table instead of many |
-- Pocketbook codenames are all over the place:
local codename = full_codename
-- "PocketBook 615 (PB615)"
codename = codename:match(" [(]([^()]+)[)]$") or codename
-- "PocketBook 615"
codename = codename:match("^PocketBook ([^ ].*)$") or codename
-- "PB615"
codename = codename:match("^PB(.+)$") or codename
local device = ({
["515"] = PocketBook515,
["606"] = PocketBook606,
…
["741"] = PocketBook741,
["743C"] = PocketBook743C,
["743K3"] = PocketBook743K3,
["743G"] = PocketBook743G,
["743g"] = PocketBook743G,
["840"] = PocketBook840,
["Reader InkPad"] = PocketBook840,
["970"] = PocketBook970,
["1040"] = PocketBook1040,
["Color Lux"] = PocketBookColorLux,
})[codename]
if not device then
error("unrecognized PocketBook model " .. full_codename)
end
return deviceLike this? |
|
I don't know if I find that nicer than the if/elseif but if other people prefer it I have no objections. |
|
Hash tables are quicker: https://gammon.com.au/forum/?id=7891 But here we have a one-time operation, so it's not about efficiency, but just readability. Matter of taste, yes.
Without |
You need it to use the table inline, without a temporary assignment. |
|
Okay, I see the measurement in my link is doubtful. No objections to elseif, of course. |
I see, thanks. |
I think the result is very likely to be the other way around (if/elseif faster) but either way it doesn't matter. |
NiLuJe
added a commit
to NiLuJe/FBInk
that referenced
this pull request
May 1, 2024
Following in the footsteps of koreader/koreader#11721
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.
To avoid avoid having to manually handle the multiple ways a model name reported by inkview can be formatted.
Close #11714.
This change is