Add files argument

mishankov · Aug 19, 2024 · 8a16932 · 8a16932
1 parent 1205cdf
commit 8a16932
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/yahttp.nim b/src/yahttp.nim
@@ -85,7 +85,7 @@ const defaultEncodeQueryParams = EncodeQueryParams(usePlus: false, omitEq: true,
 proc request*(url: string, httpMethod: Method = Method.GET, headers: openArray[
     RequestHeader] = [], query: openArray[QueryParam] = [],
         encodeQueryParams: EncodeQueryParams = defaultEncodeQueryParams,
-        body: string = "", data: tuple[name, fileName, contentType, content: string] = ("", "", "", ""),
+        body: string = "", files: openArray[tuple[name, fileName, contentType, content: string]] = [],
     auth: BasicAuth = ("", ""), timeout = -1, ignoreSsl = false, sslContext: SslContext = nil): Response =
   ## Genreal proc to make HTTP request with every HTTP method
 
@@ -131,9 +131,10 @@ proc request*(url: string, httpMethod: Method = Method.GET, headers: openArray[
 
   # Make request
 
-  let response = if data.name != "":
+  let response = if files.len() > 0:
     var multipartData = newMultipartData()
-    multipartData[data.name] = (data.fileName, data.contentType, data.content)
+    for file in files:
+      multipartData[file.name] = (file.fileName, file.contentType, file.content)
     client.request(innerUrl, httpMethod = innerMethod, multipart = multipartData)
   else:
     client.request(innerUrl, httpMethod = innerMethod, body = body)

diff --git a/src/yahttp/internal/utils.nim b/src/yahttp/internal/utils.nim
@@ -6,7 +6,7 @@ macro http_method_gen*(name: untyped): untyped =
   let comment = newCommentStmtNode(fmt"Proc for {methodUpper} HTTP method")
   quote do:
     proc `name`*(url: string, headers: openArray[RequestHeader] = [], query: openArray[
-      QueryParam] = [], encodeQueryParams: EncodeQueryParams = defaultEncodeQueryParams, body: string = "", auth: BasicAuth = ("", ""), timeout = -1,
+      QueryParam] = [], encodeQueryParams: EncodeQueryParams = defaultEncodeQueryParams, body: string = "", files: openArray[tuple[name, fileName, contentType, content: string]] = [], auth: BasicAuth = ("", ""), timeout = -1,
       ignoreSsl = false, sslContext: SslContext = nil): Response =
       `comment`
       return request(
@@ -15,6 +15,7 @@ macro http_method_gen*(name: untyped): untyped =
         headers = headers,
         query = query,
         body = body,
+        files = files,
         auth = auth,
         timeout = timeout,
         ignoreSsl = ignoreSsl,