From affc0f48dec77492a2786a39d8b87a2691367e4d Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Fri, 2 Aug 2019 18:07:31 +0200 Subject: [PATCH] Go Big or Go Home! (#5163) * Tweak goHome to assume sane-ish defaults if no custom home dir is set (re #5154) * If we're already in Home, make goHome send us to the first page. --- frontend/apps/filemanager/filemanager.lua | 30 +++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua index 0319064a7..b6bc7df6f 100644 --- a/frontend/apps/filemanager/filemanager.lua +++ b/frontend/apps/filemanager/filemanager.lua @@ -560,9 +560,35 @@ end function FileManager:goHome() local home_dir = G_reader_settings:readSetting("home_dir") if home_dir then - self.file_chooser:changeToPath(home_dir) + -- Jump to the first page if we're already home + if self.file_chooser.path and home_dir == self.file_chooser.path then + self.file_chooser:onGotoPage(1) + else + self.file_chooser:changeToPath(home_dir) + end else - self:setHome() + -- Try some sane defaults, depending on platform + if Device:isKindle() then + home_dir = "/mnt/us" + elseif Device:isKobo() then + home_dir = "/mnt/onboard" + elseif Device:isPocketBook() then + home_dir = "/mnt/ext1" + elseif Device:isCervantes() then + home_dir = "/mnt/public" + elseif Device:isAndroid() then + home_dir = "/sdcard" + end + + if home_dir then + if self.file_chooser.path and home_dir == self.file_chooser.path then + self.file_chooser:onGotoPage(1) + else + self.file_chooser:changeToPath(home_dir) + end + else + self:setHome() + end end return true end