From a9a75f503fedae88fa55ec68ccffa5d3a56dc7ac Mon Sep 17 00:00:00 2001
From: hius07 <62179190+hius07@users.noreply.github.com>
Date: Mon, 7 Feb 2022 18:12:48 +0200
Subject: [PATCH] FilemanagerShortcuts: call from PathChooser

---
 .../apps/filemanager/filemanagershortcuts.lua | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/frontend/apps/filemanager/filemanagershortcuts.lua b/frontend/apps/filemanager/filemanagershortcuts.lua
index 12d7e600d..bf171129a 100644
--- a/frontend/apps/filemanager/filemanagershortcuts.lua
+++ b/frontend/apps/filemanager/filemanagershortcuts.lua
@@ -15,7 +15,7 @@ local FileManagerShortcuts = InputContainer:extend{
     folder_shortcuts = G_reader_settings:readSetting("folder_shortcuts", {}),
 }
 
-function FileManagerShortcuts:updateItemTable()
+function FileManagerShortcuts:updateItemTable(select_callback)
     local item_table = {}
     for _, item in ipairs(self.folder_shortcuts) do
         table.insert(item_table, {
@@ -29,16 +29,20 @@ function FileManagerShortcuts:updateItemTable()
 
                 local folder = item.folder
                 if folder ~= nil and lfs.attributes(folder, "mode") == "directory" then
-                    if self.ui.file_chooser then
-                        self.ui.file_chooser:changeToPath(folder)
-                    else -- called from Reader
-                        local FileManager = require("apps/filemanager/filemanager")
-
-                        self.ui:onClose()
-                        if FileManager.instance then
-                            FileManager.instance:reinit(folder)
-                        else
-                            FileManager:showFiles(folder)
+                    if select_callback then
+                        select_callback(folder)
+                    else
+                        if self.ui.file_chooser then
+                            self.ui.file_chooser:changeToPath(folder)
+                        else -- called from Reader
+                            local FileManager = require("apps/filemanager/filemanager")
+
+                            self.ui:onClose()
+                            if FileManager.instance then
+                                FileManager.instance:reinit(folder)
+                            else
+                                FileManager:showFiles(folder)
+                            end
                         end
                     end
                 end
@@ -221,7 +225,7 @@ function FileManagerShortcuts:MenuSetRotationModeHandler(rotation)
     return true
 end
 
-function FileManagerShortcuts:onShowFolderShortcutsDialog()
+function FileManagerShortcuts:onShowFolderShortcutsDialog(select_callback)
     self.fm_bookmark = Menu:new{
         title = _("Folder shortcuts"),
         show_parent = self.ui,
@@ -233,14 +237,14 @@ function FileManagerShortcuts:onShowFolderShortcutsDialog()
         is_popout = false,
         is_borderless = true,
         curr_path = self.ui.file_chooser and self.ui.file_chooser.path or self.ui:getLastDirFile(),
-        onMenuHold = self.onMenuHold,
+        onMenuHold = not select_callback and self.onMenuHold or nil,
         onSetRotationMode = self.MenuSetRotationModeHandler,
-        title_bar_left_icon = "plus",
+        title_bar_left_icon = not select_callback and "plus" or nil,
         onLeftButtonTap = function() self:addNewFolder() end,
         _manager = self,
     }
 
-    self:updateItemTable()
+    self:updateItemTable(select_callback)
     UIManager:show(self.fm_bookmark)
 end