mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
FileManager: safe initial path (#11774)
We do not like trailing slash in the path (except root). Closes #11772.
This commit is contained in:
@@ -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{
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user