From fb0606aa9cb5cc68ce7371896ec19ecbef344cca Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 1 Feb 2016 18:25:23 -0800 Subject: [PATCH] style(FM): rename internal only method into function --- frontend/apps/filemanager/filemanager.lua | 69 +++++++++++------------ 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua index f2f318f65..40b230eb5 100644 --- a/frontend/apps/filemanager/filemanager.lua +++ b/frontend/apps/filemanager/filemanager.lua @@ -22,6 +22,25 @@ local Font = require("ui/font") local DEBUG = require("dbg") local _ = require("gettext") +function getDefaultDir() + if Device:isKindle() then + return "/mnt/us/documents" + elseif Device:isKobo() then + return "/mnt/onboard" + elseif Device.isAndroid() then + return "/sdcard" + else + return "." + end +end + +function restoreScreenMode() + local screen_mode = G_reader_settings:readSetting("fm_screen_mode") + if Screen:getScreenMode() ~= screen_mode then + Screen:setScreenMode(screen_mode or "portrait") + end +end + local FileManager = InputContainer:extend{ title = _("FileManager"), root_path = lfs.currentdir(), @@ -217,41 +236,6 @@ function FileManager:onRefresh() return true end -function FileManager:getDefaultDir() - if Device:isKindle() then - return "/mnt/us/documents" - elseif Device:isKobo() then - return "/mnt/onboard" - elseif Device.isAndroid() then - return "/sdcard" - else - return "." - end -end - -function FileManager:restoreScreenMode() - local screen_mode = G_reader_settings:readSetting("fm_screen_mode") - if Screen:getScreenMode() ~= screen_mode then - Screen:setScreenMode(screen_mode or "portrait") - end -end - -function FileManager:showFiles(path) - DEBUG("show home page") - path = path or G_reader_settings:readSetting("lastdir") or self:getDefaultDir() - G_reader_settings:saveSetting("lastdir", path) - self:restoreScreenMode() - local file_manager = FileManager:new{ - dimen = Screen:getSize(), - root_path = path, - onExit = function() - self.instance = nil - end - } - UIManager:show(file_manager) - self.instance = file_manager -end - function FileManager:copyFile(file) self.cutfile = false self.clipboard = file @@ -339,4 +323,19 @@ function FileManager:getSortingMenuTable() } end +function FileManager:showFiles(path) + path = path or G_reader_settings:readSetting("lastdir") or getDefaultDir() + G_reader_settings:saveSetting("lastdir", path) + restoreScreenMode() + local file_manager = FileManager:new{ + dimen = Screen:getSize(), + root_path = path, + onExit = function() + self.instance = nil + end + } + UIManager:show(file_manager) + self.instance = file_manager +end + return FileManager