Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
b0e3f5a9d8 | |||
fee4ba70a6 |
@ -1,6 +1,6 @@
|
||||
# Package
|
||||
|
||||
version = "4.23.0"
|
||||
version = "4.23.2"
|
||||
author = "Jonathan Bernard"
|
||||
description = "Personal issue tracker."
|
||||
license = "MIT"
|
||||
|
26
src/pit.nim
26
src/pit.nim
@ -51,7 +51,7 @@ proc getIssueContextDisplayName(ctx: CliContext, context: string): string =
|
||||
else: return context.capitalize()
|
||||
return ctx.contexts[context]
|
||||
|
||||
proc formatIssue(ctx: CliContext, issue: Issue): string =
|
||||
proc formatIssue*(issue: Issue): string =
|
||||
result = ($issue.id).withColor(fgBlack, true) & "\n"&
|
||||
issue.summary.withColor(fgWhite) & "\n"
|
||||
|
||||
@ -70,10 +70,9 @@ proc formatIssue(ctx: CliContext, issue: Issue): string =
|
||||
|
||||
result &= termReset
|
||||
|
||||
proc formatSectionIssue(
|
||||
ctx: CliContext,
|
||||
proc formatSectionIssue*(
|
||||
issue: Issue,
|
||||
width: int,
|
||||
width: int = 80,
|
||||
indent = "",
|
||||
verbose = false): string =
|
||||
|
||||
@ -135,12 +134,15 @@ proc formatSectionIssue(
|
||||
|
||||
result &= termReset
|
||||
|
||||
proc formatSectionIssueList(ctx: CliContext, issues: seq[Issue], width: int,
|
||||
indent: string, verbose: bool): string =
|
||||
proc formatSectionIssueList*(
|
||||
issues: seq[Issue],
|
||||
width: int = 80,
|
||||
indent: string = "",
|
||||
verbose: bool = false): string =
|
||||
|
||||
result = ""
|
||||
for i in issues:
|
||||
var issueText = ctx.formatSectionIssue(i, width, indent, verbose)
|
||||
var issueText = formatSectionIssue(i, width, indent, verbose)
|
||||
result &= issueText & "\n"
|
||||
|
||||
proc formatSection(ctx: CliContext, issues: seq[Issue], state: IssueState,
|
||||
@ -161,10 +163,10 @@ proc formatSection(ctx: CliContext, issues: seq[Issue], state: IssueState,
|
||||
indent & ctx.getIssueContextDisplayName(context) & ":" &
|
||||
termReset & "\n\n"
|
||||
|
||||
result &= ctx.formatSectionIssueList(ctxIssues, innerWidth - 2, indent & " ", verbose)
|
||||
result &= formatSectionIssueList(ctxIssues, innerWidth - 2, indent & " ", verbose)
|
||||
result &= "\n"
|
||||
|
||||
else: result &= ctx.formatSectionIssueList(issues, innerWidth, indent, verbose)
|
||||
else: result &= formatSectionIssueList(issues, innerWidth, indent, verbose)
|
||||
|
||||
proc loadIssues(ctx: CliContext, state: IssueState) =
|
||||
ctx.issues[state] = loadIssues(ctx.cfg.tasksDir, state)
|
||||
@ -379,7 +381,7 @@ when isMainModule:
|
||||
|
||||
ctx.cfg.tasksDir.store(issue, state)
|
||||
|
||||
stdout.writeLine ctx.formatIssue(issue)
|
||||
stdout.writeLine formatIssue(issue)
|
||||
|
||||
elif args["reorder"]:
|
||||
ctx.reorder(parseEnum[IssueState]($args["<state>"]))
|
||||
@ -444,7 +446,7 @@ when isMainModule:
|
||||
let nextIssue = ctx.cfg.tasksDir.nextRecurrence(issue.getRecurrence.get, issue)
|
||||
ctx.cfg.tasksDir.store(nextIssue, Todo)
|
||||
info "created the next recurrence:"
|
||||
stdout.writeLine ctx.formatIssue(nextIssue)
|
||||
stdout.writeLine formatIssue(nextIssue)
|
||||
|
||||
|
||||
issue.changeState(ctx.cfg.tasksDir, targetState)
|
||||
@ -567,7 +569,7 @@ when isMainModule:
|
||||
elif issueIdsOption.isSome:
|
||||
for issueId in issueIdsOption.get:
|
||||
let issue = ctx.cfg.tasksDir.loadIssueById(issueId)
|
||||
stdout.writeLine ctx.formatIssue(issue)
|
||||
stdout.writeLine formatIssue(issue)
|
||||
|
||||
# List all issues
|
||||
else:
|
||||
|
@ -1,4 +1,4 @@
|
||||
const PIT_VERSION* = "4.23.0"
|
||||
const PIT_VERSION* = "4.23.2"
|
||||
|
||||
const USAGE* = """Usage:
|
||||
pit ( new | add) <summary> [<state>] [options]
|
||||
|
@ -41,6 +41,7 @@ type
|
||||
isFromCompletion*: bool
|
||||
|
||||
const DONE_FOLDER_FORMAT* = "yyyy-MM"
|
||||
const ISO8601_MS = "yyyy-MM-dd'T'HH:mm:ss'.'fffzzz"
|
||||
|
||||
let ISSUE_FILE_PATTERN = re"[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}\.txt"
|
||||
let RECURRENCE_PATTERN = re"(every|after) ((\d+) )?((hour|day|week|month|year)s?)(, ([0-9a-fA-F]+))?"
|
||||
@ -219,12 +220,17 @@ proc fromStorageFormat*(id: string, issueTxt: string): Issue =
|
||||
|
||||
proc toStorageFormat*(issue: Issue, withComments = false): string =
|
||||
var lines: seq[string] = @[]
|
||||
|
||||
if withComments: lines.add("# Summary (one line):")
|
||||
lines.add(issue.summary)
|
||||
|
||||
if withComments: lines.add("# Properties (\"key:value\" per line):")
|
||||
issue.properties["last-updated"] = now().format(ISO8601_MS)
|
||||
for key, val in issue.properties:
|
||||
if not val.isEmptyOrWhitespace: lines.add(key & ": " & val)
|
||||
|
||||
if issue.tags.len > 0: lines.add("tags: " & issue.tags.join(","))
|
||||
|
||||
if not isEmptyOrWhitespace(issue.details) or withComments:
|
||||
if withComments: lines.add("# Details go below the \"--------\"")
|
||||
lines.add("--------")
|
||||
@ -326,6 +332,7 @@ proc changeState*(issue: Issue, tasksDir: string, newState: IssueState) =
|
||||
if newState == Done: issue.setDateTime("completed", getTime().local)
|
||||
tasksDir.store(issue, newState)
|
||||
if oldFilePath != issue.filepath: removeFile(oldFilepath)
|
||||
issue.state = newState
|
||||
|
||||
proc delete*(issue: Issue) = removeFile(issue.filepath)
|
||||
|
||||
|
Reference in New Issue
Block a user