fontlist: Cache categorized font info (for mupdf) #6786
Conversation
| @@ -66,7 +67,8 @@ function ReaderFont:init() | |||
| -- defaults are hardcoded in credocument.lua | |||
| local default_font = G_reader_settings:readSetting("cre_font") or self.ui.document.default_font | |||
| local fallback_font = G_reader_settings:readSetting("fallback_font") or self.ui.document.fallback_fonts[1] | |||
| local text = v | |||
| local text = FontList:getLocalizedFontName(cre.getFontFaceFilenameAndFaceIndex(v)) or v | |||
There was a problem hiding this comment.
Might do the cre.getFontFaceFilenameAndFaceIndex(v) at the start of the for loop, as it's now done for every font, and it might (the default) also be done in the font_func.
There was a problem hiding this comment.
About FontList:getLocalizedFontName() - I wonder if we need an option to not get/show the localized one (in case it is crap and people were fine with the regular names). We might add that later if needed.
There was a problem hiding this comment.
The field is surprisingly accurate (compared to almost everything else being notorious garbage), if I'd wager for user requested option, it would be an option to display filenames - as those quite often don't match the "fancy names" of ours now, so its difficult to discern which font is what on storage.
frontend/fontlist.lua
Outdated
| ["otf"] = true, | ||
| } | ||
|
|
||
| local function _readList(target, tinfo, mark, dir) |
There was a problem hiding this comment.
Might give a better name to this tinfo (which is fontinfo in the caller, so why not fontinfo here too ?)
There was a problem hiding this comment.
I'm tempted to move this into a local lambda. There are now 3 variables passed in the recursive call, all of which are fixed state. Would be much better off being captured by the closure at this point.
There was a problem hiding this comment.
(split into util.findFiles in 670473d, as this was badly nested already)
frontend/fontlist.lua
Outdated
| @@ -119,13 +170,64 @@ end | |||
|
|
|||
| function FontList:getFontList() | |||
| if #self.fontlist > 0 then return self.fontlist end | |||
| _readList(self.fontlist, self.fontdir) | |||
|
|
|||
| local cache_file = DataStorage:getDataDir() .. "/cache/fontinfo.lua" | |||
There was a problem hiding this comment.
I would have said it's sad (although needed) to need to have and maintain a cache for that - because it's painful to code - but you seem to have done that really well, so ok :)
|
Yeah, I won't pretend that I grok everything involved in here, but it looks neat and orderly ;). |
Info about each face (l10n, name, family, style etc) is now cached offline, so fonts can be queried ahead of time.
Info about each face (l10n, name, family, style etc) is
now cached offline, so fonts can be queried ahead of time.
Fixes #6763
needs koreader/koreader-base#1215
This change is