Compare commits
1 Commits
4.25.2
...
related-to
Author | SHA1 | Date | |
---|---|---|---|
ed3058a9c8 |
@ -1 +0,0 @@
|
||||
nim 1.6.20
|
@ -1,6 +1,6 @@
|
||||
# Package
|
||||
|
||||
version = "4.25.2"
|
||||
version = "4.24.0"
|
||||
author = "Jonathan Bernard"
|
||||
description = "Personal issue tracker."
|
||||
license = "MIT"
|
||||
|
46
src/pit.nim
46
src/pit.nim
@ -70,24 +70,6 @@ proc formatIssue*(issue: Issue): string =
|
||||
|
||||
result &= termReset
|
||||
|
||||
proc formatPlainIssueSummary*(issue: Issue): string =
|
||||
|
||||
result = "$#: $# $#" % [
|
||||
$issue.state,
|
||||
($issue.id)[0..<6],
|
||||
issue.summary ]
|
||||
|
||||
if issue.hasProp("delegated-to") or issue.hasProp("pending"):
|
||||
var parts = newSeq[string]()
|
||||
|
||||
if issue.hasProp("delegated-to"):
|
||||
parts.add("delegated to " & issue["delegated-to"])
|
||||
|
||||
if issue.hasProp("pending"):
|
||||
parts.add("pendin: " & issue["pending"])
|
||||
|
||||
result &= "($#)" % [ parts.join("; ") ]
|
||||
|
||||
proc formatSectionIssue*(
|
||||
issue: Issue,
|
||||
width: int = 80,
|
||||
@ -269,15 +251,7 @@ proc list(
|
||||
it.hasProp("completed") and
|
||||
sameDay(getTime().local, it.getDateTime("completed")))
|
||||
|
||||
if isatty(stdout):
|
||||
stdout.write ctx.formatSection(ctx.issues[state], state, "", verbose)
|
||||
|
||||
else:
|
||||
stdout.writeLine ctx.issues[state]
|
||||
.mapIt(formatPlainIssueSummary(it))
|
||||
.join("\n")
|
||||
|
||||
|
||||
stdout.write ctx.formatSection(ctx.issues[state], state, "", verbose)
|
||||
trace "listing complete"
|
||||
return
|
||||
|
||||
@ -305,13 +279,7 @@ proc list(
|
||||
not (it.hasProp("hide-until") and
|
||||
it.getDateTime("hide-until") > getTime().local))
|
||||
|
||||
if isatty(stdout):
|
||||
stdout.write ctx.formatSection(visibleIssues, s, indent, verbose)
|
||||
|
||||
else:
|
||||
stdout.writeLine visibleIssues
|
||||
.mapIt(formatPlainIssueSummary(it))
|
||||
.join("\n")
|
||||
stdout.write ctx.formatSection(visibleIssues, s, indent, verbose)
|
||||
|
||||
# Future items
|
||||
if future:
|
||||
@ -328,13 +296,7 @@ proc list(
|
||||
not (it.hasProp("hide-until") and
|
||||
it.getDateTime("hide-until") > getTime().local))
|
||||
|
||||
if isatty(stdout):
|
||||
stdout.write ctx.formatSection(visibleIssues, s, indent, verbose)
|
||||
|
||||
else:
|
||||
stdout.writeLine visibleIssues
|
||||
.mapIt(formatPlainIssueSummary(it))
|
||||
.join("\n")
|
||||
stdout.write ctx.formatSection(visibleIssues, s, indent, verbose)
|
||||
|
||||
trace "listing complete"
|
||||
|
||||
@ -501,7 +463,7 @@ when isMainModule:
|
||||
)
|
||||
cmd &= " -g \"" & tags.join(",") & "\""
|
||||
cmd &= " -n \"pit-id: " & $issue.id & "\""
|
||||
cmd &= " \"[" & ($issue.id)[0..<6] & "] " & issue.summary & "\""
|
||||
cmd &= " \"" & issue.summary & "\""
|
||||
discard execShellCmd(cmd)
|
||||
elif targetState == Done or targetState == Pending:
|
||||
discard execShellCmd("ptk stop")
|
||||
|
@ -1,4 +1,4 @@
|
||||
const PIT_VERSION* = "4.25.2"
|
||||
const PIT_VERSION* = "4.24.0"
|
||||
|
||||
const USAGE* = """Usage:
|
||||
pit ( new | add) <summary> [<state>] [options]
|
||||
@ -181,8 +181,32 @@ Issue Properties:
|
||||
after 12 hours
|
||||
every 2 weeks, 10a544
|
||||
|
||||
relations
|
||||
|
||||
Used to store information about relationships between issues. PIT treats
|
||||
all relations as bi-directional and will update related tickets as
|
||||
necessary to maintain the integrity of the links.
|
||||
|
||||
Relations are captured as <relation-type> <related-issue-id>. Multiple
|
||||
relations can be separated by ",". The <related-issue-id> must be a unique
|
||||
issue ID or ID prefix (in the case of multiple matching issues, the first
|
||||
found will be used with no guarantee on ordering). Valid value pairs for
|
||||
<relation-type> are:
|
||||
|
||||
- child-of / parent-of
|
||||
- related-to (default)
|
||||
- blocks / blocked-by
|
||||
- follows / precedes
|
||||
- caused / caused-by
|
||||
|
||||
Examples:
|
||||
|
||||
relation: child-of fb3e63, blocked-by 2b71c1
|
||||
relation: 2b71c1, 8f2b4c, follows 184dc6
|
||||
relation: relates-to 2b71c1
|
||||
|
||||
tags
|
||||
|
||||
If present, expected to be a comma-delimited list of text tags. The -g
|
||||
option is a short-hand for '-p tags:<tags-value>'.
|
||||
"""
|
||||
"""
|
||||
|
@ -11,6 +11,7 @@ type
|
||||
filepath*: string
|
||||
summary*, details*: string
|
||||
properties*: TableRef[string, string]
|
||||
relations*: seq[Relation]
|
||||
tags*: seq[string]
|
||||
state*: IssueState
|
||||
|
||||
@ -40,6 +41,19 @@ type
|
||||
interval*: TimeInterval
|
||||
isFromCompletion*: bool
|
||||
|
||||
Relation* = tuple[rel: RelationType, id: UUID]
|
||||
|
||||
RelationType* = enum
|
||||
ParentOf = "parent-of",
|
||||
ChildOf = "child-of",
|
||||
RelatedTo = "related-to",
|
||||
Blocks = "blocks",
|
||||
BlockedBy = "blocked-by",
|
||||
Follow = "follows",
|
||||
FollowedBy = "followed-by",
|
||||
Caused = "caused",
|
||||
CausedBy = "caused-by"
|
||||
|
||||
const DONE_FOLDER_FORMAT* = "yyyy-MM"
|
||||
const ISO8601_MS = "yyyy-MM-dd'T'HH:mm:ss'.'fffzzz"
|
||||
|
||||
@ -173,6 +187,11 @@ proc parseDate*(d: string): DateTime =
|
||||
continue
|
||||
raise newException(ValueError, "Unable to parse input as a date: " & d & errMsg)
|
||||
|
||||
proc parseRelation*(relStr: string): Relation =
|
||||
let parts = relStr.split({' '})
|
||||
if parts.len == 1: result = (RelatedTo, parseUUID(parts[0]))
|
||||
else: result = (parseEnum[RelationType](parts[0]), parseUUID(parts[1]))
|
||||
|
||||
## Parse and format issues
|
||||
proc fromStorageFormat*(id: string, issueTxt: string): Issue =
|
||||
type ParseState = enum ReadingSummary, ReadingProps, ReadingDetails
|
||||
@ -180,6 +199,7 @@ proc fromStorageFormat*(id: string, issueTxt: string): Issue =
|
||||
result = Issue(
|
||||
id: parseUUID(id),
|
||||
properties: newTable[string,string](),
|
||||
relations: @[],
|
||||
tags: @[])
|
||||
|
||||
var parseState = ReadingSummary
|
||||
@ -203,14 +223,16 @@ proc fromStorageFormat*(id: string, issueTxt: string): Issue =
|
||||
parseState = ReadingDetails
|
||||
continue
|
||||
|
||||
|
||||
let parts = line.split({':'}, 1) --> map(it.strip())
|
||||
if parts.len != 2:
|
||||
raise newException(ValueError, "unable to parse property line: " & line)
|
||||
|
||||
# Take care of special properties: `tags`
|
||||
# Take care of special properties: `tags` and `relations`
|
||||
if parts[0] == "tags":
|
||||
result.tags = parts[1].split({','}) --> map(it.strip())
|
||||
elif parts[0] == "relations":
|
||||
result.relations = parts[1].split({','}) -->
|
||||
map(parseRelation(it.strip))
|
||||
else: result[parts[0]] = parts[1]
|
||||
|
||||
of ReadingDetails:
|
||||
@ -231,6 +253,11 @@ proc toStorageFormat*(issue: Issue, withComments = false): string =
|
||||
|
||||
if issue.tags.len > 0: lines.add("tags: " & issue.tags.join(","))
|
||||
|
||||
if issue.relations.len > 0:
|
||||
lines.add("relations: " &
|
||||
(issue.relations --> map(it.rel & " " & it.id)).
|
||||
join(', '))
|
||||
|
||||
if not isEmptyOrWhitespace(issue.details) or withComments:
|
||||
if withComments: lines.add("# Details go below the \"--------\"")
|
||||
lines.add("--------")
|
||||
@ -328,16 +355,11 @@ proc loadAllIssues*(tasksDir: string): TableRef[IssueState, seq[Issue]] =
|
||||
for state in IssueState: result[state] = tasksDir.loadIssues(state)
|
||||
|
||||
proc changeState*(issue: Issue, tasksDir: string, newState: IssueState) =
|
||||
var dbgInfo = "[$#] changing state: $# → $#" %
|
||||
[ ($issue.id)[0..<6], $issue.state, $newState ]
|
||||
|
||||
let oldFilepath = issue.filepath
|
||||
if newState == Done: issue.setDateTime("completed", getTime().local)
|
||||
tasksDir.store(issue, newState)
|
||||
if oldFilePath != issue.filepath: removeFile(oldFilepath)
|
||||
dbgInfo &= "\n\told path: $#\n\tnew path: $#" % [oldFilePath, issue.filepath]
|
||||
issue.state = newState
|
||||
debug dbgInfo
|
||||
|
||||
proc delete*(issue: Issue) = removeFile(issue.filepath)
|
||||
|
||||
|
Reference in New Issue
Block a user