From a3dc167925f7255b35c11f8c7e6607fb6e0d6b52 Mon Sep 17 00:00:00 2001 From: bptato Date: Thu, 5 Dec 2024 20:20:07 +0100 Subject: mimetypes: refactor, use mime.types for inline image extensions * remove std/streams use from mime.types; mmap and parse directly * use mime.types for inline image extensions * add some jpeg file extensions Latter came up because I was trying to add a format locally and it wouldn't recognize it on images from my file system (i.e. by extension). As a security measure we still do not allow additional extensions for predefined inline image types. --- src/utils/mimeguess.nim | 45 --------------------------------------------- src/utils/twtstr.nim | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 46 deletions(-) delete mode 100644 src/utils/mimeguess.nim (limited to 'src/utils') diff --git a/src/utils/mimeguess.nim b/src/utils/mimeguess.nim deleted file mode 100644 index d6224303..00000000 --- a/src/utils/mimeguess.nim +++ /dev/null @@ -1,45 +0,0 @@ -import std/algorithm -import std/streams -import std/tables - -import config/mimetypes - -const DefaultGuess* = block: - let ss = newStringStream(staticRead"res/mime.types") - parseMimeTypes(ss) - -func guessContentType*(mimeTypes: MimeTypes; path: string; - fallback = "application/octet-stream"): string = - var n = 0 - for i in countdown(path.high, 0): - if path[i] == '/': - break - if path[i] == '.': - n = i - break - if n > 0: - let ext = path.substr(n + 1) - return mimeTypes.getOrDefault(ext, fallback) - return fallback - -const JavaScriptTypes = [ - "application/ecmascript", - "application/javascript", - "application/x-ecmascript", - "application/x-javascript", - "text/ecmascript", - "text/javascript", - "text/javascript1.0", - "text/javascript1.1", - "text/javascript1.2", - "text/javascript1.3", - "text/javascript1.4", - "text/javascript1.5", - "text/jscript", - "text/livescript", - "text/x-ecmascript", - "text/x-javascript" -] - -func isJavaScriptType*(s: string): bool = - return JavaScriptTypes.binarySearch(s) != -1 diff --git a/src/utils/twtstr.nim b/src/utils/twtstr.nim index 78dc982d..a5493738 100644 --- a/src/utils/twtstr.nim +++ b/src/utils/twtstr.nim @@ -235,6 +235,11 @@ func skipBlanks*(buf: openArray[char]; at: int): int = while result < buf.len and buf[result] in AsciiWhitespace: inc result +func skipBlanksTillLF*(buf: openArray[char]; at: int): int = + result = at + while result < buf.len and buf[result] in AsciiWhitespace: + inc result + func stripAndCollapse*(s: openArray[char]): string = var res = newStringOfCap(s.len) var space = false @@ -254,7 +259,7 @@ func until*(s: openArray[char]; c: set[char]; starti = 0): string = break result &= s[i] -func untilLower*(s: string; c: set[char]; starti = 0): string = +func untilLower*(s: openArray[char]; c: set[char]; starti = 0): string = result = "" for i in starti ..< s.len: if s[i] in c: @@ -834,3 +839,15 @@ iterator mypairs*[T](a: openArray[T]): tuple[key: int; val: lent T] {.inline.} = {.push overflowChecks: off.} inc i {.pop.} + +proc getFileExt*(path: string): string = + var n = 0 + for i in countdown(path.high, 0): + if path[i] == '/': + break + if path[i] == '.': + n = i + break + if n > 0: + return path.substr(n + 1) + return "" -- cgit