From db63db11b2cf5923ae1400d009253ddfb898f953 Mon Sep 17 00:00:00 2001 From: hius07 <62179190+hius07@users.noreply.github.com> Date: Thu, 16 May 2024 21:42:08 +0300 Subject: [PATCH] FileManager: safe initial path (#11774) We do not like trailing slash in the path (except root). Closes #11772. --- frontend/apps/filemanager/filemanager.lua | 4 ++-- frontend/apps/reader/readerui.lua | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua index cbf535e1e..987fd6f37 100644 --- a/frontend/apps/filemanager/filemanager.lua +++ b/frontend/apps/filemanager/filemanager.lua @@ -731,7 +731,7 @@ function FileManager:reinit(path, focused_file) UIManager:flushSettings() self.dimen = Screen:getSize() -- backup the root path and path items - self.root_path = path or self.file_chooser.path + self.root_path = BaseUtil.realpath(path or self.file_chooser.path) local path_items_backup = {} for k, v in pairs(self.file_chooser.path_items) do path_items_backup[k] = v @@ -1208,7 +1208,7 @@ function FileManager:showFiles(path, focused_file) FileManager.instance:onClose() end - path = path or G_reader_settings:readSetting("lastdir") or filemanagerutil.getDefaultDir() + path = BaseUtil.realpath(path or G_reader_settings:readSetting("lastdir") or filemanagerutil.getDefaultDir()) G_reader_settings:saveSetting("lastdir", path) self:setRotationMode() local file_manager = FileManager:new{ diff --git a/frontend/apps/reader/readerui.lua b/frontend/apps/reader/readerui.lua index abc346a3a..a7deea90f 100644 --- a/frontend/apps/reader/readerui.lua +++ b/frontend/apps/reader/readerui.lua @@ -558,7 +558,6 @@ function ReaderUI:showFileManager(file) local last_dir, last_file if file then last_dir = util.splitFilePathName(file) - last_dir = last_dir:match("(.*)/") last_file = file else last_dir, last_file = self:getLastDirFile(true)