mirror of
https://github.com/koreader/koreader
synced 2024-10-31 21:20:20 +00:00
0599c440cc
bidi.lua:
- Revert "Alias everything to Bidi.nowrap() when in LTR UI,
as using LTR isolates seems uneeded when already LTR" (part
of a628714f
) which was a wrong assumption: we need proper
wrappers for all things paths. Enhance some of these wrappers.
- Fix GetText RTL wrapping which was losing empty lines and
trailing \n.
- Wrap all paths, directories, filenames in the code with
these wrappers.
- Wrap all book metadata (title, authors...) with BD.auto(),
as it helps fixing some edge cases (like open/close quotation
marks which are not considered as bracket types by FriBiDi).
(Needed some minor logic changes in CoverBrowser.)
- Tweak hyphenation menu text
- Update forgotten SortWidget for UI mirroring
- KoptConfig: update "justification" index for RTL re-ordering,
following the recent addition of the page_gap_height option.
163 lines
5.6 KiB
Lua
163 lines
5.6 KiB
Lua
local BD = require("ui/bidi")
|
|
local ConfirmBox = require("ui/widget/confirmbox")
|
|
local DocumentRegistry = require("document/documentregistry")
|
|
local FtpApi = require("apps/cloudstorage/ftpapi")
|
|
local InfoMessage = require("ui/widget/infomessage")
|
|
local MultiInputDialog = require("ui/widget/multiinputdialog")
|
|
local ReaderUI = require("apps/reader/readerui")
|
|
local Screen = require("device").screen
|
|
local UIManager = require("ui/uimanager")
|
|
local logger = require("logger")
|
|
local util = require("util")
|
|
local _ = require("gettext")
|
|
local T = require("ffi/util").template
|
|
|
|
local Ftp = {}
|
|
|
|
function Ftp:run(address, user, pass, path)
|
|
local url = FtpApi:generateUrl(address, util.urlEncode(user), util.urlEncode(pass)) .. path
|
|
return FtpApi:listFolder(url, path)
|
|
end
|
|
|
|
function Ftp:downloadFile(item, address, user, pass, path, close)
|
|
local url = FtpApi:generateUrl(address, util.urlEncode(user), util.urlEncode(pass)) .. item.url
|
|
logger.dbg("downloadFile url", url)
|
|
local response = FtpApi:ftpGet(url, "retr")
|
|
if response ~= nil then
|
|
path = util.fixUtf8(path, "_")
|
|
local file = io.open(path, "w")
|
|
file:write(response)
|
|
file:close()
|
|
local __, filename = util.splitFilePathName(path)
|
|
if G_reader_settings:isTrue("show_unsupported") and not DocumentRegistry:hasProvider(filename) then
|
|
UIManager:show(InfoMessage:new{
|
|
text = T(_("File saved to:\n%1"), BD.filepath(path)),
|
|
})
|
|
else
|
|
UIManager:show(ConfirmBox:new{
|
|
text = T(_("File saved to:\n%1\nWould you like to read the downloaded book now?"),
|
|
BD.filepath(path)),
|
|
ok_callback = function()
|
|
close()
|
|
ReaderUI:showReader(path)
|
|
end
|
|
})
|
|
end
|
|
else
|
|
UIManager:show(InfoMessage:new{
|
|
text = T(_("Could not save file to:\n%1"), BD.filepath(path)),
|
|
timeout = 3,
|
|
})
|
|
end
|
|
end
|
|
|
|
function Ftp:config(item, callback)
|
|
local text_info = "FTP address must be in the format ftp://example.domain.com\n"..
|
|
"Also supported is format with IP e.g: ftp://10.10.10.1\n"..
|
|
"Username and password are optional."
|
|
local hint_name = _("Your FTP name")
|
|
local text_name = ""
|
|
local hint_address = _("FTP address eg ftp://example.com")
|
|
local text_address = ""
|
|
local hint_username = _("FTP username")
|
|
local text_username = ""
|
|
local hint_password = _("FTP password")
|
|
local text_password = ""
|
|
local hint_folder = _("FTP folder")
|
|
local text_folder = "/"
|
|
local title
|
|
local text_button_right = _("Add")
|
|
if item then
|
|
title = _("Edit FTP account")
|
|
text_button_right = _("Apply")
|
|
text_name = item.text
|
|
text_address = item.address
|
|
text_username = item.username
|
|
text_password = item.password
|
|
text_folder = item.url
|
|
else
|
|
title = _("Add FTP account")
|
|
end
|
|
self.settings_dialog = MultiInputDialog:new {
|
|
title = title,
|
|
fields = {
|
|
{
|
|
text = text_name,
|
|
input_type = "string",
|
|
hint = hint_name ,
|
|
},
|
|
{
|
|
text = text_address,
|
|
input_type = "string",
|
|
hint = hint_address ,
|
|
},
|
|
{
|
|
text = text_username,
|
|
input_type = "string",
|
|
hint = hint_username,
|
|
},
|
|
{
|
|
text = text_password,
|
|
input_type = "string",
|
|
text_type = "password",
|
|
hint = hint_password,
|
|
},
|
|
{
|
|
text = text_folder,
|
|
input_type = "string",
|
|
hint = hint_folder,
|
|
},
|
|
},
|
|
buttons = {
|
|
{
|
|
{
|
|
text = _("Cancel"),
|
|
callback = function()
|
|
self.settings_dialog:onClose()
|
|
UIManager:close(self.settings_dialog)
|
|
end
|
|
},
|
|
{
|
|
text = _("Info"),
|
|
callback = function()
|
|
UIManager:show(InfoMessage:new{ text = text_info })
|
|
end
|
|
},
|
|
{
|
|
text = text_button_right,
|
|
callback = function()
|
|
local fields = MultiInputDialog:getFields()
|
|
if fields[1] ~= "" and fields[2] ~= "" then
|
|
if item then
|
|
-- edit
|
|
callback(item, fields)
|
|
else
|
|
-- add new
|
|
callback(fields)
|
|
end
|
|
self.settings_dialog:onClose()
|
|
UIManager:close(self.settings_dialog)
|
|
else
|
|
UIManager:show(InfoMessage:new{
|
|
text = _("Please fill in all fields.")
|
|
})
|
|
end
|
|
end
|
|
},
|
|
},
|
|
},
|
|
width = Screen:getWidth() * 0.95,
|
|
height = Screen:getHeight() * 0.2,
|
|
input_type = "text",
|
|
}
|
|
UIManager:show(self.settings_dialog)
|
|
self.settings_dialog:onShowKeyboard()
|
|
end
|
|
|
|
function Ftp:info(item)
|
|
local info_text = T(_"Type: %1\nName: %2\nAddress: %3", "FTP", item.text, item.address)
|
|
UIManager:show(InfoMessage:new{text = info_text})
|
|
end
|
|
|
|
return Ftp
|