Compare commits
4 Commits
4.23.3
...
related-to
Author | SHA1 | Date | |
---|---|---|---|
ed3058a9c8 | |||
ddad90ddef | |||
34ce2b61b9 | |||
661d5959c6 |
@ -1,6 +1,6 @@
|
|||||||
# Package
|
# Package
|
||||||
|
|
||||||
version = "4.23.3"
|
version = "4.24.0"
|
||||||
author = "Jonathan Bernard"
|
author = "Jonathan Bernard"
|
||||||
description = "Personal issue tracker."
|
description = "Personal issue tracker."
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
31
src/pit.nim
31
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,22 @@ 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()
|
debug getCurrentException().getStackTrace()
|
||||||
#raise getCurrentException()
|
#raise getCurrentException()
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
const PIT_VERSION* = "4.23.3"
|
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:
|
||||||
@ -100,7 +101,9 @@ Issue Properties:
|
|||||||
created
|
created
|
||||||
|
|
||||||
If present, expected to be an ISO 8601-formatted date that represents the
|
If present, expected to be an ISO 8601-formatted date that represents the
|
||||||
time when the issue was created.
|
time when the issue was created. E.g.:
|
||||||
|
|
||||||
|
created: 2023-07-13T13:28:41-05:00
|
||||||
|
|
||||||
completed
|
completed
|
||||||
|
|
||||||
@ -109,12 +112,16 @@ Issue Properties:
|
|||||||
property automatically when you use the "done" command, and can filter on
|
property automatically when you use the "done" command, and can filter on
|
||||||
this value.
|
this value.
|
||||||
|
|
||||||
|
completed: 2023-04-27T11:52:28-05:00
|
||||||
|
|
||||||
context
|
context
|
||||||
|
|
||||||
Allows issues to be organized into contexts. The -c option is short-hand
|
Allows issues to be organized into contexts. The -c option is short-hand
|
||||||
for '-p context:<context-name>' and the 'list contexts' command will show
|
for '-p context:<context-name>' and the 'list contexts' command will show
|
||||||
all values of 'context' set in existing issues.
|
all values of 'context' set in existing issues.
|
||||||
|
|
||||||
|
context: family
|
||||||
|
|
||||||
delegated-to
|
delegated-to
|
||||||
|
|
||||||
When an issue now belongs to someone else, but needs to be monitored for
|
When an issue now belongs to someone else, but needs to be monitored for
|
||||||
@ -122,17 +129,23 @@ Issue Properties:
|
|||||||
note how it has been delegated. When present PIT will prepend this value
|
note how it has been delegated. When present PIT will prepend this value
|
||||||
to the issue summary with an accent color.
|
to the issue summary with an accent color.
|
||||||
|
|
||||||
|
delegated-to: Bob Ross
|
||||||
|
|
||||||
hide-until
|
hide-until
|
||||||
|
|
||||||
When present, expected to be an ISO 8601-formatted date and used to
|
When present, expected to be an ISO 8601-formatted date and used to
|
||||||
supress the display of the issue until on or after the given date.
|
supress the display of the issue until on or after the given date.
|
||||||
|
|
||||||
|
hide-until: 2024-01-01T13:45:00-05:00
|
||||||
|
|
||||||
pending
|
pending
|
||||||
|
|
||||||
When an issue is blocked by a third party, this property can be used to
|
When an issue is blocked by a third party, this property can be used to
|
||||||
capture details about the dependency When present PIT will display this
|
capture details about the dependency When present PIT will display this
|
||||||
value after the issue summary.
|
value after the issue summary.
|
||||||
|
|
||||||
|
pending: Results of WCAG analysis.
|
||||||
|
|
||||||
recurrence
|
recurrence
|
||||||
|
|
||||||
When an issue is moved to the "done" state, if the issue has a valid
|
When an issue is moved to the "done" state, if the issue has a valid
|
||||||
@ -143,7 +156,7 @@ Issue Properties:
|
|||||||
A valid recurrence value has a time value and optionally has an source
|
A valid recurrence value has a time value and optionally has an source
|
||||||
issue ID. For example:
|
issue ID. For example:
|
||||||
|
|
||||||
every 5 days, 10a544
|
recurrence: every 5 days, 10a544
|
||||||
|
|
||||||
The first word, "every", is expected to be either "every" or "after".
|
The first word, "every", is expected to be either "every" or "after".
|
||||||
|
|
||||||
@ -161,15 +174,39 @@ Issue Properties:
|
|||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
|
|
||||||
every day
|
every day
|
||||||
every 2 days
|
every 2 days
|
||||||
after 2 days
|
after 2 days
|
||||||
every week
|
every week
|
||||||
after 12 hours
|
after 12 hours
|
||||||
every 2 weeks, 10a544
|
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
|
tags
|
||||||
|
|
||||||
If present, expected to be a comma-delimited list of text tags. The -g
|
If present, expected to be a comma-delimited list of text tags. The -g
|
||||||
option is a short-hand for '-p tags:<tags-value>'.
|
option is a short-hand for '-p tags:<tags-value>'.
|
||||||
"""
|
"""
|
||||||
|
@ -11,6 +11,7 @@ type
|
|||||||
filepath*: string
|
filepath*: string
|
||||||
summary*, details*: string
|
summary*, details*: string
|
||||||
properties*: TableRef[string, string]
|
properties*: TableRef[string, string]
|
||||||
|
relations*: seq[Relation]
|
||||||
tags*: seq[string]
|
tags*: seq[string]
|
||||||
state*: IssueState
|
state*: IssueState
|
||||||
|
|
||||||
@ -40,6 +41,19 @@ type
|
|||||||
interval*: TimeInterval
|
interval*: TimeInterval
|
||||||
isFromCompletion*: bool
|
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 DONE_FOLDER_FORMAT* = "yyyy-MM"
|
||||||
const ISO8601_MS = "yyyy-MM-dd'T'HH:mm:ss'.'fffzzz"
|
const ISO8601_MS = "yyyy-MM-dd'T'HH:mm:ss'.'fffzzz"
|
||||||
|
|
||||||
@ -168,11 +182,16 @@ 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)
|
||||||
|
|
||||||
|
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
|
## Parse and format issues
|
||||||
proc fromStorageFormat*(id: string, issueTxt: string): Issue =
|
proc fromStorageFormat*(id: string, issueTxt: string): Issue =
|
||||||
type ParseState = enum ReadingSummary, ReadingProps, ReadingDetails
|
type ParseState = enum ReadingSummary, ReadingProps, ReadingDetails
|
||||||
@ -180,6 +199,7 @@ proc fromStorageFormat*(id: string, issueTxt: string): Issue =
|
|||||||
result = Issue(
|
result = Issue(
|
||||||
id: parseUUID(id),
|
id: parseUUID(id),
|
||||||
properties: newTable[string,string](),
|
properties: newTable[string,string](),
|
||||||
|
relations: @[],
|
||||||
tags: @[])
|
tags: @[])
|
||||||
|
|
||||||
var parseState = ReadingSummary
|
var parseState = ReadingSummary
|
||||||
@ -203,14 +223,16 @@ proc fromStorageFormat*(id: string, issueTxt: string): Issue =
|
|||||||
parseState = ReadingDetails
|
parseState = ReadingDetails
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
||||||
let parts = line.split({':'}, 1) --> map(it.strip())
|
let parts = line.split({':'}, 1) --> map(it.strip())
|
||||||
if parts.len != 2:
|
if parts.len != 2:
|
||||||
raise newException(ValueError, "unable to parse property line: " & line)
|
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":
|
if parts[0] == "tags":
|
||||||
result.tags = parts[1].split({','}) --> map(it.strip())
|
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]
|
else: result[parts[0]] = parts[1]
|
||||||
|
|
||||||
of ReadingDetails:
|
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.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 not isEmptyOrWhitespace(issue.details) or withComments:
|
||||||
if withComments: lines.add("# Details go below the \"--------\"")
|
if withComments: lines.add("# Details go below the \"--------\"")
|
||||||
lines.add("--------")
|
lines.add("--------")
|
||||||
@ -426,7 +453,7 @@ 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)
|
||||||
|
|
||||||
debug "loading config from '$#'" % [pitrcFilename]
|
debug "loading config from '$#'" % [pitrcFilename]
|
||||||
|
Reference in New Issue
Block a user