multipart

3 files changed, 162 insertions, 47 deletions

diff --git a/src/luarocks/upload/multipart-original.lua b/src/luarocks/upload/multipart-original.lua
new file mode 100644
index 00000000..790e368f
--- /dev/null
+++ b/src/luarocks/upload/multipart-original.lua
@@ -0,0 +1,109 @@
+
+local multipart = {}
+
+local File = {}
+
+local unpack = unpack or table.unpack
+
+-- socket.url.escape(s) from LuaSocket 3.0rc1
+function multipart.url_escape(s)
+   return (string.gsub(s, "([^A-Za-z0-9_])", function(c)
+      return string.format("%%%02x", string.byte(c))
+   end))
+end
+
+function File:mime()
+   if not self.mimetype then
+      local mimetypes_ok, mimetypes = pcall(require, "mimetypes")
+      if mimetypes_ok then
+         self.mimetype = mimetypes.guess(self.fname)
+      end
+      self.mimetype = self.mimetype or "application/octet-stream"
+   end
+   return self.mimetype
+end
+
+function File:content()
+   local fd = io.open(self.fname, "rb")
+   if not fd then
+      return nil, "Failed to open file: "..self.fname
+   end
+   local data = fd:read("*a")
+   fd:close()
+   return data
+end
+
+local function rand_string(len)
+   local shuffled = {}
+   for i = 1, len do
+      local r = math.random(97, 122)
+      if math.random() >= 0.5 then
+        r = r - 32
+      end
+      shuffled[i] = r
+   end
+   return string.char(unpack(shuffled))
+end
+
+-- multipart encodes params
+-- returns encoded string,boundary
+-- params is an a table of tuple tables:
+-- params = {
+--   {key1, value2},
+--   {key2, value2},
+--   key3: value3
+-- }
+function multipart.encode(params)
+   local tuples = { }
+   for i = 1, #params do
+      tuples[i] = params[i]
+   end
+   for k,v in pairs(params) do
+      if type(k) == "string" then
+         table.insert(tuples, {k, v})
+      end
+   end
+   local chunks = {}
+   for _, tuple in ipairs(tuples) do
+      local k,v = unpack(tuple)
+      k = multipart.url_escape(k)
+      local buffer = { 'Content-Disposition: form-data; name="' .. k .. '"' }
+      local content
+      if type(v) == "table" and v.__class == File then
+         buffer[1] = buffer[1] .. ('; filename="' .. v.fname:gsub(".*[/\\]", "") .. '"')
+         table.insert(buffer, "Content-type: " .. v:mime())
+         content = v:content()
+      else
+         content = v
+      end
+      table.insert(buffer, "")
+      table.insert(buffer, content)
+      table.insert(chunks, table.concat(buffer, "\r\n"))
+   end
+   local boundary
+   while not boundary do
+      boundary = "Boundary" .. rand_string(16)
+      for _, chunk in ipairs(chunks) do
+         if chunk:find(boundary) then
+            boundary = nil
+            break
+         end
+      end
+   end
+  local inner = "\r\n--" .. boundary .. "\r\n"
+  return table.concat({ "--", boundary, "\r\n",
+                        table.concat(chunks, inner),
+                        "\r\n", "--", boundary, "--", "\r\n" }), boundary
+end
+
+function multipart.new_file(fname, mime)
+   local self = {}
+   setmetatable(self, { __index = File })
+   self.__class = File
+   self.fname = fname
+   self.mimetype = mime
+   return self
+end
+
+return multipart
+
diff --git a/src/luarocks/upload/multipart.lua b/src/luarocks/upload/multipart.lua
index 790e368f..cf68bdef 100644
--- a/src/luarocks/upload/multipart.lua
+++ b/src/luarocks/upload/multipart.lua
@@ -1,18 +1,29 @@
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local math = _tl_compat and _tl_compat.math or math; local pairs = _tl_compat and _tl_compat.pairs or pairs; local pcall = _tl_compat and _tl_compat.pcall or pcall; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; local _tl_table_unpack = unpack or table.unpack
+local multipart = {File = {}, }
 
-local multipart = {}
 
-local File = {}
 
-local unpack = unpack or table.unpack
 
--- socket.url.escape(s) from LuaSocket 3.0rc1
+
+
+
+
+
+
+
+
+
+
+local File = multipart.File
+
+
 function multipart.url_escape(s)
    return (string.gsub(s, "([^A-Za-z0-9_])", function(c)
       return string.format("%%%02x", string.byte(c))
    end))
 end
 
-function File:mime()
+function multipart.File:mime()
    if not self.mimetype then
       local mimetypes_ok, mimetypes = pcall(require, "mimetypes")
       if mimetypes_ok then
@@ -23,10 +34,10 @@ function File:mime()
    return self.mimetype
 end
 
