Better PTK integration.

- Now includes the context as a PTK tag (if present).
- Add the PIT ID to the PTK notes.

pit.nimble

@@ -1,8 +1,6 @@
 # Package
 
-include "src/pitpkg/private/version.nim"
+version       = "4.7.0"
-
-version       = PIT_VERSION
 author        = "Jonathan Bernard"
 description   = "Personal issue tracker."
 license       = "MIT"
@@ -11,5 +9,17 @@ bin           = @["pit", "pit_api"]
 
 # Dependencies
 
-requires @[ "nim >= 0.18.0", "cliutils 0.3.5", "docopt 0.6.5", "jester 0.2.0",
+requires @[
-  "timeutils 0.3.0", "uuids 0.1.9" ]
+  "nim >= 0.19.0",
+  "docopt 0.6.8",
+  "jester 0.4.1",
+  "uuids 0.1.10",
+
+  "https://git.jdb-labs.com/jdb/nim-cli-utils.git >= 0.6.1",
+  "https://git.jdb-labs.com/jdb/nim-lang-utils.git >= 0.4.0",
+  "https://git.jdb-labs.com/jdb/nim-time-utils.git >= 0.4.0",
+  "https://git.jdb-labs.com/jdb/update-nim-package-version"
+]
+
+task updateVersion, "Update the version of this package.":
+  exec "update_nim_package_version pit 'src/pitpkg/version.nim'"

src/pit.nim

@@ -1,23 +1,30 @@
 ## Personal Issue Tracker CLI interface
 ## ====================================
 
-import cliutils, docopt, json, logging, options, os, ospaths, sequtils,
+import cliutils, docopt, json, logging, options, os, sequtils,
   tables, terminal, times, timeutils, unicode, uuids
 
-import strutils except capitalize, toUpper, toLower
+from nre import re
+import strutils except capitalize, strip, toUpper, toLower
 import pitpkg/private/libpit
 export libpit
 
-include "pitpkg/private/version.nim"
+include "pitpkg/version.nim"
 
 type
   CliContext = ref object
-    autoList, triggerPtk, verbose: bool
     cfg*: PitConfig
     contexts*: TableRef[string, string]
-    defaultContext*, tasksDir*: string
+    defaultContext*: Option[string]
+    tasksDir*: string
     issues*: TableRef[IssueState, seq[Issue]]
     termWidth*: int
+    triggerPtk*, verbose*: bool
+
+let EDITOR =
+  if existsEnv("EDITOR"): getEnv("EDITOR")
+  else: "vi"
+
 
 proc initContext(args: Table[string, Value]): CliContext =
   let pitCfg = loadConfig(args)
