renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove invalid UTF8 chars from FTP (cloud storage) and sort order of requires (#2711)

Browse Source
This commit is contained in:
Robert
2017-04-03 00:06:59 +02:00
committed by Qingping Hou
parent 3ad3452d1a
commit 3f0ce5de34
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/apps/cloudstorage/ftp.lua
View File

@@ -1,12 +1,13 @@
local FtpApi = require("frontend/apps/cloudstorage/ftpapi")
local ConfirmBox = require("ui/widget/confirmbox")
local FtpApi = require("frontend/apps/cloudstorage/ftpapi")
local InfoMessage = require("ui/widget/infomessage")
local MultiInputDialog = require("ui/widget/multiinputdialog")
local UIManager = require("ui/uimanager")
local _ = require("gettext")
local T = require("ffi/util").template
local ReaderUI = require("apps/reader/readerui")
local Screen = require("device").screen
local UIManager = require("ui/uimanager")
local util = require("util")
local _ = require("gettext")
local T = require("ffi/util").template
local Ftp = {
}
@@ -33,6 +34,7 @@ function Ftp:downloadFile(item, address, user, pass, path, close)
local url = generateUrl(address, user, pass) .. item.url
local response = FtpApi:downloadFile(url)
if response ~= nil then
path = util.fixUtf8(path, "_")
local file = io.open(path, "w")
file:write(response)
file:close()

2
frontend/apps/cloudstorage/ftpapi.lua
View File

@@ -1,7 +1,7 @@
local DocumentRegistry = require("document/documentregistry")
local ftp = require("socket.ftp")
local ltn12 = require("ltn12")
local url = require("socket.url")
local DocumentRegistry = require("document/documentregistry")
local FtpApi = {
}