Add support for multiple file uploads with same name

Co-authored-by: ringabout <43030857+ringabout@users.noreply.github.com>

Author: Copilot

src/prologue/core/context.nim

@@ -166,10 +166,19 @@ func initUploadFile*(filename, body: string): UpLoadFile =
   UploadFile(filename: filename, body: body)
 
 func getUploadFile*(ctx: Context, name: string): UpLoadFile {.inline.} =
-  ## Gets the UploadFile from request.
+  ## Gets the first UploadFile from request with the given name.
+  ## For retrieving multiple files with the same name, use `getUploadFiles` instead.
   let file = ctx.request.formParams[name]
   initUploadFile(filename = file.params.getOrDefault("filename"), body = file.body)
 
+func getUploadFiles*(ctx: Context, name: string): seq[UpLoadFile] {.inline.} =
+  ## Gets all UploadFiles from request with the given name.
+  ## This is useful when multiple files are uploaded from a single input element with the `multiple` attribute.
+  result = @[]
+  if ctx.request.formParams.data.hasKey(name):
+    for file in ctx.request.formParams.data[name]:
+      result.add(initUploadFile(filename = file.params.getOrDefault("filename"), body = file.body))
+
 proc save*(uploadFile: UpLoadFile, dir: string, filename = "") {.inline.} =
   ## Saves the UploadFile to ``dir``.
   if not dirExists(dir):

src/prologue/core/form.nim

@@ -63,7 +63,8 @@ func parseFormPart*(body, contentType: string): FormPart =
     for line in head.splitLines:
       let header = line.parseHeader
       if header.key != "Content-Disposition":
-        result.data[name].params[header.key] = header.value[0]
+        if name.len > 0 and result.data.hasKey(name) and result.data[name].len > 0:
+          result.data[name][^1].params[header.key] = header.value[0]
         continue
       pos = 0
       let
@@ -81,18 +82,20 @@ func parseFormPart*(body, contentType: string): FormPart =
         case formKey
         of "name":
           name = move(formValue)
-          result.data[name] = (newStringTable(mode = modeCaseSensitive), "")
+          if not result.data.hasKey(name):
+            result.data[name] = @[]
+          result.data[name].add((newStringTable(mode = modeCaseSensitive), ""))
         of "filename":
-          result.data[name].params["filename"] = move(formValue)
+          result.data[name][^1].params["filename"] = move(formValue)
         of "filename*":
-          result.data[name].params["filenameStar"] = move(formValue)
+          result.data[name][^1].params["filenameStar"] = move(formValue)
         else:
           discard
         inc(times)
         if times >= 3:
           break
 
-    result.data[name].body = tail
+    result.data[name][^1].body = tail
 
 func parseFormParams*(request: var Request, contentType: string) =
   ## Parses get or post or query parameters.

src/prologue/core/types.nim

@@ -40,18 +40,24 @@ type
     Fault = "fault"
 
   FormPart* = object
-    data*: OrderedTableRef[string, tuple[params: StringTableRef, body: string]]
+    data*: OrderedTableRef[string, seq[tuple[params: StringTableRef, body: string]]]
 
 
 func initFormPart*(): FormPart =
-  FormPart(data: newOrderedTable[string, (StringTableRef, string)]())
+  FormPart(data: newOrderedTable[string, seq[(StringTableRef, string)]]())
 
 func `[]`*(formPart: FormPart, key: string): tuple[params: StringTableRef,
            body: string] {.inline.} =
-  formPart.data[key]
+  # Returns the first item for backward compatibility
+  if formPart.data.hasKey(key) and formPart.data[key].len > 0:
+    formPart.data[key][0]
+  else:
+    (newStringTable(mode = modeCaseSensitive), "")
 
 proc `[]=`*(formPart: FormPart, key: string, body: string) {.inline.} =
-  formPart.data[key] = (newStringTable(mode = modeCaseSensitive), body)
+  if not formPart.data.hasKey(key):
+    formPart.data[key] = @[]
+  formPart.data[key].add((newStringTable(mode = modeCaseSensitive), body))
 
 func tryParseInt(value: string, default: int): int {.inline.} =
   try:

tests/unit/tunit_core/tunit_context.nim

@@ -301,3 +301,89 @@ suite "getFormParams":
     #Then
     check param == ""
 
