jdb/slfmt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use system-native linebreaks.

Browse Source
This commit is contained in:
Jonathan Bernard
2025-07-14 10:33:13 -05:00
parent 8b0a684dab
commit 1b62f5d3a2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slfmt.nimble
View File

@ -1,6 +1,6 @@
# Package # Package
version = "0.2.3" version = "0.2.4"
author = "Jonathan Bernard" author = "Jonathan Bernard"
description = "Small utility to pretty-print strucutured logs." description = "Small utility to pretty-print strucutured logs."
license = "MIT" license = "MIT"

14
src/slfmt.nim
View File

@ -4,7 +4,7 @@ import docopt, timeutils, zero_functional
from std/logging import Level from std/logging import Level
from std/sequtils import toSeq from std/sequtils import toSeq
const VERSION = "0.2.3" const VERSION = "0.2.4"
const USAGE = """Usage: const USAGE = """Usage:
slfmt [options] slfmt [options]
@ -64,11 +64,11 @@ proc fullFormatField(name: string, value: JsonNode): string =
let valLines = splitLines(strVal) let valLines = splitLines(strVal)
if name.len + strVal.len + 6 > terminalWidth() or valLines.len > 1: if name.len + strVal.len + 6 > terminalWidth() or valLines.len > 1:
result &= "\n" & valLines.mapIt(" " & it).join("\n") & "\n" result &= "\p" & valLines.mapIt(" " & it).join("\p") & "\p"
else: result &= strVal & "\n" else: result &= strVal & "\p"
proc fullFormat(logJson: JsonNode): string = proc fullFormat(logJson: JsonNode): string =
result = '-'.repeat(terminalWidth()) & "\n" result = '-'.repeat(terminalWidth()) & "\p"
# Print the known fields in order first # Print the known fields in order first
for f in fieldDisplayOrder: for f in fieldDisplayOrder:
@ -79,7 +79,7 @@ proc fullFormat(logJson: JsonNode): string =
# Print the rest of the fields # Print the rest of the fields
for (key, val) in pairs(logJson): result &= fullFormatField(key, val) for (key, val) in pairs(logJson): result &= fullFormatField(key, val)
result &= "\n" result &= "\p"
proc compactFormat(logJson: JsonNode): string = proc compactFormat(logJson: JsonNode): string =
let ts = parseIso8601(logJson["ts"].getStr).local.formatIso8601 let ts = parseIso8601(logJson["ts"].getStr).local.formatIso8601
@ -114,10 +114,10 @@ proc compactFormat(logJson: JsonNode): string =
else: pretty(val) else: pretty(val)
let field = "$1: $2" % [decorate(key, fgCyan), fieldVal] let field = "$1: $2" % [decorate(key, fgCyan), fieldVal]
if line.len + field.len + 2 > terminalWidth(): if line.len + field.len + 2 > terminalWidth():
result &= "\n " & line result &= "\p " & line
line = " " line = " "
line &= field & " " line &= field & " "
result &= "\n " & line result &= "\p " & line
proc parseLogLine(logLine: string): JsonNode = proc parseLogLine(logLine: string): JsonNode =
result = parseJson(logLine) result = parseJson(logLine)