mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
Merge pull request #467 from thotypous/master
Fix dealing with filenames containing spaces
This commit is contained in:
@@ -9,6 +9,7 @@ local FileChooser = require("ui/widget/filechooser")
|
||||
local VerticalSpan = require("ui/widget/verticalspan")
|
||||
local VerticalGroup = require("ui/widget/verticalgroup")
|
||||
local ButtonTable = require("ui/widget/buttontable")
|
||||
local GestureRange = require("ui/gesturerange")
|
||||
local UIManager = require("ui/uimanager")
|
||||
local Input = require("ui/input")
|
||||
local Font = require("ui/font")
|
||||
@@ -221,14 +222,18 @@ end
|
||||
|
||||
function FileManager:pasteHere(file)
|
||||
if self.clipboard then
|
||||
local program = self.cutfile and "mv " or "cp -r "
|
||||
os.execute(program..util.realpath(self.clipboard).." "..util.realpath(file):match("(.*/)"))
|
||||
local orig = util.realpath(self.clipboard)
|
||||
local dest = util.realpath(file):match("(.*/)")
|
||||
if self.cutfile then
|
||||
util.execute("/bin/mv", orig, dest)
|
||||
else
|
||||
util.execute("/bin/cp", "-r", orig, dest)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function FileManager:deleteFile(file)
|
||||
local program = "rm -r "
|
||||
os.execute(program..util.realpath(file))
|
||||
util.execute("/bin/rm", "-r", util.realpath(file))
|
||||
end
|
||||
|
||||
return FileManager
|
||||
|
||||
Submodule koreader-base updated: aa1328ca5d...6078a77d92
Reference in New Issue
Block a user