Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
34ce2b61b9 | |||
661d5959c6 | |||
6665f09b7b | |||
bcb1c7c17c |
@ -1,6 +1,6 @@
|
|||||||
# Package
|
# Package
|
||||||
|
|
||||||
version = "4.23.2"
|
version = "4.24.0"
|
||||||
author = "Jonathan Bernard"
|
author = "Jonathan Bernard"
|
||||||
description = "Personal issue tracker."
|
description = "Personal issue tracker."
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
@ -20,7 +20,7 @@ requires @[
|
|||||||
|
|
||||||
# Dependencies from git.jdb-software.com/nim-jdb/packages
|
# Dependencies from git.jdb-software.com/nim-jdb/packages
|
||||||
requires @[
|
requires @[
|
||||||
"cliutils >= 0.6.4",
|
"cliutils >= 0.8.1",
|
||||||
"langutils >= 0.4.0",
|
"langutils >= 0.4.0",
|
||||||
"timeutils >= 0.5.4",
|
"timeutils >= 0.5.4",
|
||||||
"data_uri > 1.0.0",
|
"data_uri > 1.0.0",
|
||||||
|
32
src/pit.nim
32
src/pit.nim
@ -226,7 +226,7 @@ proc edit(issue: Issue) =
|
|||||||
# Try to parse the newly-edited issue to make sure it was successful.
|
# Try to parse the newly-edited issue to make sure it was successful.
|
||||||
let editedIssue = loadIssue(issue.filepath)
|
let editedIssue = loadIssue(issue.filepath)
|
||||||
editedIssue.store()
|
editedIssue.store()
|
||||||
except:
|
except CatchableError:
|
||||||
fatal "updated issue is invalid (ignoring edits): \n\t" &
|
fatal "updated issue is invalid (ignoring edits): \n\t" &
|
||||||
getCurrentExceptionMsg()
|
getCurrentExceptionMsg()
|
||||||
issue.store()
|
issue.store()
|
||||||
@ -392,7 +392,7 @@ when isMainModule:
|
|||||||
var stateOption = none(IssueState)
|
var stateOption = none(IssueState)
|
||||||
|
|
||||||
try: stateOption = some(parseEnum[IssueState](editRef))
|
try: stateOption = some(parseEnum[IssueState](editRef))
|
||||||
except: discard
|
except CatchableError: discard
|
||||||
|
|
||||||
if stateOption.isSome:
|
if stateOption.isSome:
|
||||||
let state = stateOption.get
|
let state = stateOption.get
|
||||||
@ -444,7 +444,7 @@ when isMainModule:
|
|||||||
issue["completed"] = getTime().local.formatIso8601
|
issue["completed"] = getTime().local.formatIso8601
|
||||||
if issue.hasProp("recurrence") and issue.getRecurrence.isSome:
|
if issue.hasProp("recurrence") and issue.getRecurrence.isSome:
|
||||||
let nextIssue = ctx.cfg.tasksDir.nextRecurrence(issue.getRecurrence.get, issue)
|
let nextIssue = ctx.cfg.tasksDir.nextRecurrence(issue.getRecurrence.get, issue)
|
||||||
ctx.cfg.tasksDir.store(nextIssue, Todo)
|
ctx.cfg.tasksDir.store(nextIssue, TodoToday)
|
||||||
info "created the next recurrence:"
|
info "created the next recurrence:"
|
||||||
stdout.writeLine formatIssue(nextIssue)
|
stdout.writeLine formatIssue(nextIssue)
|
||||||
|
|
||||||
@ -545,8 +545,12 @@ when isMainModule:
|
|||||||
|
|
||||||
if args["contexts"]: listContexts = true
|
if args["contexts"]: listContexts = true
|
||||||
elif args["<stateOrId>"]:
|
elif args["<stateOrId>"]:
|
||||||
try: statesOption = some(args["<stateOrId>"].mapIt(parseEnum[IssueState]($it)))
|
try:
|
||||||
except: issueIdsOption = some(args["<stateOrId>"].mapIt($it))
|
statesOption =
|
||||||
|
some(args["<stateOrId>"].
|
||||||
|
mapIt(parseEnum[IssueState]($it)))
|
||||||
|
except CatchableError:
|
||||||
|
issueIdsOption = some(args["<stateOrId>"].mapIt($it))
|
||||||
|
|
||||||
# List the known contexts
|
# List the known contexts
|
||||||
if listContexts:
|
if listContexts:
|
||||||
@ -610,7 +614,23 @@ when isMainModule:
|
|||||||
try: write(propOut, decodeDataUri(issue[$(args["<propName>"])]))
|
try: write(propOut, decodeDataUri(issue[$(args["<propName>"])]))
|
||||||
finally: close(propOut)
|
finally: close(propOut)
|
||||||
|
|
||||||
except:
|
elif args["show-dupes"]:
|
||||||
|
ctx.loadAllIssues()
|
||||||
|
|
||||||
|
var idsToPaths = newTable[string, var seq[string]]()
|
||||||
|
for (state, issues) in pairs(ctx.issues):
|
||||||
|
for issue in issues:
|
||||||
|
let issueId = $issue.id
|
||||||
|
|
||||||
|
if idsToPaths.hasKey(issueId): idsToPaths[issueId].add(issue.filepath)
|
||||||
|
else: idsToPaths[issueId] = @[issue.filepath]
|
||||||
|
|
||||||
|
for (issueId, issuePaths) in pairs(idsToPaths):
|
||||||
|
if issuePaths.len < 2: continue
|
||||||
|
stdout.writeLine(issueId & ":\p " & issuePaths.join("\p ") & "\p\p")
|
||||||
|
|
||||||
|
except CatchableError:
|
||||||
fatal getCurrentExceptionMsg()
|
fatal getCurrentExceptionMsg()
|
||||||
|
debug getCurrentException().getStackTrace()
|
||||||
#raise getCurrentException()
|
#raise getCurrentException()
|
||||||
quit(QuitFailure)
|
quit(QuitFailure)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
const PIT_VERSION* = "4.23.2"
|
const PIT_VERSION* = "4.24.0"
|
||||||
|
|
||||||
const USAGE* = """Usage:
|
const USAGE* = """Usage:
|
||||||
pit ( new | add) <summary> [<state>] [options]
|
pit ( new | add) <summary> [<state>] [options]
|
||||||
@ -14,6 +14,7 @@ const USAGE* = """Usage:
|
|||||||
pit ( delete | rm ) <id>... [options]
|
pit ( delete | rm ) <id>... [options]
|
||||||
pit add-binary-property <id> <propName> <propSource> [options]
|
pit add-binary-property <id> <propName> <propSource> [options]
|
||||||
pit get-binary-property <id> <propName> <propDest> [options]
|
pit get-binary-property <id> <propName> <propDest> [options]
|
||||||
|
pit show-dupes
|
||||||
pit help [options]
|
pit help [options]
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
|
@ -168,7 +168,7 @@ proc parseDate*(d: string): DateTime =
|
|||||||
var errMsg = ""
|
var errMsg = ""
|
||||||
for df in DATE_FORMATS:
|
for df in DATE_FORMATS:
|
||||||
try: return d.parse(df)
|
try: return d.parse(df)
|
||||||
except:
|
except CatchableError:
|
||||||
errMsg &= "\n\tTried " & df & " with " & d
|
errMsg &= "\n\tTried " & df & " with " & d
|
||||||
continue
|
continue
|
||||||
raise newException(ValueError, "Unable to parse input as a date: " & d & errMsg)
|
raise newException(ValueError, "Unable to parse input as a date: " & d & errMsg)
|
||||||
@ -413,14 +413,12 @@ proc find*(
|
|||||||
|
|
||||||
### Configuration utilities
|
### Configuration utilities
|
||||||
proc loadConfig*(args: Table[string, Value] = initTable[string, Value]()): PitConfig =
|
proc loadConfig*(args: Table[string, Value] = initTable[string, Value]()): PitConfig =
|
||||||
let pitrcLocations = @[
|
var pitrcFilename: string
|
||||||
if args["--config"]: $args["--config"] else: "",
|
|
||||||
".pitrc", $getEnv("PITRC"), $getEnv("HOME") & "/.pitrc"]
|
|
||||||
|
|
||||||
var pitrcFilename: string =
|
try:
|
||||||
pitrcLocations --> fold("", if fileExists(it): it else: a)
|
pitrcFilename = findConfigFile(".pitrc",
|
||||||
|
if args["--config"]: @[$args["--config"]] else: @[])
|
||||||
if not fileExists(pitrcFilename):
|
except ValueError:
|
||||||
warn "could not find .pitrc file: " & pitrcFilename
|
warn "could not find .pitrc file: " & pitrcFilename
|
||||||
if isEmptyOrWhitespace(pitrcFilename):
|
if isEmptyOrWhitespace(pitrcFilename):
|
||||||
pitrcFilename = $getEnv("HOME") & "/.pitrc"
|
pitrcFilename = $getEnv("HOME") & "/.pitrc"
|
||||||
@ -428,25 +426,19 @@ proc loadConfig*(args: Table[string, Value] = initTable[string, Value]()): PitCo
|
|||||||
try:
|
try:
|
||||||
cfgFile = open(pitrcFilename, fmWrite)
|
cfgFile = open(pitrcFilename, fmWrite)
|
||||||
cfgFile.write("{\"tasksDir\": \"/path/to/tasks\"}")
|
cfgFile.write("{\"tasksDir\": \"/path/to/tasks\"}")
|
||||||
except: warn "could not write default .pitrc to " & pitrcFilename
|
except CatchableError: warn "could not write default .pitrc to " & pitrcFilename
|
||||||
finally: close(cfgFile)
|
finally: close(cfgFile)
|
||||||
|
|
||||||
var cfgJson: JsonNode
|
debug "loading config from '$#'" % [pitrcFilename]
|
||||||
try: cfgJson = parseFile(pitrcFilename)
|
let cfg = initCombinedConfig(pitrcFilename, args)
|
||||||
except: raise newException(IOError,
|
|
||||||
"unable to read config file: " & pitrcFilename &
|
|
||||||
"\x0D\x0A" & getCurrentExceptionMsg())
|
|
||||||
|
|
||||||
let cfg = CombinedConfig(docopt: args, json: cfgJson)
|
|
||||||
|
|
||||||
result = PitConfig(
|
result = PitConfig(
|
||||||
cfg: cfg,
|
cfg: cfg,
|
||||||
contexts: newTable[string,string](),
|
contexts: newTable[string,string](),
|
||||||
tasksDir: cfg.getVal("tasks-dir", ""))
|
tasksDir: cfg.getVal("tasks-dir", ""))
|
||||||
|
|
||||||
if cfgJson.hasKey("contexts"):
|
for k, v in cfg.getJson("contexts", newJObject()):
|
||||||
for k, v in cfgJson["contexts"]:
|
result.contexts[k] = v.getStr()
|
||||||
result.contexts[k] = v.getStr()
|
|
||||||
|
|
||||||
if isEmptyOrWhitespace(result.tasksDir):
|
if isEmptyOrWhitespace(result.tasksDir):
|
||||||
raise newException(Exception, "no tasks directory configured")
|
raise newException(Exception, "no tasks directory configured")
|
||||||
|
Reference in New Issue
Block a user