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

FileSearcher: also show directory results

Browse Source 
Fixes #2177
This commit is contained in:
Frans de Jonge
2017-02-25 15:26:52 +01:00
committed by Qingping Hou
parent 47a40eb414
commit 0566df5f28
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/apps/filemanager/filemanagerfilesearcher.lua
View File

@@ -42,6 +42,7 @@ function FileSearcher:readDir()
local attributes = lfs.attributes(fullpath)
if attributes.mode == "directory" and f ~= "." and f~=".." then
table.insert(new_dirs, fullpath)
table.insert(self.files, {name = f, path = fullpath, attr = attributes})
elseif attributes.mode == "file" and DocumentRegistry:getProvider(fullpath) then
table.insert(self.files, {name = f, path = fullpath, attr = attributes})
end
@@ -52,6 +53,7 @@ function FileSearcher:readDir()
end
function FileSearcher:setSearchResults()
local FileManager = require("apps/filemanager/filemanager")
local ReaderUI = require("apps/reader/readerui")
local keywords = self.search_value
--DEBUG("self.files", self.files)
@@ -62,12 +64,21 @@ function FileSearcher:setSearchResults()
for __,f in pairs(self.files) do
DEBUG("f", f)
if string.find(string.lower(f.name), string.lower(keywords)) then
f.text = f.name
f.name = nil
f.callback = function()
ReaderUI:showReader(f.path)
if f.attr.mode == "directory" then
f.text = f.name.."/"
f.name = nil
f.callback = function()
FileManager:showFiles(f.path)
end
table.insert(self.results, f)
else
f.text = f.name
f.name = nil
f.callback = function()
ReaderUI:showReader(f.path)
end
table.insert(self.results, f)
end
table.insert(self.results, f)
end
end
end