From c91224f12cde99b011d2ebfa7e5e4c3c7eae6eb7 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 7 Sep 2014 17:19:51 +0800 Subject: [PATCH 1/2] add default directory for filemanager --- frontend/apps/filemanager/filemanager.lua | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua index ae8410925..ec5451c0d 100644 --- a/frontend/apps/filemanager/filemanager.lua +++ b/frontend/apps/filemanager/filemanager.lua @@ -13,6 +13,7 @@ local UIManager = require("ui/uimanager") local Font = require("ui/font") local Screen = require("ui/screen") local Geom = require("ui/geometry") +local Device = require("ui/device") local Event = require("ui/event") local DEBUG = require("dbg") local _ = require("gettext") @@ -163,9 +164,21 @@ function FileManager:onClose() 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:showFiles(path) DEBUG("show home page") - path = path or G_reader_settings:readSetting("lastdir") + path = path or G_reader_settings:readSetting("lastdir") or self:getDefaultDir() G_reader_settings:saveSetting("lastdir", path) UIManager:show(FileManager:new{ dimen = Screen:getSize(), From 98da30f689ef657cd58ef8ef939564f736cb0329 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 7 Sep 2014 17:21:58 +0800 Subject: [PATCH 2/2] fix href with two slash --- frontend/ui/widget/opdsbrowser.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/ui/widget/opdsbrowser.lua b/frontend/ui/widget/opdsbrowser.lua index af90caccd..169bb1817 100644 --- a/frontend/ui/widget/opdsbrowser.lua +++ b/frontend/ui/widget/opdsbrowser.lua @@ -206,6 +206,13 @@ function OPDSBrowser:genItemTableFromURL(item_url, base_url) local function build_href(href) if href:match("^http") then return href + elseif href:match("^//") then + local parsed = url.parse(item_url or base_url) + if parsed and parsed.scheme then + return parsed.scheme .. ":" .. href + else + return "http:" .. href + end elseif base_url then return base_url .. "/" .. href elseif item_url then @@ -302,7 +309,7 @@ end function OPDSBrowser:downloadFile(title, format, remote_url) -- download to last opened dir -- TODO: let the user select where to store the downloaded file? - local lastdir = G_reader_settings:readSetting("lastdir") + local lastdir = G_reader_settings:readSetting("lastdir") or "." local local_path = lastdir .. "/" .. title .. "." .. string.lower(format) DEBUG("downloading file", local_path, "from", remote_url)