Committing with require.

1 files changed, 76 insertions, 13 deletions

diff --git a/src/ftp.lua b/src/ftp.lua
index 306b77f..efb872a 100644
--- a/src/ftp.lua
+++ b/src/ftp.lua
@@ -10,6 +10,11 @@ if not LUASOCKET_LIBNAME then error('module requires LuaSocket') end
 -- get LuaSocket namespace
 local socket = _G[LUASOCKET_LIBNAME] 
 if not socket then error('module requires LuaSocket') end
+
+-- require other modules
+require("ltn12")
+require("url")
+
 -- create namespace inside LuaSocket namespace
 socket.ftp  = socket.ftp or {}
 -- make all module globals fall into namespace
@@ -25,6 +30,7 @@ TIMEOUT = 60
 PORT = 21
 -- this is the default anonymous password. used when no password is
 -- provided in url. should be changed to your e-mail.
+USER = "ftp"
 EMAIL = "anonymous@anonymous.org"
 -- block size used in transfers
 BLOCKSIZE = 2048
@@ -48,21 +54,20 @@ local function pasv(pasvt)
 end
 
 function metat.__index:login(user, password)
-    socket.try(self.tp:command("USER", user))
+    socket.try(self.tp:command("user", user or USER))
     local code, reply = socket.try(self.tp:check{"2..", 331})
     if code == 331 then
-        socket.try(password, reply)
-        socket.try(self.tp:command("PASS", password))
+        socket.try(self.tp:command("pass", password or EMAIL))
         socket.try(self.tp:check("2.."))
     end
     return 1
 end
 
 function metat.__index:pasv()
-    socket.try(self.tp:command("PASV"))
+    socket.try(self.tp:command("pasv"))
     local code, reply = socket.try(self.tp:check("2.."))
-    local _, _, a, b, c, d, p1, p2 = 
-        string.find(reply, "(%d+)%D(%d+)%D(%d+)%D(%d+)%D(%d+)%D(%d+)")
+    local pattern = "(%d+)%D(%d+)%D(%d+)%D(%d+)%D(%d+)%D(%d+)"
+    local a, b, c, d, p1, p2 = socket.skip(2, string.find(reply, pattern))
     socket.try(a and b and c and d and p1 and p2, reply)
     self.pasvt = { 
         ip = string.format("%d.%d.%d.%d", a, b, c, d), 
@@ -97,7 +102,7 @@ function metat.__index:send(sendt)
     local data
     socket.try(self.pasvt or self.portt, "need port or pasv first")
     if self.pasvt then data = socket.try(pasv(self.pasvt)) end
-    socket.try(self.tp:command(sendt.command, sendt.argument))
+    socket.try(self.tp:command(sendt.command or "stor", sendt.argument))
     local code, reply = socket.try(self.tp:check{"2..", "1.."})
     if self.portt then data = socket.try(port(self.portt)) end
     local step = sendt.step or ltn12.pump.step
@@ -124,7 +129,7 @@ function metat.__index:receive(recvt)
     local data
     socket.try(self.pasvt or self.portt, "need port or pasv first")
     if self.pasvt then data = socket.try(pasv(self.pasvt)) end
-    socket.try(self.tp:command(recvt.command, recvt.argument))
+    socket.try(self.tp:command(recvt.command or "retr", recvt.argument))
     local code = socket.try(self.tp:check{"1..", "2.."})
     if self.portt then data = socket.try(port(self.portt)) end
     local source = socket.source("until-closed", data)
@@ -140,13 +145,13 @@ function metat.__index:receive(recvt)
 end
 
 function metat.__index:cwd(dir)
-    socket.try(self.tp:command("CWD", dir))
+    socket.try(self.tp:command("cwd", dir))
     socket.try(self.tp:check(250))
     return 1
 end
 
 function metat.__index:type(type)
-    socket.try(self.tp:command("TYPE", type))
+    socket.try(self.tp:command("type", type))
     socket.try(self.tp:check(200))
     return 1
 end
@@ -158,7 +163,7 @@ function metat.__index:greet()
 end
 
 function metat.__index:quit()
-    socket.try(self.tp:command("QUIT"))
+    socket.try(self.tp:command("quit"))
     socket.try(self.tp:check("2.."))
     return 1
 end
@@ -171,11 +176,69 @@ end
 -----------------------------------------------------------------------------
 -- High level FTP API
 -----------------------------------------------------------------------------
+local function tput(putt)
+    local ftp = socket.ftp.open(putt.host, putt.port)
+    ftp:greet()
+    ftp:login(putt.user, putt.password)
+    if putt.type then ftp:type(putt.type) end
+    ftp:pasv()
+    ftp:send(putt)
+    ftp:quit()
+    return ftp:close()
+end
 
-function put(putt)
+local default = {
+        path = "/",
+        scheme = "ftp"
+}
+
+local function parse(url)
+    local putt = socket.try(socket.url.parse(url, default))
+    socket.try(putt.scheme == "ftp", "invalid scheme '" .. putt.scheme .. "'")
+    socket.try(putt.host, "invalid host")
+    local pat = "^type=(.)$"
+    if putt.params then 
+        putt.type = socket.skip(2, string.find(putt.params, pat))
+        socket.try(putt.type == "a" or putt.type == "i")
+    end
+    -- skip first backslash in path
+    putt.argument = string.sub(putt.path, 2)
+    return putt
 end
 
-function get(gett)
+local function sput(url, body)
+    local putt = parse(url) 
+    putt.source = ltn12.source.string(body)
+    return tput(putt)
 end
 
+put = socket.protect(function(putt, body)
+    if type(putt) == "string" then return sput(putt, body)
+    else return tput(putt) end
+end)
+
+local function tget(gett)
+    local ftp = socket.ftp.open(gett.host, gett.port)
+    ftp:greet()
+    ftp:login(gett.user, gett.password)
+    if gett.type then ftp:type(gett.type) end
+    ftp:pasv()
+    ftp:receive(gett)
+    ftp:quit()
+    return ftp:close()
+end
+
+local function sget(url, body)
+    local gett = parse(url) 
+    local t = {}
+    gett.sink = ltn12.sink.table(t)
+    tget(gett)
+    return table.concat(t)
+end
+
+get = socket.protect(function(gett)
+    if type(gett) == "string" then return sget(gett, body)
+    else return tget(gett) end
+end)
+
 return ftp