averello/koreader-mirror
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-12-13 20:36:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix/exit dir (#6163)

Browse Source
This commit is contained in:
mwoz123
2020-05-19 18:21:58 +02:00
committed by GitHub
parent 5704f63bfc
commit 0e2b430796
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/apps/reader/readerui.lua
View File

@@ -428,7 +428,16 @@ function ReaderUI:init()
-- end
end
function ReaderUI:getLastDirFile()
function ReaderUI:setLastDirForFileBrowser(dir)
self.last_dir_for_file_browser = dir
end
function ReaderUI:getLastDirFile(to_file_browser)
if to_file_browser and self.last_dir_for_file_browser then
local dir = self.last_dir_for_file_browser
self.last_dir_for_file_browser = nil
return dir
end
local QuickStart = require("ui/quickstart")
local last_dir
local last_file = G_reader_settings:readSetting("lastfile")
@@ -447,7 +456,7 @@ function ReaderUI:showFileManager(file)
last_dir, last_file = util.splitFilePathName(file)
last_dir = last_dir:match("(.*)/")
else
last_dir, last_file = self:getLastDirFile()
last_dir, last_file = self:getLastDirFile(true)
end
if FileManager.instance then
FileManager.instance:reinit(last_dir, last_file)

2
plugins/newsdownloader.koplugin/main.lua
View File

@@ -467,6 +467,8 @@ function NewsDownloader:onCloseDocument()
logger.dbg("NewsDownloader: news_download_dir_path:", news_download_dir_path)
logger.dbg("NewsDownloader: removing NewsDownloader file from history.")
ReadHistory:removeItemByPath(document_full_path)
local doc_dir = util.splitFilePathName(document_full_path)
self.ui:setLastDirForFileBrowser(doc_dir)
end
end

1
plugins/send2ebook.koplugin/main.lua
View File

@@ -227,6 +227,7 @@ function Send2Ebook:onCloseDocument()
logger.dbg("Send2Ebook: download_dir_path:", download_dir_path)
logger.dbg("Send2Ebook: removing Send2Ebook file from history.")
ReadHistory:removeItemByPath(document_full_path)
self.ui:setLastDirForFileBrowser(download_dir_path)
end
end

1
plugins/wallabag.koplugin/main.lua
View File

@@ -1047,6 +1047,7 @@ function Wallabag:onCloseDocument()
local document_full_path = self.ui.document.file
if document_full_path and self.directory and self:getLastPercent() == 1 and self.directory == string.sub(document_full_path, 1, string.len(self.directory)) then
ReadHistory:removeItemByPath(document_full_path)
self.ui:setLastDirForFileBrowser(self.directory)
end
end
end