Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
4a878026d8 | |||
ee733957c6 | |||
d75f5607c2 | |||
15708cebdf |
40
ptk.nim
40
ptk.nim
@ -154,6 +154,9 @@ proc writeMarks(timeline: Timeline, indices: seq[int], includeNotes = false): vo
|
||||
|
||||
if prefix.len > longestPrefix: longestPrefix = prefix.len
|
||||
|
||||
let colWidth = 80
|
||||
let notesPrefixLen = 4
|
||||
|
||||
for w in toWrite:
|
||||
if w.mark.summary == STOP_MSG: continue
|
||||
|
||||
@ -174,7 +177,11 @@ proc writeMarks(timeline: Timeline, indices: seq[int], includeNotes = false): vo
|
||||
writeLine(stdout, "")
|
||||
|
||||
if includeNotes and len(w.mark.notes.strip) > 0:
|
||||
writeLine(stdout, spaces(longestPrefix) & w.mark.notes)
|
||||
writeLine(stdout, "")
|
||||
let wrappedNotes = wordWrap(s = w.mark.notes,
|
||||
maxLineWidth = colWidth)
|
||||
for line in splitLines(wrappedNotes):
|
||||
writeLine(stdout, spaces(notesPrefixLen) & line)
|
||||
writeLine(stdout, "")
|
||||
|
||||
proc formatMark(mark: Mark, nextMark = NO_MARK, timeFormat = ISO_TIME_FORMAT, includeNotes = false): string =
|
||||
@ -190,13 +197,12 @@ proc formatMark(mark: Mark, nextMark = NO_MARK, timeFormat = ISO_TIME_FORMAT, in
|
||||
# TODO: pick up here calculating the time between marks
|
||||
|
||||
let prefix = ($mark.id)[0..<8] & " " & mark.time.format(timeFormat) & " (" & duration & ") -- "
|
||||
let prefixLen = len(($mark.id)[0..<8] & " " & mark.time.format(timeFormat) & " (" & duration & ") -- ")
|
||||
|
||||
result = prefix & mark.summary
|
||||
if includeNotes and len(mark.notes.strip()) > 0:
|
||||
let wrappedNotes = wordWrap(s = mark.notes, maxLineWidth = 80 - prefixLen)
|
||||
let wrappedNotes = wordWrap(s = mark.notes, maxLineWidth = 80 - prefix.len)
|
||||
for line in splitLines(wrappedNotes):
|
||||
result &= "\x0D\x0A" & spaces(prefixLen) & line
|
||||
result &= "\x0D\x0A" & spaces(prefix.len) & line
|
||||
result &= "\x0D\x0A"
|
||||
|
||||
proc findById(marks: seq[Mark], id: string): int =
|
||||
@ -348,6 +354,7 @@ Usage:
|
||||
ptk delete <id>
|
||||
ptk (list | ls) [options]
|
||||
ptk (list | ls) tags
|
||||
ptk current
|
||||
ptk sum-time --ids <ids>...
|
||||
ptk sum-time [options] [<firstId>] [<lastId>]
|
||||
ptk (-V | --version)
|
||||
@ -380,7 +387,7 @@ Options:
|
||||
let now = getLocalTime(getTime())
|
||||
|
||||
# Parse arguments
|
||||
let args = docopt(doc, version = "ptk 0.9.0")
|
||||
let args = docopt(doc, version = "ptk 0.11.1")
|
||||
|
||||
if args["--echo-args"]: echo $args
|
||||
|
||||
@ -514,7 +521,8 @@ Options:
|
||||
let prevLastIdx = timeline.marks.getLastIndex()
|
||||
timeline.marks.add(newMark)
|
||||
timeline.writeMarks(
|
||||
indices = @[prevLastIdx, timeline.marks.len - 1],
|
||||
indices = if prevLastIdx < 0: @[0]
|
||||
else: @[prevLastIdx, timeline.marks.len - 1],
|
||||
includeNotes = args["--verbose"])
|
||||
|
||||
saveTimeline(timeline, timelineLocation)
|
||||
@ -526,7 +534,9 @@ Options:
|
||||
if args["<id>"]:
|
||||
markToResumeIdx = timeline.marks.findById($args["<id>"])
|
||||
if markToResumeIdx == -1: exitErr "Cannot find a mark matching " & $args["<id>"]
|
||||
else: markToResumeIdx = timeline.marks.getLastIndex()
|
||||
else:
|
||||
markToResumeIdx = timeline.marks.getLastIndex()
|
||||
if markToResumeIdx < 0: exitErr "No mark to resume."
|
||||
var markToResume = timeline.marks[markToResumeIdx]
|
||||
|
||||
var newMark: Mark = (
|
||||
@ -553,7 +563,9 @@ Options:
|
||||
if args["<id>"]:
|
||||
markIdx = timeline.marks.findById($args["<id>"])
|
||||
if markIdx == -1: exitErr "Cannot find a mark matching " & $args["<id>"]
|
||||
else: markIdx = timeline.marks.getLastIndex()
|
||||
else:
|
||||
markIdx = timeline.marks.getLastIndex()
|
||||
if markIdx < 0: exitErr "No mark to amend."
|
||||
|
||||
var mark = timeline.marks[markIdx]
|
||||
|
||||
@ -601,7 +613,17 @@ Options:
|
||||
|
||||
timeline.writeMarks(
|
||||
indices = selectedIndices,
|
||||
includeNotes = args["--version"])
|
||||
includeNotes = args["--verbose"])
|
||||
|
||||
if args["current"]:
|
||||
|
||||
let idx = timeline.marks.len - 1
|
||||
if timeline.marks[idx].summary == STOP_MSG:
|
||||
echo "ptk: no current task"
|
||||
else:
|
||||
timeline.writeMarks(
|
||||
indices = @[idx],
|
||||
includeNotes = true)
|
||||
|
||||
if args["sum-time"]:
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Package
|
||||
|
||||
version = "0.9.0"
|
||||
version = "0.11.1"
|
||||
author = "Jonathan Bernard"
|
||||
description = "Personal Time Keeper"
|
||||
license = "MIT"
|
||||
@ -8,5 +8,5 @@ bin = @["ptk"]
|
||||
|
||||
# Dependencies
|
||||
|
||||
requires @["nim >= 0.15.0", "docopt >= 0.6.4", "uuids", "langutils", "tempfile", "timeutils >= 0.2.0"]
|
||||
requires @["nim >= 0.18.0", "docopt >= 0.6.4", "uuids", "langutils", "tempfile", "timeutils >= 0.2.2", "isaac >= 0.1.2"]
|
||||
|
||||
|
Reference in New Issue
Block a user