From da3ff5e336e757a9815c04cbb4f458fb937a4e42 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Sat, 25 Feb 2017 22:16:19 +0100
Subject: [PATCH] History: add 'autoremove_deleted_items_from_history' setting

---
 frontend/apps/filemanager/filemanager.lua | 33 ++++++++++++++---------
 frontend/readhistory.lua                  | 13 +++++++++
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua
index bcac1aed1..fbae28726 100644
--- a/frontend/apps/filemanager/filemanager.lua
+++ b/frontend/apps/filemanager/filemanager.lua
@@ -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,
                         })
diff --git a/frontend/readhistory.lua b/frontend/readhistory.lua
index bf836657f..ababe5ba1 100644
--- a/frontend/readhistory.lua
+++ b/frontend/readhistory.lua
@@ -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))