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

Migrate history folder, FileManagerHistory uses own history.lua file and ReadHistory component

Browse Source
This commit is contained in:
Zijie He
2016-04-18 15:38:14 -07:00
committed by Hzj_jie
parent 2dbfcdf207
commit 667e8834ad
4 changed files with 133 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
frontend/docsettings.lua
View File

@@ -36,38 +36,37 @@ function DocSettings:purgeDocSettings(doc_path)
end
function DocSettings:open(docfile)
local history_path
local sidecar_path
-- TODO(zijiehe): Remove history_path, use only sidecar.
local new = { data = {} }
local ok, stored
if docfile == ".reader" then
-- we handle reader setting as special case
history_path = DataStorage:getDataDir() .. "/settings.reader.lua"
new.history_file = DataStorage:getDataDir() .. "/settings.reader.lua"
ok, stored = pcall(dofile, new.history_file)
else
history_path = self:getHistoryPath(docfile)
new.history_file = self:getHistoryPath(docfile)
local sidecar = self:getSidecarDir(docfile)
if lfs.attributes(sidecar, "mode") ~= "directory" then
lfs.mkdir(sidecar)
end
sidecar_path = sidecar.."/"..docfile:match(".*%/(.*)")..".lua"
end
-- construct settings obj
local new = {
history_file = history_path,
sidecar_file = sidecar_path,
data = {}
}
local ok, stored = pcall(dofile, new.sidecar_file or "")
if not ok then
ok, stored = pcall(dofile, new.history_file or "")
new.sidecar_file = sidecar.."/"..docfile:match(".*%/(.*)")..".lua"
ok, stored = pcall(dofile, new.sidecar_file or "")
if not ok then
-- try legacy conf path, for backward compatibility. this also
-- takes care of reader legacy setting
ok, stored = pcall(dofile, docfile..".kpdfview.lua")
ok, stored = pcall(dofile, new.history_file or "")
if not ok then
-- try legacy conf path, for backward compatibility. this also
-- takes care of reader legacy setting
ok, stored = pcall(dofile, docfile..".kpdfview.lua")
end
end
end
if ok and stored then
new.data = stored
end
return setmetatable(new, { __index = DocSettings})
end