-function File:content()
+function multipart.File:content()
    local fd = io.open(self.fname, "rb")
    if not fd then
-      return nil, "Failed to open file: "..self.fname
+      return nil, "Failed to open file: " .. self.fname
    end
    local data = fd:read("*a")
    fd:close()
@@ -38,38 +49,35 @@ local function rand_string(len)
    for i = 1, len do
       local r = math.random(97, 122)
       if math.random() >= 0.5 then
-        r = r - 32
+         r = r - 32
       end
       shuffled[i] = r
    end
-   return string.char(unpack(shuffled))
+   return string.char(_tl_table_unpack(shuffled))
 end
 
--- multipart encodes params
--- returns encoded string,boundary
--- params is an a table of tuple tables:
--- params = {
---   {key1, value2},
---   {key2, value2},
---   key3: value3
--- }
+
+
+
+
+
+
+
+
 function multipart.encode(params)
-   local tuples = { }
-   for i = 1, #params do
-      tuples[i] = params[i]
-   end
-   for k,v in pairs(params) do
+   local tuples = {}
+   for k, v in pairs(params) do
       if type(k) == "string" then
-         table.insert(tuples, {k, v})
+         table.insert(tuples, { k, v })
       end
    end
    local chunks = {}
    for _, tuple in ipairs(tuples) do
-      local k,v = unpack(tuple)
+      local k, v = _tl_table_unpack(tuple)
       k = multipart.url_escape(k)
       local buffer = { 'Content-Disposition: form-data; name="' .. k .. '"' }
       local content
-      if type(v) == "table" and v.__class == File then
+      if type(v) == "table" then
          buffer[1] = buffer[1] .. ('; filename="' .. v.fname:gsub(".*[/\\]", "") .. '"')
          table.insert(buffer, "Content-type: " .. v:mime())
          content = v:content()
@@ -90,20 +98,20 @@ function multipart.encode(params)
          end
       end
    end
-  local inner = "\r\n--" .. boundary .. "\r\n"
-  return table.concat({ "--", boundary, "\r\n",
-                        table.concat(chunks, inner),
-                        "\r\n", "--", boundary, "--", "\r\n" }), boundary
+   local inner = "\r\n--" .. boundary .. "\r\n"
+   return table.concat({ "--", boundary, "\r\n",
+table.concat(chunks, inner),
+"\r\n", "--", boundary, "--", "\r\n", }), boundary
 end
 
 function multipart.new_file(fname, mime)
    local self = {}
+
    setmetatable(self, { __index = File })
-   self.__class = File
+
    self.fname = fname
    self.mimetype = mime
    return self
 end
 
 return multipart
-
diff --git a/src/luarocks/upload/multipart.tl b/src/luarocks/upload/multipart.tl
index 5bcbc502..28787da2 100644
--- a/src/luarocks/upload/multipart.tl
+++ b/src/luarocks/upload/multipart.tl
@@ -1,18 +1,20 @@
 
 local record multipart
-   record Parameters
-      {{string, (string | File)}}
-      map: {string: (string | File)}
+   -- record Parameters
+   --    {{string, (string | File)}}
+   --    map: {string: (string | File)}
+   -- end
+   type Parameters = {string: (string | File)}
+
+   record File
+      mimetype: string
+      fname: string
+      mime: function(File): string
    end
 end
 
 local type Parameters = multipart.Parameters
-
-local record File
-   mimetype: string
-   fname: string
-   mime: function(File): string
-end
+local type File = multipart.File
 
 -- socket.url.escape(s) from LuaSocket 3.0rc1 --?
 function multipart.url_escape(s: string): string
@@ -21,7 +23,7 @@ function multipart.url_escape(s: string): string
    end))
 end
 
-function File.mime(self: File): string
+function multipart.File:mime(): string
    if not self.mimetype then
       local mimetypes_ok, mimetypes = pcall(require, "mimetypes") 
       if mimetypes_ok then
@@ -32,7 +34,7 @@ function File.mime(self: File): string
    return self.mimetype
 end
 
-function File:content(): string, string
+function multipart.File:content(): string, string
    local fd = io.open(self.fname, "rb")
    if not fd then
       return nil, "Failed to open file: "..self.fname
@@ -64,10 +66,7 @@ end
 -- }
 function multipart.encode(params: Parameters): string, string --! Table map type
    local tuples: {{string, string | File}} = {} --! type
-   for i = 1, #params do
-      tuples[i] = params[i]
-   end
-   for k,v in pairs(params.map) do
+   for k,v in pairs(params) do
       if k is string then
          table.insert(tuples, {k, v})
       end
@@ -109,7 +108,6 @@ function multipart.new_file(fname: string, mime: string): File
    local self: File = {}
 
    setmetatable(self, { __index = File })
-   self.__class = File --! no such field in teal
 
    self.fname = fname
    self.mimetype = mime