+
+
+suite "getUploadFile":
+  test "Given a single uploaded file, When getUploadFile is called, Then return the file":
+    #Given
+    var ctx = new Context
+    ctx.request.formParams = initFormPart()
+    let expectedFilename = "test.txt"
+    let expectedBody = "file content"
+    ctx.request.formParams.data["file"] = @[(newStringTable({"filename": expectedFilename}.newStringTable), expectedBody)]
+    
+    #When
+    let uploadFile = ctx.getUploadFile("file")
+
+    #Then
+    check uploadFile.filename == expectedFilename
+    check uploadFile.body == expectedBody
+  
+  test "Given multiple uploaded files with same name, When getUploadFile is called, Then return the first file":
+    #Given
+    var ctx = new Context
+    ctx.request.formParams = initFormPart()
+    let expectedFilename = "test1.txt"
+    let expectedBody = "first file content"
+    ctx.request.formParams.data["files"] = @[
+      (newStringTable({"filename": expectedFilename}.newStringTable), expectedBody),
+      (newStringTable({"filename": "test2.txt"}.newStringTable), "second file content")
+    ]
+    
+    #When
+    let uploadFile = ctx.getUploadFile("files")
+
+    #Then
+    check uploadFile.filename == expectedFilename
+    check uploadFile.body == expectedBody
+
+
+suite "getUploadFiles":
+  test "Given multiple uploaded files with same name, When getUploadFiles is called, Then return all files":
+    #Given
+    var ctx = new Context
+    ctx.request.formParams = initFormPart()
+    ctx.request.formParams.data["files"] = @[
+      (newStringTable({"filename": "test1.txt"}.newStringTable), "first file content"),
+      (newStringTable({"filename": "test2.txt"}.newStringTable), "second file content"),
+      (newStringTable({"filename": "test3.txt"}.newStringTable), "third file content")
+    ]
+    
+    #When
+    let uploadFiles = ctx.getUploadFiles("files")
+
+    #Then
+    check uploadFiles.len == 3
+    check uploadFiles[0].filename == "test1.txt"
+    check uploadFiles[0].body == "first file content"
+    check uploadFiles[1].filename == "test2.txt"
+    check uploadFiles[1].body == "second file content"
+    check uploadFiles[2].filename == "test3.txt"
+    check uploadFiles[2].body == "third file content"
+  
+  test "Given a single uploaded file, When getUploadFiles is called, Then return a sequence with one file":
+    #Given
+    var ctx = new Context
+    ctx.request.formParams = initFormPart()
+    let expectedFilename = "test.txt"
+    let expectedBody = "file content"
+    ctx.request.formParams.data["file"] = @[(newStringTable({"filename": expectedFilename}.newStringTable), expectedBody)]
+    
+    #When
+    let uploadFiles = ctx.getUploadFiles("file")
+
+    #Then
+    check uploadFiles.len == 1
+    check uploadFiles[0].filename == expectedFilename
+    check uploadFiles[0].body == expectedBody
+  
+  test "Given no uploaded files, When getUploadFiles is called, Then return an empty sequence":
+    #Given
+    var ctx = new Context
+    ctx.request.formParams = initFormPart()
+    
+    #When
+    let uploadFiles = ctx.getUploadFiles("nonexistent")
+
+    #Then
+    check uploadFiles.len == 0

tests/unit/tunit_core/tunit_form.nim

@@ -56,3 +56,45 @@ block:
   doAssert formPart.data.contains("myfile"), "myfile field should be present"
   doAssert formPart.data["myfile"].body == "Hello World"
   doAssert formPart.data["myfile"].params.getOrDefault("filename", "") == "test.txt"
+
+block:
+  # Test for multiple file inputs with the same name (issue: handle multiple file upload from a single input element)
+  # This tests that multiple files uploaded with the same input name are all captured
+  const testmime =
+    "------WebKitFormBoundary7MA4YWxkTrZu0gW\13\10" &
+    "Content-Disposition: form-data; name=\"files\"; filename=\"test1.txt\"\13\10" &
+    "Content-Type: text/plain\13\10" &
+    "\13\10" &
+    "First file content\13\10" &
+    "------WebKitFormBoundary7MA4YWxkTrZu0gW\13\10" &
+    "Content-Disposition: form-data; name=\"files\"; filename=\"test2.txt\"\13\10" &
+    "Content-Type: text/plain\13\10" &
+    "\13\10" &
+    "Second file content\13\10" &
+    "------WebKitFormBoundary7MA4YWxkTrZu0gW\13\10" &
+    "Content-Disposition: form-data; name=\"files\"; filename=\"test3.txt\"\13\10" &
+    "Content-Type: text/plain\13\10" &
+    "\13\10" &
+    "Third file content\13\10" &
+    "------WebKitFormBoundary7MA4YWxkTrZu0gW--\13\10"
+  const contenttype = "multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW"
+  let formPart = parseFormPart(testmime, contenttype)
+  
+  # Verify that all three files with the same name are captured
+  doAssert formPart.data.contains("files"), "files field should be present"
+  doAssert formPart.data["files"].len == 3, "Should have 3 files"
+  
+  # Verify first file
+  doAssert formPart.data["files"][0].body == "First file content"
+  doAssert formPart.data["files"][0].params.getOrDefault("filename", "") == "test1.txt"
+  doAssert formPart.data["files"][0].params.getOrDefault("Content-Type", "") == "text/plain"
+  
+  # Verify second file
+  doAssert formPart.data["files"][1].body == "Second file content"
+  doAssert formPart.data["files"][1].params.getOrDefault("filename", "") == "test2.txt"
+  doAssert formPart.data["files"][1].params.getOrDefault("Content-Type", "") == "text/plain"
+  
+  # Verify third file
+  doAssert formPart.data["files"][2].body == "Third file content"
+  doAssert formPart.data["files"][2].params.getOrDefault("filename", "") == "test3.txt"
+  doAssert formPart.data["files"][2].params.getOrDefault("Content-Type", "") == "text/plain"