@@ -29,9 +36,10 @@ proc initContext(args: Table[string, Value]): CliContext =
   let cliCfg = CombinedConfig(docopt: args, json: cliJson)
 
   result = CliContext(
-    autoList: cliJson.getOrDefault("autoList").getBool(false),
     contexts: pitCfg.contexts,
-    defaultContext: cliJson.getOrDefault("defaultContext").getStr(""),
+    defaultContext:
+      if not cliJson.hasKey("defaultContext"): none(string)
+      else: some(cliJson["defaultContext"].getStr()),
     verbose: parseBool(cliCfg.getVal("verbose", "false")) and not args["--quiet"],
     issues: newTable[IssueState, seq[Issue]](),
     tasksDir: pitCfg.tasksDir,
@@ -44,77 +52,96 @@ proc getIssueContextDisplayName(ctx: CliContext, context: string): string =
     else: return context.capitalize()
   return ctx.contexts[context]
 
-proc writeIssue(ctx: CliContext, issue: Issue, width: int, indent = "",
+proc formatIssue(ctx: CliContext, issue: Issue): string =
-                verbose = false, topPadded = false) =
+  result = ($issue.id).withColor(fgBlack, true) & "\n"&
-  var showDetails = not issue.details.isNilOrWhitespace and verbose
+           issue.summary.withColor(fgWhite) & "\n"
-
-  if showDetails and not topPadded: stdout.writeLine("")
-
-  # Wrap and write the summary.
-  var wrappedSummary = (" ".repeat(5) & issue.summary).wordWrap(width - 2).indent(2 + indent.len)
-  wrappedSummary = wrappedSummary[(6 + indent.len)..^1]
-  stdout.setForegroundColor(fgBlack, true)
-  stdout.write(indent & ($issue.id)[0..<6])
-  stdout.setForegroundColor(fgWhite, false)
-  stdout.write(wrappedSummary)
 
   if issue.tags.len > 0:
-    stdout.setForegroundColor(fgGreen, false)
+    result &= "tags: ".withColor(fgMagenta) &
-    let tagsStr = "(" & issue.tags.join(",") & ")"
+              issue.tags.join(",").withColor(fgGreen, true) & "\n"
-    if (wrappedSummary.splitLines[^1].len + tagsStr.len + 1) < (width - 2):
+
-      stdout.writeLine(" " & tagsStr)
+  if issue.properties.len > 0:
-    else:
+    result &= termColor(fgMagenta)
-      stdout.writeLine("\n" & indent & "  " & tagsStr)
+    for k, v in issue.properties: result &= k & ": " & v & "\n"
-  else: stdout.writeLine("")
+
+
+  result &= "--------".withColor(fgBlack, true) & "\n"
+  if not issue.details.isNilOrWhitespace:
+    result &= issue.details.strip.withColor(fgCyan) & "\n"
+
+proc formatSectionIssue(ctx: CliContext, issue: Issue, width: int, indent = "",
+                verbose = false): string =
+
+  result = ""
+
+  var showDetails = not issue.details.isNilOrWhitespace and verbose
+
+  var prefixLen = 0
+  var summaryIndentLen = indent.len + 7
+
+  if issue.hasProp("delegated-to"): prefixLen += issue["delegated-to"].len + 2 # space for the ':' and ' '
+
+  # Wrap and write the summary.
+  var wrappedSummary = ("+".repeat(prefixLen) & issue.summary).wordWrap(width - summaryIndentLen).indent(summaryIndentLen)
+
+  wrappedSummary = wrappedSummary[(prefixLen + summaryIndentLen)..^1]
+
+  result = (indent & ($issue.id)[0..<6]).withColor(fgBlack, true) & " "
+
+  if issue.hasProp("delegated-to"):
+    result &= (issue["delegated-to"] & ": ").withColor(fgGreen)
+
+  result &= wrappedSummary.withColor(fgWhite)
+
+  if issue.tags.len > 0:
+    let tagsStr = "(" & issue.tags.join(", ") & ")"
+    if (result.splitLines[^1].len + tagsStr.len + 1) > (width - 2):
+      result &= "\n" & indent
+    result &= " " & tagsStr.withColor(fgGreen)
+
 
   if issue.hasProp("pending"):
     let startIdx = "Pending: ".len
-    var pendingText = issue["pending"].wordWrap(width - startIdx - 2)
+    var pendingText = issue["pending"].wordWrap(width - startIdx - summaryIndentLen)
                                       .indent(startIdx)
-    pendingText = ("Pending: " & pendingText[startIdx..^1]).indent(indent.len + 2)
+    pendingText = ("Pending: " & pendingText[startIdx..^1]).indent(summaryIndentLen)
-    stdout.setForegroundColor(fgCyan, false)
+    result &= "\n" & pendingText.withColor(fgCyan)
-    stdout.writeLine(pendingText)
 
   if showDetails:
-    stdout.setForegroundColor(fgCyan, false)
+    result &= "\n" & issue.details.strip.indent(indent.len + 2).withColor(fgCyan)
-    stdout.writeLine(issue.details.indent(indent.len + 2))
 
-  stdout.resetAttributes
+  result &= termReset
 
-proc writeSection(ctx: CliContext, issues: seq[Issue], state: IssueState,
+proc formatSectionIssueList(ctx: CliContext, issues: seq[Issue], width: int,
-                   indent = "", verbose = false) =
+        indent: string, verbose: bool): string =
+
+  result = ""
+  for i in issues:
+    var issueText = ctx.formatSectionIssue(i, width, indent, verbose)
+    result &= issueText & "\n"
+
+proc formatSection(ctx: CliContext, issues: seq[Issue], state: IssueState,
+                   indent = "", verbose = false): string =
   let innerWidth = ctx.termWidth - (indent.len * 2)
 
-  stdout.setForegroundColor(fgBlue, true)
+  result = termColor(fgBlue) &
-  stdout.writeLine(indent & ".".repeat(innerWidth))
+    (indent & ".".repeat(innerWidth)) & "\n" &
-  stdout.writeLine(state.displayName.center(ctx.termWidth))
+    state.displayName.center(ctx.termWidth) & "\n\n" &
-  stdout.writeLine("")
+    termReset
-  stdout.resetAttributes
 
   let issuesByContext = issues.groupBy("context")
 
-  var topPadded = true
-
   if issues.len > 5 and issuesByContext.len > 1:
     for context, ctxIssues in issuesByContext:
-      topPadded = true
-      stdout.setForegroundColor(fgYellow, false)
-      stdout.writeLine(indent & ctx.getIssueContextDisplayName(context) & ":")
-      stdout.writeLine("")
-      stdout.resetAttributes
 
-      for i in ctxIssues:
+      result &= termColor(fgYellow) &
-        ctx.writeIssue(i, innerWidth - 2, indent & "  ", verbose, topPadded)
+        indent & ctx.getIssueContextDisplayName(context) & ":" &
-        topPadded = not i.details.isNilOrWhitespace and verbose
+        termReset & "\n\n"
 
-      if not topPadded: stdout.writeLine("")
+      result &= ctx.formatSectionIssueList(ctxIssues, innerWidth - 2, indent & "  ", verbose)
+      result &= "\n"
 
-  else:
+  else: result &= ctx.formatSectionIssueList(issues, innerWidth, indent, verbose)
-    for i in issues:
-      ctx.writeIssue(i, innerWidth, indent, verbose, topPadded)
-      topPadded = not i.details.isNilOrWhitespace and verbose
-
-  stdout.writeLine("")
 
 proc loadIssues(ctx: CliContext, state: IssueState) =
   ctx.issues[state] = loadIssues(ctx.tasksDir / $state)
@@ -144,16 +171,18 @@ proc writeHeader(ctx: CliContext, header: string) =
   stdout.writeLine('~'.repeat(ctx.termWidth))
   stdout.resetAttributes
 
+proc reorder(ctx: CliContext, state: IssueState) =
+
+  # load the issues to make sure the order file contains all issues in the state.
+  ctx.loadIssues(state)
+  discard os.execShellCmd(EDITOR & " '" & (ctx.tasksDir / $state / "order.txt") & "' </dev/tty >/dev/tty")
+
 proc edit(issue: Issue) =
 
   # Write format comments (to help when editing)
   writeFile(issue.filepath, toStorageFormat(issue, true))
 
-  let editor =
+  discard os.execShellCmd(EDITOR & " '" & issue.filepath & "' </dev/tty >/dev/tty")
-    if existsEnv("EDITOR"): getEnv("EDITOR")
-    else: "vi"
-
-  discard os.execShellCmd(editor & " " & issue.filepath & " </dev/tty >/dev/tty")
 
   try:
     # Try to parse the newly-edited issue to make sure it was successful.
@@ -164,17 +193,23 @@ proc edit(issue: Issue) =
       getCurrentExceptionMsg()
     issue.store()
 
-proc list(ctx: CliContext, filter: Option[IssueFilter], state: Option[IssueState], today, future, verbose: bool) =
+proc list(ctx: CliContext, filter: Option[IssueFilter], state: Option[IssueState], showToday, showFuture, verbose: bool) =
 
   if state.isSome:
     ctx.loadIssues(state.get)
     if filter.isSome: ctx.filterIssues(filter.get)
-    ctx.writeSection(ctx.issues[state.get], state.get, "", verbose)
+    stdout.write ctx.formatSection(ctx.issues[state.get], state.get, "", verbose)
     return
 
   ctx.loadAllIssues()
   if filter.isSome: ctx.filterIssues(filter.get)
 
+  let today = showToday and [Current, TodoToday].anyIt(
+    ctx.issues.hasKey(it) and ctx.issues[it].len > 0)
+
+  let future = showFuture and [Pending, Todo].anyIt(
+    ctx.issues.hasKey(it) and ctx.issues[it].len > 0)
+
   let indent = if today and future: "  " else: ""
 
   # Today's items
@@ -183,14 +218,14 @@ proc list(ctx: CliContext, filter: Option[IssueFilter], state: Option[IssueState
 
     for s in [Current, TodoToday]:
       if ctx.issues.hasKey(s) and ctx.issues[s].len > 0:
-        ctx.writeSection(ctx.issues[s], s, indent, verbose)
+        stdout.write ctx.formatSection(ctx.issues[s], s, indent, verbose)
 
     if ctx.issues.hasKey(Done):
         let doneIssues = ctx.issues[Done].filterIt(
           it.hasProp("completed") and
           sameDay(getTime().local, it.getDateTime("completed")))
         if doneIssues.len > 0:
-          ctx.writeSection(doneIssues, Done, indent, verbose)
+          stdout.write ctx.formatSection(doneIssues, Done, indent, verbose)
 
   # Future items
   if future:
@@ -198,7 +233,7 @@ proc list(ctx: CliContext, filter: Option[IssueFilter], state: Option[IssueState
 
     for s in [Pending, Todo]:
       if ctx.issues.hasKey(s) and ctx.issues[s].len > 0:
-        ctx.writeSection(ctx.issues[s], s, indent, verbose)
+        stdout.write ctx.formatSection(ctx.issues[s], s, indent, verbose)
 
 when isMainModule:
 
@@ -207,8 +242,12 @@ when isMainModule:
 Usage:
   pit ( new | add) <summary> [<state>] [options]
   pit list [<listable>] [options]
-  pit ( start | done | pending | do-today | todo | suspend ) <id>... [options]
+  pit ( start | done | pending | todo-today | todo | suspend ) <id>... [options]
-  pit edit <id>
+  pit edit <ref>...
+  pit tag <id>... [options]
+  pit untag <id>... [options]
+  pit reorder <state>
+  pit delegate <id> <delegated-to>
   pit ( delete | rm ) <id>...
 
 Options:
@@ -228,6 +267,12 @@ Options:
 
   -F, --future              Limit to future issues.
 
+  -m, --match <pattern>     Limit to issues whose summaries match the given
+                            pattern (PCRE regex supported).
+
+  -M, --match-all <pat>     Limit to the issues whose summaries or details
+                            match the given pattern (PCRE regex supported).
+
   -v, --verbose             Show issue details when listing issues.
 
   -q, --quiet               Suppress verbose output.
@@ -258,22 +303,20 @@ Options:
   let ctx = initContext(args)
 
   var propertiesOption = none(TableRef[string,string])
+  var tagsOption = none(seq[string])
 
-  if args["--properties"] or args["--context"] or
+  if args["--properties"] or args["--context"]:
-     not ctx.defaultContext.isNilOrWhitespace:
 
     var props =
       if args["--properties"]: parsePropertiesOption($args["--properties"])
       else: newTable[string,string]()
 
-    if args["--context"] and $args["--context"] != "all":
+    if args["--context"]: props["context"] = $args["--context"]
-      props["context"] = $args["--context"]
-    elif not args["--context"] and not ctx.defaultContext.isNilOrWhitespace:
-      stderr.writeLine("Limiting to default context: " & ctx.defaultContext)
-      props["context"] = ctx.defaultContext
 
     propertiesOption = some(props)
 
+  if args["--tags"]: tagsOption = some(($args["--tags"]).split(",").mapIt(it.strip))
+
   ## Actual command runners
   if args["new"] or args["add"]:
     let state =
@@ -282,6 +325,9 @@ Options:
 
     var issueProps = propertiesOption.get(newTable[string,string]())
     if not issueProps.hasKey("created"): issueProps["created"] = getTime().local.formatIso8601
+    if not issueProps.hasKey("context") and ctx.defaultContext.isSome():
+      stderr.writeLine("Using default context: " & ctx.defaultContext.get)
+      issueProps["context"] = ctx.defaultContext.get
 
     var issue = Issue(
       id: genUUID(),
@@ -293,17 +339,55 @@ Options:
 
     ctx.tasksDir.store(issue, state)
 
+    stdout.writeLine ctx.formatIssue(issue)
+
+  elif args["reorder"]:
+    ctx.reorder(parseEnum[IssueState]($args["<state>"]))
+
   elif args["edit"]:
-    let issueId = $args["<id>"]
+    for editRef in @(args["<ref>"]):
 
-    edit(ctx.tasksDir.loadIssueById(issueId))
+      var stateOption = none(IssueState)
 
-  elif args["start"] or args["do-today"] or args["done"] or
+      try: stateOption = some(parseEnum[IssueState](editRef))
+      except: discard
+
+      if stateOption.isSome:
+        let state = stateOption.get
+        ctx.loadIssues(state)
+        for issue in ctx.issues[state]: edit(issue)
+
+      else: edit(ctx.tasksDir.loadIssueById(editRef))
+
+  elif args["tag"]:
+    if not args["--tags"]: raise newException(Exception, "no tags given")
+
+    let newTags = ($args["--tags"]).split(",").mapIt(it.strip)
+
+    for id in @(args["<id>"]):
+      var issue = ctx.tasksDir.loadIssueById(id)
+      issue.tags = deduplicate(issue.tags & newTags)
+      issue.store()
+
+  elif args["untag"]:
+    let tagsToRemove: seq[string] =
+      if args["--tags"]: ($args["--tags"]).split(",").mapIt(it.strip)
+      else: @[]
+
+    for id in @(args["<id>"]):
+      var issue = ctx.tasksDir.loadIssueById(id)
+      if tagsToRemove.len > 0:
+        issue.tags = issue.tags.filter(
+          proc (tag: string): bool = not tagsToRemove.anyIt(it == tag))
+      else: issue.tags = @[]
+      issue.store()
+
+  elif args["start"] or args["todo-today"] or args["done"] or
        args["pending"] or args["todo"] or args["suspend"]:
 
     var targetState: IssueState
     if args["done"]: targetState = Done
-    elif args["do-today"]: targetState = TodoToday
+    elif args["todo-today"]: targetState = TodoToday
     elif args["pending"]: targetState = Pending
     elif args["start"]: targetState = Current
     elif args["todo"]: targetState = Todo
@@ -314,18 +398,33 @@ Options:
       if propertiesOption.isSome:
         for k,v in propertiesOption.get:
           issue[k] = v
+      if targetState == Done: issue["completed"] = getTime().local.formatIso8601
       issue.changeState(ctx.tasksDir, targetState)
 
     if ctx.triggerPtk:
       if targetState == Current:
         let issue = ctx.tasksDir.loadIssueById($(args["<id>"][0]))
-        var cmd = "ptk start "
+        var cmd = "ptk start"
-        if issue.tags.len > 0: cmd &= "-g \"" & issue.tags.join(",") & "\""
+        if issue.tags.len > 0 or issue.properties.hasKey("context"):
+          let tags = concat(
+            issue.tags,
+            if issue.properties.hasKey("context"): @[issue.properties["context"]]
+            else: @[]
+          )
+          cmd &= " -g \"" & tags.join(",") & "\""
+        cmd &= " -n \"pit-id: " & $issue.id & "\""
         cmd &= " \"" & issue.summary & "\""
         discard execShellCmd(cmd)
       elif targetState == Done or targetState == Pending:
         discard execShellCmd("ptk stop")
 
+  elif args["delegate"]:
+
+    let issue = ctx.tasksDir.loadIssueById($(args["<id>"]))
+    issue["delegated-to"] = $args["<delegated-to>"]
+
+    issue.store()
+
   elif args["delete"] or args["rm"]:
     for id in @(args["<id>"]):
 
@@ -342,20 +441,58 @@ Options:
 
     let filter = initFilter()
     var filterOption = none(IssueFilter)
+
+    # Initialize filter with properties (if given)
     if propertiesOption.isSome:
       filter.properties = propertiesOption.get
       filterOption = some(filter)
 
+    # If they supplied text matches, add that to the filter.
+    if args["--match"]:
+      filter.summaryMatch = some(re("(?i)" & $args["--match"]))
+      filterOption = some(filter)
+
+    if args["--match-all"]:
+      filter.fullMatch = some(re("(?i)" & $args["--match-all"]))
+      filterOption = some(filter)
+
+    # If no "context" property is given, use the default (if we have one)
+    if ctx.defaultContext.isSome and not filter.properties.hasKey("context"):
+      stderr.writeLine("Limiting to default context: " & ctx.defaultContext.get)
+      filter.properties["context"] = ctx.defaultContext.get
+      filterOption = some(filter)
+
+    # Finally, if the "context" is "all", don't filter on context
+    if filter.properties.hasKey("context") and
+       filter.properties["context"] == "all":
+
+      filter.properties.del("context")
+
+    var listContexts = false
     var stateOption = none(IssueState)
     var issueIdOption = none(string)
+
     if args["<listable>"]:
-      try: stateOption = some(parseEnum[IssueState]($args["<listable>"]))
+      if $args["<listable>"] == "contexts": listContexts = true
-      except: issueIdOption = some($args["<listable>"])
+      else:
+        try: stateOption = some(parseEnum[IssueState]($args["<listable>"]))
+        except: issueIdOption = some($args["<listable>"])
+
+    # List the known contexts
+    if listContexts:
+      var uniqContexts = toSeq(ctx.contexts.keys)
+      ctx.loadAllIssues()
+      for state, issueList in ctx.issues:
+        for issue in issueList:
+          if issue.hasProp("context") and not uniqContexts.contains(issue["context"]):
+            uniqContexts.add(issue["context"])
+
+      for c in uniqContexts: stdout.writeLine(c)
 
     # List a specific issue
-    if issueIdOption.isSome:
+    elif issueIdOption.isSome:
       let issue = ctx.tasksDir.loadIssueById(issueIdOption.get)
-      ctx.writeIssue(issue, ctx.termWidth, "", true, true)
+      stdout.writeLine ctx.formatIssue(issue)
 
     # List all issues
     else:
@@ -364,10 +501,6 @@ Options:
                                           showBoth or args["--future"],
                                           ctx.verbose)
 
-  if ctx.autoList and not args["list"]:
-    ctx.loadAllIssues()
-    ctx.list(none(IssueFilter), none(IssueState), true, true, false)
-
  except:
   fatal "pit: " & getCurrentExceptionMsg()
   #raise getCurrentException()

src/pit_api.nim

@@ -1,12 +1,12 @@
 ## Personal Issue Tracker API Interface
 ## ====================================
 
-import asyncdispatch, cliutils, docopt, jester, json, logging, sequtils, strutils
+import asyncdispatch, cliutils, docopt, jester, json, logging, options, sequtils, strutils
 import nre except toSeq
 
 import pitpkg/private/libpit
 
-include "pitpkg/private/version.nim"
+include "pitpkg/version.nim"
 
 type
   PitApiCfg* = object
@@ -18,6 +18,20 @@ const TXT = "text/plain"
 
 proc raiseEx(reason: string): void = raise newException(Exception, reason)
 
+template halt(code: HttpCode,
+              headers: RawHeaders,
+              content: string): typed =
+  ## Immediately replies with the specified request. This means any further
+  ## code will not be executed after calling this template in the current
+  ## route.
+  bind TCActionSend, newHttpHeaders
+  result[0] = CallbackAction.TCActionSend
+  result[1] = code
+  result[2] = some(headers)
+  result[3] = content
+  result.matched = true
+  break allRoutes
+
 template checkAuth(cfg: PitApiCfg) =
   ## Check this request for authentication and authorization information.
   ## If the request is not authorized, this template sets up the 401 response
@@ -40,30 +54,10 @@ template checkAuth(cfg: PitApiCfg) =
 
   except:
     stderr.writeLine "Auth failed: " & getCurrentExceptionMsg()
-    response.data[0] = CallbackAction.TCActionSend
+    halt(
-    response.data[1] = Http401
+      Http401,
-    response.data[2]["WWW-Authenticate"] = "Bearer"
+      @{"Content-Type": TXT},
-    response.data[2]["Content-Type"] = TXT
+      getCurrentExceptionMsg())
-    response.data[3] = getCurrentExceptionMsg()
-
-proc paramsToArgs(params: StringTableRef): tuple[stripAnsi: bool, args: seq[string]] =
-  result = (false, @[])
-
-  if params.hasKey("color"):
-    if params["color"] != "true":
-      result[0] = true
-
-  for k,v in params:
-    if k == "color": continue
-    elif k.startsWith("arg"): result[1].add(v) # support ?arg1=val1&arg2=val2 -> cmd val1 val2
-    else :
-      result[1].add("--" & k)
-      if v != "true": result[1].add(v) # support things like ?verbose=true -> cmd --verbose
-
-let STRIP_ANSI_REGEX = re"\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]"
-
-proc stripAnsi(str: string): string =
-  return str.replace(STRIP_ANSI_REGEX, "")
 
 proc start*(cfg: PitApiCfg) =
 
@@ -79,20 +73,29 @@ proc start*(cfg: PitApiCfg) =
       resp("pong", TXT)
 
     get "/issues":
-      checkAuth(cfg); if not authed: return true
+      checkAuth(cfg)
 
-      var (stripAnsi, args) = paramsToArgs(request.params)
+      var args = queryParamsToCliArgs(request.params)
       args = @["list"] & args
 
       info "args: \n" & args.join(" ")
       let execResult = execWithOutput("pit", ".", args)
       if execResult[2] != 0: resp(Http500, stripAnsi($execResult[0] & "\n" & $execResult[1]), TXT)
-      else:
+      else: resp(stripAnsi(execResult[0]), TXT)
-        if stripAnsi: resp(stripAnsi(execResult[0]), TXT)
-        else: resp(execResult[0], TXT)
 
     post "/issues":
-      checkAuth(cfg); if not authed: return true
+      checkAuth(cfg)
+
+    get "/issue/@issueId":
+      checkAuth(cfg)
+
+      var args = queryParamsToCliArgs(request.params)
+      args = @["list", @"issueId"] & args
+
+      info "args: \n" & args.join(" ")
+      let execResult = execWithOutput("pit", ".", args)
+      if execResult[2] != 0: resp(Http500, stripAnsi($execResult[0] & "\n" & $execResult[1]), TXT)
+      else: resp(stripAnsi(execResult[0]), TXT)
 
   waitFor(stopFuture)
 

src/pitpkg/private/libpit.nim

@@ -1,7 +1,8 @@
-import cliutils, docopt, json, logging, options, os, ospaths, sequtils,
+import cliutils, docopt, json, logging, langutils, options, os, ospaths,
-  strutils, tables, times, timeutils, uuids
+  sequtils, strutils, tables, times, timeutils, uuids
+
+from nre import find, match, re, Regex
 
-from nre import re, match
 type
   Issue* = ref object
     id*: UUID
@@ -19,8 +20,9 @@ type
     Dormant = "dormant"
 
   IssueFilter* = ref object
+    completedRange*: Option[tuple[b, e: DateTime]]
+    fullMatch*, summaryMatch*: Option[Regex]
     properties*: TableRef[string, string]
-    completedRange*: tuple[b, e: DateTime]
 
   PitConfig* = ref object
     tasksDir*: string
@@ -62,22 +64,38 @@ proc setDateTime*(issue: Issue, key: string, dt: DateTime) =
 
 proc initFilter*(): IssueFilter =
   result = IssueFilter(
-    properties: newTable[string,string](),
+    completedRange: none(tuple[b, e: DateTime]),
-    completedRange: (fromUnix(0).local, fromUnix(253400659199).local))
+    fullMatch: none(Regex),
+    summaryMatch: none(Regex),
+    properties: newTable[string, string]())
 
-proc initFilter*(props: TableRef[string, string]): IssueFilter =
+proc propsFilter*(props: TableRef[string, string]): IssueFilter =
   if isNil(props):
     raise newException(ValueError,
       "cannot initialize property filter without properties")
 
-  result = IssueFilter(
+  result = initFilter()
-    properties: props,
+  result.properties = props
-    completedRange: (fromUnix(0).local, fromUnix(253400659199).local))
+
+proc dateFilter*(range: tuple[b, e: DateTime]): IssueFilter =
+  result = initFilter()
+  result.completedRange = some(range)
+
+proc summaryMatchFilter*(pattern: string): IssueFilter =
+  result = initFilter()
+  result.summaryMatch = some(re("(?i)" & pattern))
+
+proc fullMatchFilter*(pattern: string): IssueFilter =
+  result = initFilter()
+  result.fullMatch = some(re("(?i)" & pattern))
+
+proc groupBy*(issues: seq[Issue], propertyKey: string): TableRef[string, seq[Issue]] =
+  result = newTable[string, seq[Issue]]()
+  for i in issues:
+    let key = if i.hasProp(propertyKey): i[propertyKey] else: ""
+    if not result.hasKey(key): result[key] = newSeq[Issue]()
+    result[key].add(i)
 
-proc initFilter*(range: tuple[b, e: DateTime]): IssueFilter =
-  result = IssueFilter(
-    properties: newTable[string, string](),
-    completedRange: range)
 
 ## Parse and format issues
 proc fromStorageFormat*(id: string, issueTxt: string): Issue =
@@ -128,7 +146,8 @@ proc toStorageFormat*(issue: Issue, withComments = false): string =
   if withComments: lines.add("# Summary (one line):")
   lines.add(issue.summary)
   if withComments: lines.add("# Properties (\"key:value\" per line):")
-  for key, val in issue.properties: lines.add(key & ": " & val)
+  for key, val in issue.properties:
+    if not val.isNilOrWhitespace: lines.add(key & ": " & val)
   if issue.tags.len > 0: lines.add("tags: " & issue.tags.join(","))
   if not isNilOrWhitespace(issue.details) or withComments:
     if withComments: lines.add("# Details go below the \"--------\"")
@@ -160,40 +179,82 @@ proc store*(tasksDir: string, issue: Issue, state: IssueState, withComments = fa
   else:
     issue.filepath = stateDir / filename
 
-  issue.store()
+  issue.store(withComments)
+
+proc storeOrder*(issues: seq[Issue], path: string) =
+  var orderLines = newSeq[string]()
+
+  for context, issues in issues.groupBy("context"):
+    orderLines.add("> " & context)
+    for issue in issues: orderLines.add($issue.id & " " & issue.summary)
+    orderLines.add("")
+
+  let orderFile = path / "order.txt"
+  orderFile.writeFile(orderLines.join("\n"))
 
 proc loadIssues*(path: string): seq[Issue] =
-  result = @[]
+  let orderFile = path / "order.txt"
+
+  let orderedIds =
+    if fileExists(orderFile):
+      toSeq(orderFile.lines)
+        .mapIt(it.split(' ')[0])
+        .deduplicate
+        .filterIt(not it.startsWith("> ") and not it.isNilOrWhitespace)
+    else: newSeq[string]()
+
+  type TaggedIssue = tuple[issue: Issue, ordered: bool]
+  var unorderedIssues: seq[TaggedIssue] = @[]
+
   for path in walkDirRec(path):
     if extractFilename(path).match(ISSUE_FILE_PATTERN).isSome():
-      result.add(loadIssue(path))
+      unorderedIssues.add((loadIssue(path), false))
+
+  result = @[]
+
+  # Add all ordered issues in order
+  for id in orderedIds:
+    let idx = unorderedIssues.indexOf(($it.issue.id).startsWith(id))
+    if idx > 0:
+      result.add(unorderedIssues[idx].issue)
+      unorderedIssues[idx].ordered = true
+
+  # Add all remaining, unordered issues in the order they were loaded
+  for taggedIssue in unorderedIssues:
+    if taggedIssue.ordered: continue
+    result.add(taggedIssue.issue)
+
+  # Finally, save current order
+  result.storeOrder(path)
 
 proc changeState*(issue: Issue, tasksDir: string, newState: IssueState) =
   let oldFilepath = issue.filepath
   if newState == Done: issue.setDateTime("completed", getTime().local)
   tasksDir.store(issue, newState)
-  removeFile(oldFilepath)
+  if oldFilePath != issue.filepath: removeFile(oldFilepath)
 
 proc delete*(issue: Issue) = removeFile(issue.filepath)
 
 ## Utilities for working with issue collections.
-proc groupBy*(issues: seq[Issue], propertyKey: string): TableRef[string, seq[Issue]] =
-  result = newTable[string, seq[Issue]]()
-  for i in issues:
-    let key = if i.hasProp(propertyKey): i[propertyKey] else: ""
-    if not result.hasKey(key): result[key] = newSeq[Issue]()
-    result[key].add(i)
-
 proc filter*(issues: seq[Issue], filter: IssueFilter): seq[Issue] =
   result = issues
 
   for k,v in filter.properties:
     result = result.filterIt(it.hasProp(k) and it[k] == v)
 
-  result = result.filterIt(not it.hasProp("completed") or
+  if filter.completedRange.isSome:
-           it.getDateTime("completed").between(
+    let range = filter.completedRange.get
-             filter.completedRange.b,
+    result = result.filterIt(
-             filter.completedRange.e))
+             not it.hasProp("completed") or
+             it.getDateTime("completed").between(range.b, range.e))
+
+  if filter.summaryMatch.isSome:
+    let p = filter.summaryMatch.get
+    result = result.filterIt(it.summary.find(p).isSome)
+
+  if filter.fullMatch.isSome:
+    let p = filter.fullMatch.get
+    result = result.filterIt( it.summary.find(p).isSome or it.details.find(p).isSome)
 
 ### Configuration utilities
 proc loadConfig*(args: Table[string, Value] = initTable[string, Value]()): PitConfig =

src/pitpkg/private/version.nim

@@ -1 +0,0 @@
-const PIT_VERSION = "4.1.0"

src/pitpkg/version.nim

@@ -0,0 +1 @@
+const PIT_VERSION* = "4.7.0"