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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	frontend/docsettings.lua
This commit is contained in:
Hzj_jie
2016-06-06 08:56:07 -07:00
parent 2085b774e2 589d2e757e
commit 016aaa92b9
15 changed files with 232 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
frontend/docsettings.lua
View File

@@ -5,7 +5,8 @@ local purgeDir = require("ffi/util").purgeDir
local DocSettings = {}
local history_dir = DataStorage:getHistoryDir()
local HISTORY_DIR = DataStorage:getHistoryDir()
local READER_SETTING_FILE = DataStorage:getDataDir() .. "/settings.reader.lua"
local function buildCandidate(file_path)
if lfs.attributes(file_path, "mode") == "file" then
@@ -21,7 +22,7 @@ function DocSettings:getSidecarDir(doc_path)
end
function DocSettings:getHistoryPath(fullpath)
return history_dir .. "/[" .. fullpath:gsub("(.*/)([^/]+)","%1] %2"):gsub("/","#") .. ".lua"
return HISTORY_DIR .. "/[" .. fullpath:gsub("(.*/)([^/]+)","%1] %2"):gsub("/","#") .. ".lua"
end
function DocSettings:getPathFromHistory(hist_name)
@@ -39,24 +40,19 @@ function DocSettings:getNameFromHistory(hist_name)
return string.sub(hist_name, s+2, -5)
end
function DocSettings:purgeDocSettings(doc_path)
purgeDir(self:getSidecarDir(doc_path))
os.remove(self:getHistoryPath(doc_path))
end
function DocSettings:open(docfile)
-- 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
new.history_file = DataStorage:getDataDir() .. "/settings.reader.lua"
new.history_file = READER_SETTING_FILE
ok, stored = pcall(dofile, new.history_file)
else
new.history_file = self:getHistoryPath(docfile)
local sidecar = self:getSidecarDir(docfile)
new.sidecar = sidecar
if lfs.attributes(sidecar, "mode") ~= "directory" then
lfs.mkdir(sidecar)
end
@@ -71,15 +67,15 @@ function DocSettings:open(docfile)
new.candidates = {}
-- New sidecar file
table.insert(new.candidates, buildCandidate(new.sidecar_file));
table.insert(new.candidates, buildCandidate(new.sidecar_file))
-- Legacy sidecar file
table.insert(new.candidates, buildCandidate(
self:getSidecarDir(docfile).."/"..
sidecar.."/"..
docfile:match(".*%/(.*)")..".lua"))
-- Legacy history folder
table.insert(new.candidates, buildCandidate(new.history_file));
table.insert(new.candidates, buildCandidate(new.history_file))
-- Legacy kpdfview setting
table.insert(new.candidates, buildCandidate(docfile..".kpdfview.lua"));
table.insert(new.candidates, buildCandidate(docfile..".kpdfview.lua"))
table.sort(new.candidates, function(l, r)
if l == nil then
return false
@@ -100,7 +96,7 @@ function DocSettings:open(docfile)
new.data = stored
end
return setmetatable(new, { __index = DocSettings})
return setmetatable(new, {__index = DocSettings})
end
function DocSettings:readSetting(key)
@@ -157,12 +153,12 @@ function DocSettings:close()
self:flush()
end
function DocSettings:clear()
function DocSettings:purge()
if self.history_file then
os.remove(self.history_file)
end
if self.sidecar_file then
os.remove(self.sidecar_file)
if lfs.attributes(self.sidecar, "mode") == "directory" then
purgeDir(self.sidecar)
end
end