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

History: add 'autoremove_deleted_items_from_history' setting

Browse Source
This commit is contained in:
Frans de Jonge
2017-02-25 22:16:19 +01:00
committed by Qingping Hou
parent 827e77afbe
commit da3ff5e336
2 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/apps/filemanager/filemanager.lua
View File

@@ -163,19 +163,18 @@ function FileManager:init()
text = _("Purge .sdr"),
enabled = DocSettings:hasSidecarFile(util.realpath(file)),
callback = function()
local full_path = util.realpath(file)
os.remove(DocSettings:getSidecarFile(full_path))
-- If the sidecar folder is empty, os.remove() can
-- delete it. Otherwise, the following statement has no
-- effect.
os.remove(DocSettings:getSidecarDir(full_path))
self:refreshPath()
-- also remove from history if present
local readhistory = require("readhistory")
for _, hist_item in ipairs(readhistory.hist) do
if hist_item.file == full_path then
readhistory:removeItem(hist_item)
break
local file_abs_path = util.realpath(file)
if file_abs_path then
local autoremove_deleted_items_from_history = G_reader_settings:readSetting("autoremove_deleted_items_from_history") or false
os.remove(DocSettings:getSidecarFile(file_abs_path))
-- If the sidecar folder is empty, os.remove() can
-- delete it. Otherwise, the following statement has no
-- effect.
os.remove(DocSettings:getSidecarDir(file_abs_path))
self:refreshPath()
-- also delete from history if autoremove_deleted_items_from_history is enabled
if autoremove_deleted_items_from_history then
require("readhistory"):removeItemByPath(file_abs_path)
end
end
UIManager:close(self.file_dialog)
@@ -198,7 +197,15 @@ function FileManager:init()
UIManager:show(ConfirmBox:new{
text = _("Are you sure that you want to delete this file?\n") .. file .. ("\n") .. _("If you delete a file, it is permanently lost."),
ok_callback = function()
local autoremove_deleted_items_from_history = G_reader_settings:readSetting("autoremove_deleted_items_from_history") or false
local file_abs_path = util.realpath(file)
deleteFile(file)
-- also delete from history if autoremove_deleted_items_from_history is enabled
if autoremove_deleted_items_from_history then
if file_abs_path then
require("readhistory"):removeItemByPath(file_abs_path)
end
end
self:refreshPath()
end,
})

13
frontend/readhistory.lua
View File

@@ -47,6 +47,10 @@ function ReadHistory:_indexing(start)
end
function ReadHistory:_sort()
local autoremove_deleted_items_from_history = G_reader_settings:readSetting("autoremove_deleted_items_from_history") or false
if autoremove_deleted_items_from_history then
self:clearMissing()
end
for i = #self.hist, 1, -1 do
if self.hist[i].file == nil then
table.remove(self.hist, i)
@@ -130,6 +134,15 @@ function ReadHistory:clearMissing()
end
end
function ReadHistory:removeItemByPath(path)
for i = #self.hist, 1, -1 do
if self.hist[i].file == path then
self:removeItem(self.hist[i])
break
end
end
end
function ReadHistory:removeItem(item)
table.remove(self.hist, item.index)
os.remove(DocSettings:getHistoryPath(item.file))