jdb/nim-esv-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework Markdown formatting to handle quoted passages and poem structure.

Browse Source
This commit is contained in:
Jonathan Bernard 2023-06-25 18:44:13 -05:00
parent d622d767a0
commit a0c17bcad9
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esv_api.nimble
View File

@ -1,6 +1,6 @@
# Package # Package
version = "0.2.2" version = "0.2.3"
author = "Jonathan Bernard" author = "Jonathan Bernard"
description = "Simple Nim CLI wrapper around the ESV API (api.esv.org)" description = "Simple Nim CLI wrapper around the ESV API (api.esv.org)"
license = "MIT" license = "MIT"

33
src/esv_api.nim
View File

@ -7,15 +7,30 @@ import std/[httpclient, json, logging, os, re, strutils, uri, wordwrap]
import cliutils, docopt, zero_functional import cliutils, docopt, zero_functional
proc formatMarkdown(raw: string): string = proc formatMarkdown(raw: string): string =
let rawLines = raw.splitLines var reference = ""
let wrapped = (raw.splitLines --> var inVerse = false
filter(match(it, re"^\s+(\[\d+\]|\w).*")). var verseLines = newSeq[string]()
map(it.strip.multiReplace([(re"\((\d+)\)", ""), (re"\[(\d+)\]", "**$1**")])).
map(wrapWords(it, maxLineWidth = 74, newLine = "\p"))).
join("\p")
result = (wrapped.splitLines --> map("> " & it)).join("\p") & for line in raw.splitLines:
"\p>\p> -- *" & rawLines[0].strip & " (ESV)*" if reference.len == 0: reference = line.strip
if inVerse:
if line.startsWith("Footnotes"): inVerse = false
elif line.isEmptyOrWhitespace and verseLines[^1] != "":
verseLines.add("")
elif not line.match(re"^\s+[^\s]"): continue
elif line.match(re"$(.*)\(ESV\)$"): verseLines.add(line[0 ..< ^5])
else: verseLines.add(line)
elif line.match(re"^\s+\[\d+\]"):
inVerse = true
verseLines.add(line)
let wrapped = (verseLines -->
map(if it.len > 90: it.strip else: it & " ").
map(it.multiReplace([(re"\((\d+)\)", ""), (re"\[(\d+)\]", "**$1**")])).
map(wrapWords(it, maxLineWidth = 74, newLine = "\p"))).join("\p")
result = (wrapped.splitLines --> map("> " & it)).
join("\p") & "\p> -- *" & reference & " (ESV)*"
when isMainModule: when isMainModule:
const USAGE = """Usage: const USAGE = """Usage:
@ -44,7 +59,7 @@ Options:
try: try:
# Parse arguments # Parse arguments
let args = docopt(USAGE, version = "0.2.2") let args = docopt(USAGE, version = "0.2.3")
if args["--debug"]: if args["--debug"]:
consoleLogger.levelThreshold = lvlDebug consoleLogger.levelThreshold = lvlDebug