Added blocking process execution, ENV loading.
This commit is contained in:
parent
f77efa1cd7
commit
be91137318
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
nimcache/
|
||||||
|
cliutils
|
||||||
|
*.sw?
|
72
cliutils.nim
72
cliutils.nim
@ -1,4 +1,4 @@
|
|||||||
import docopt, json, posix, nre, strutils
|
import docopt, json, osproc, posix, nre, streams, strutils, strtabs
|
||||||
import os except sleep
|
import os except sleep
|
||||||
|
|
||||||
type
|
type
|
||||||
@ -17,6 +17,76 @@ proc getVal*(cfg: CombinedConfig, key, default: string): string =
|
|||||||
else: return default
|
else: return default
|
||||||
|
|
||||||
|
|
||||||
|
proc loadEnv*(): StringTableRef =
|
||||||
|
result = newStringTable()
|
||||||
|
|
||||||
|
for k, v in envPairs():
|
||||||
|
result[k] = v
|
||||||
|
|
||||||
|
## Process execution
|
||||||
|
type HandleProcMsgCB* = proc (outMsg: TaintedString,
|
||||||
|
errMsg: TaintedString, cmd: string): void
|
||||||
|
|
||||||
|
proc sendMsg*(h: HandleProcMsgCB, outMsg: TaintedString,
|
||||||
|
errMsg: TaintedString = nil, cmd: string): void =
|
||||||
|
if h != nil: h(outMsg, errMsg, cmd)
|
||||||
|
|
||||||
|
proc waitForWithOutput*(p: Process, msgCB: HandleProcMsgCB,
|
||||||
|
procCmd: string = ""):
|
||||||
|
tuple[output: TaintedString, error: TaintedString, exitCode: int] =
|
||||||
|
|
||||||
|
var pout = outputStream(p)
|
||||||
|
var perr = errorStream(p)
|
||||||
|
|
||||||
|
result = (TaintedString"", TaintedString"", -1)
|
||||||
|
var line = newStringOfCap(120).TaintedString
|
||||||
|
while true:
|
||||||
|
if pout.readLine(line):
|
||||||
|
msgCB.sendMsg(line, nil, procCmd)
|
||||||
|
result[0].string.add(line.string)
|
||||||
|
result[0].string.add("\n")
|
||||||
|
elif perr.readLine(line):
|
||||||
|
msgCB.sendMsg(nil, line, procCmd)
|
||||||
|
result[1].string.add(line.string)
|
||||||
|
result[1].string.add("\n")
|
||||||
|
else:
|
||||||
|
result[2] = peekExitCode(p)
|
||||||
|
if result[2] != -1: break
|
||||||
|
close(p)
|
||||||
|
|
||||||
|
proc exec*(command: string, workingDir: string = "",
|
||||||
|
args: openArray[string] = [], env: StringTableRef = nil,
|
||||||
|
options: set[ProcessOption] = {poUsePath},
|
||||||
|
msgCB: HandleProcMsgCB = nil):
|
||||||
|
tuple[output: TaintedString, error: TaintedString, exitCode: int]
|
||||||
|
{.tags: [ExecIOEffect, ReadIOEffect], gcsafe.} =
|
||||||
|
|
||||||
|
var p = startProcess(command, workingDir, args, env, options)
|
||||||
|
result = waitForWithOutput(p, msgCb, command)
|
||||||
|
|
||||||
|
proc makeProcMsgHandler*(outSink, errSink: File): HandleProcMsgCB =
|
||||||
|
result = proc(outMsg, errMsg: TaintedString, cmd: string): void {.closure.} =
|
||||||
|
let prefix = if cmd != nil: cmd & ": " else: ""
|
||||||
|
if outMsg != nil: outSink.writeLine(prefix & outMsg)
|
||||||
|
if errMsg != nil: errSink.writeLine(prefix & errMsg)
|
||||||
|
|
||||||
|
proc makeProcMsgHandler*(outSink, errSink: Stream): HandleProcMsgCB =
|
||||||
|
result = proc(outMsg, errMsg: TaintedString, cmd: string): void {.closure.} =
|
||||||
|
let prefix = if cmd != nil: cmd & ": " else: ""
|
||||||
|
if outMsg != nil: outSink.writeLine(prefix & outMsg)
|
||||||
|
if errMsg != nil: errSink.writeLine(prefix & errMsg)
|
||||||
|
|
||||||
|
proc combineProcMsgHandlers*(a, b: HandleProcMsgCB): HandleProcMsgCB =
|
||||||
|
if a == nil: result = b
|
||||||
|
elif b == nil: result = a
|
||||||
|
else:
|
||||||
|
result = proc(cmd: string, outMsg, errMsg: TaintedString): void =
|
||||||
|
a(cmd, outMsg, errMsg)
|
||||||
|
b(cmd, outMsg, errMsg)
|
||||||
|
|
||||||
|
|
||||||
|
## Daemonize
|
||||||
|
|
||||||
var
|
var
|
||||||
pidFileInner: string
|
pidFileInner: string
|
||||||
fi, fo, fe: File
|
fi, fo, fe: File
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Package
|
# Package
|
||||||
|
|
||||||
version = "0.1.0"
|
version = "0.2.0"
|
||||||
author = "Jonathan Bernard"
|
author = "Jonathan Bernard"
|
||||||
description = "Helper functions for writing command line interfaces."
|
description = "Helper functions for writing command line interfaces."
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user