renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Speedup dictionaries init (#3489)

Browse Source 
When looking for .ifo to populate Dictionary settings menu,
avoid walking sub-directories once we found a .ifo, as these
sub-directories may contain a lot of images and other subdirs.
This commit is contained in:
poire-z
2017-11-16 14:04:59 +01:00
committed by Frans de Jonge
parent 2538189473
commit 338d14edb7
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/apps/reader/modules/readerdictionary.lua
View File

@@ -27,25 +27,35 @@ local function getIfosInDir(path)
-- - No sorting, entries are processed in the order the dir_read_name() call
-- returns them (inodes linked list)
-- - If entry is a directory, Walk in it first and recurse
-- With a small optimisation to avoid walking dict subdirectories that
-- may contain many images: if .ifo found, don't recurse subdirectories.
local ifos = {}
local ok, iter, dir_obj = pcall(lfs.dir, path)
if ok then
local ifo_found = false
local subdirs = {}
for name in iter, dir_obj do
if name ~= "." and name ~= ".." then
local fullpath = path.."/"..name
local attributes = lfs.attributes(fullpath)
if attributes ~= nil then
if attributes.mode == "directory" then
local dirifos = getIfosInDir(fullpath) -- recurse
for _, ifo in pairs(dirifos) do
table.insert(ifos, ifo)
end
elseif fullpath:match("%.ifo$") then
table.insert(ifos, fullpath)
if fullpath:match("%.ifo$") then
table.insert(ifos, fullpath)
ifo_found = true
elseif not ifo_found then -- don't check for dirs anymore if we found one .ifo
local attributes = lfs.attributes(fullpath)
if attributes ~= nil and attributes.mode == "directory" then
table.insert(subdirs, fullpath)
end
end
end
end
if not ifo_found and #subdirs > 0 then
for _, subdir in pairs(subdirs) do
local dirifos = getIfosInDir(subdir)
for _, ifo in pairs(dirifos) do
table.insert(ifos, ifo)
end
end
end
end
return ifos
end