DocSettings: check legacy history location only once (#11439)

reviewable/pr11449/r1
hius07 3 months ago committed by GitHub
parent 962477e7c6
commit c3bb2263b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -77,6 +77,7 @@ local function initDataDir()
"data/dict", "data/dict",
"data/tessdata", "data/tessdata",
-- "docsettings", -- created when needed -- "docsettings", -- created when needed
-- "hashdocsettings", -- created when needed
-- "history", -- legacy/obsolete sidecar files -- "history", -- legacy/obsolete sidecar files
"ota", "ota",
-- "patches", -- must be created manually by the interested user -- "patches", -- must be created manually by the interested user

@ -35,6 +35,8 @@ local function isFile(file)
return lfs.attributes(file, "mode") == "file" return lfs.attributes(file, "mode") == "file"
end end
local is_history_location_enabled = isDir(HISTORY_DIR)
local doc_hash_cache = {} local doc_hash_cache = {}
local is_hash_location_enabled local is_hash_location_enabled
@ -164,7 +166,7 @@ function DocSettings:findSidecarFile(doc_path, no_legacy)
return sidecar_file, location return sidecar_file, location
end end
end end
if not no_legacy then if is_history_location_enabled and not no_legacy then
sidecar_file = self:getHistoryPath(doc_path) sidecar_file = self:getHistoryPath(doc_path)
if isFile(sidecar_file) then if isFile(sidecar_file) then
return sidecar_file, "hist" -- for isSidecarFileNotInPreferredLocation() used in moveBookMetadata return sidecar_file, "hist" -- for isSidecarFileNotInPreferredLocation() used in moveBookMetadata
@ -238,7 +240,7 @@ function DocSettings:open(doc_path)
new.hash_sidecar_dir = new:getSidecarDir(doc_path, "hash") new.hash_sidecar_dir = new:getSidecarDir(doc_path, "hash")
hash_sidecar_file = new.hash_sidecar_dir .. "/" .. new.sidecar_filename hash_sidecar_file = new.hash_sidecar_dir .. "/" .. new.sidecar_filename
end end
local history_file = new:getHistoryPath(doc_path) local history_file = is_history_location_enabled and new:getHistoryPath(doc_path)
-- Candidates list, in order of priority: -- Candidates list, in order of priority:
local candidates_list = { local candidates_list = {
@ -257,9 +259,9 @@ function DocSettings:open(doc_path)
-- Backup file of new sidecar file in hashdocsettings folder -- Backup file of new sidecar file in hashdocsettings folder
hash_sidecar_file and (hash_sidecar_file .. ".old") or "", hash_sidecar_file and (hash_sidecar_file .. ".old") or "",
-- Legacy history folder -- Legacy history folder
history_file, history_file or "",
-- Backup file in legacy history folder -- Backup file in legacy history folder
history_file .. ".old", history_file and (history_file .. ".old") or "",
-- Legacy kpdfview setting -- Legacy kpdfview setting
doc_path .. ".kpdfview.lua", doc_path .. ".kpdfview.lua",
} }

Loading…
Cancel
Save