From 66b9574b165be62e76c7397cf0eaa8d229d42675 Mon Sep 17 00:00:00 2001 From: bptato Date: Tue, 16 Apr 2024 15:08:44 +0200 Subject: Update code style * separate params with ; (semicolon) instead of , (colon) * reduce screaming snake case use * wrap long lines --- src/loader/cgi.nim | 4 ++-- src/loader/headers.nim | 16 ++++++++-------- src/loader/loader.nim | 2 +- src/loader/request.nim | 15 ++++++++++----- src/loader/response.nim | 2 +- 5 files changed, 22 insertions(+), 17 deletions(-) (limited to 'src/loader') diff --git a/src/loader/cgi.nim b/src/loader/cgi.nim index 10809767..79344b6f 100644 --- a/src/loader/cgi.nim +++ b/src/loader/cgi.nim @@ -96,7 +96,7 @@ proc handleFirstLine(handle: LoaderHandle; line: string; headers: Headers; headers.add(k, v) return crDone -proc handleControlLine(handle: LoaderHandle, line: string, headers: Headers, +proc handleControlLine(handle: LoaderHandle; line: string; headers: Headers; status: var uint16): ControlResult = let k = line.until(':') if k.len == line.len: @@ -114,7 +114,7 @@ proc handleControlLine(handle: LoaderHandle, line: string, headers: Headers, return crDone # returns false if transfer was interrupted -proc handleLine(handle: LoaderHandle, line: string, headers: Headers) = +proc handleLine(handle: LoaderHandle; line: string; headers: Headers) = let k = line.until(':') if k.len == line.len: # invalid diff --git a/src/loader/headers.nim b/src/loader/headers.nim index 20764760..d870eaea 100644 --- a/src/loader/headers.nim +++ b/src/loader/headers.nim @@ -32,21 +32,21 @@ proc fromJSHeadersInit(ctx: JSContext; val: JSValue): JSResult[HeadersInit] = let x = ?fromJS[Table[string, string]](ctx, val) return ok(HeadersInit(t: HEADERS_INIT_TABLE, tab: x)) -proc fill*(headers: Headers, s: seq[(string, string)]) = +proc fill*(headers: Headers; s: seq[(string, string)]) = for (k, v) in s: if k in headers.table: headers.table[k].add(v) else: headers.table[k] = @[v] -proc fill*(headers: Headers, tab: Table[string, string]) = +proc fill*(headers: Headers; tab: Table[string, string]) = for k, v in tab: if k in headers.table: headers.table[k].add(v) else: headers.table[k] = @[v] -proc fill*(headers: Headers, init: HeadersInit) = +proc fill*(headers: Headers; init: HeadersInit) = if init.t == HEADERS_INIT_SEQUENCE: headers.fill(init.s) else: # table @@ -86,26 +86,26 @@ func clone*(headers: Headers): Headers = table: headers.table ) -proc add*(headers: Headers, k, v: string) = +proc add*(headers: Headers; k, v: string) = let k = k.toHeaderCase() headers.table.withValue(k, p): p[].add(v) do: headers.table[k] = @[v] -proc `[]=`*(headers: Headers, k: static string, v: string) = +proc `[]=`*(headers: Headers; k: static string, v: string) = const k = k.toHeaderCase() headers.table[k] = @[v] -func `[]`*(headers: Headers, k: static string): string = +func `[]`*(headers: Headers; k: static string): string = const k = k.toHeaderCase() return headers.table[k][0] -func contains*(headers: Headers, k: static string): bool = +func contains*(headers: Headers; k: static string): bool = const k = k.toHeaderCase() return k in headers.table -func getOrDefault*(headers: Headers, k: static string, default = ""): string = +func getOrDefault*(headers: Headers; k: static string; default = ""): string = const k = k.toHeaderCase() headers.table.withValue(k, p): return p[][0] diff --git a/src/loader/loader.nim b/src/loader/loader.nim index 37da64cb..207600f2 100644 --- a/src/loader/loader.nim +++ b/src/loader/loader.nim @@ -970,7 +970,7 @@ proc redirectToFile*(loader: FileLoader; outputId: int; targetPath: string): const BufferSize = 4096 -proc onConnected*(loader: FileLoader, fd: int) = +proc onConnected*(loader: FileLoader; fd: int) = let connectData = loader.connecting[fd] let stream = connectData.stream let promise = connectData.promise diff --git a/src/loader/request.nim b/src/loader/request.nim index 824e643e..7be0f818 100644 --- a/src/loader/request.nim +++ b/src/loader/request.nim @@ -139,8 +139,8 @@ func newRequest*(url: URL; httpMethod = HTTP_GET; proxy = proxy ) -func createPotentialCORSRequest*(url: URL, destination: RequestDestination, - cors: CORSAttribute, fallbackFlag = false): Request = +func createPotentialCORSRequest*(url: URL; destination: RequestDestination; + cors: CORSAttribute; fallbackFlag = false): Request = var mode = if cors == NO_CORS: RequestMode.NO_CORS else: @@ -150,7 +150,12 @@ func createPotentialCORSRequest*(url: URL, destination: RequestDestination, let credentialsMode = if cors == ANONYMOUS: CredentialsMode.SAME_ORIGIN else: CredentialsMode.INCLUDE - return newRequest(url, destination = destination, mode = mode, credentialsMode = credentialsMode) + return newRequest( + url, + destination = destination, + mode = mode, + credentialsMode = credentialsMode + ) type BodyInitType = enum @@ -180,7 +185,7 @@ type proxyUrl: URL mode: Option[RequestMode] -proc fromJSBodyInit(ctx: JSContext, val: JSValue): JSResult[BodyInit] = +proc fromJSBodyInit(ctx: JSContext; val: JSValue): JSResult[BodyInit] = if JS_IsUndefined(val) or JS_IsNull(val): return err(nil) block formData: @@ -201,7 +206,7 @@ proc fromJSBodyInit(ctx: JSContext, val: JSValue): JSResult[BodyInit] = return ok(BodyInit(t: BODY_INIT_STRING, str: x.get)) return err(newTypeError("Invalid body init type")) -func newRequest*[T: string|Request](ctx: JSContext, resource: T, +func newRequest*[T: string|Request](ctx: JSContext; resource: T; init = none(RequestInit)): JSResult[Request] {.jsctor.} = when T is string: let url = ?newURL(resource) diff --git a/src/loader/response.nim b/src/loader/response.nim index dbec92d2..648b2e2b 100644 --- a/src/loader/response.nim +++ b/src/loader/response.nim @@ -145,7 +145,7 @@ proc blob*(response: Response): Promise[JSResult[Blob]] {.jsfunc.} = let blob = newBlob(unsafeAddr s[0], s.len, contentType, deallocFun) ok(blob)) -proc json(ctx: JSContext, this: Response): Promise[JSResult[JSValue]] +proc json(ctx: JSContext; this: Response): Promise[JSResult[JSValue]] {.jsfunc.} = return this.text().then(proc(s: JSResult[string]): JSResult[JSValue] = let s = ?s -- cgit 1.4.1-2-gfad0