From 3f0ce5de3402b9ff3950727b2c8ba3182944520b Mon Sep 17 00:00:00 2001
From: Robert <robert.styla@gmail.com>
Date: Mon, 3 Apr 2017 00:06:59 +0200
Subject: [PATCH] Remove invalid UTF8 chars from FTP (cloud storage) and sort
 order of requires (#2711)

---
 frontend/apps/cloudstorage/ftp.lua    | 10 ++++++----
 frontend/apps/cloudstorage/ftpapi.lua |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/apps/cloudstorage/ftp.lua b/frontend/apps/cloudstorage/ftp.lua
index e6d8043bd..eb420e87b 100644
--- a/frontend/apps/cloudstorage/ftp.lua
+++ b/frontend/apps/cloudstorage/ftp.lua
@@ -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()
diff --git a/frontend/apps/cloudstorage/ftpapi.lua b/frontend/apps/cloudstorage/ftpapi.lua
index 2ad8cdc4e..58e51c627 100644
--- a/frontend/apps/cloudstorage/ftpapi.lua
+++ b/frontend/apps/cloudstorage/ftpapi.lua
@@ -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 = {
 }