Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
d3fc1cdf9c | |||
237f5026f2 |
49
ptk.nim
49
ptk.nim
@ -4,7 +4,7 @@
|
|||||||
## Simple time keeping CLI
|
## Simple time keeping CLI
|
||||||
|
|
||||||
import algorithm, docopt, json, langutils, logging, os, nre, sequtils,
|
import algorithm, docopt, json, langutils, logging, os, nre, sequtils,
|
||||||
strutils, tempfile, terminal, times, timeutils, uuids
|
sets, strutils, tempfile, terminal, times, timeutils, uuids
|
||||||
|
|
||||||
import ptkutil
|
import ptkutil
|
||||||
|
|
||||||
@ -19,12 +19,14 @@ let NO_MARK: Mark = (
|
|||||||
time: fromSeconds(0).getLocalTime,
|
time: fromSeconds(0).getLocalTime,
|
||||||
summary: "", notes: "", tags: @[])
|
summary: "", notes: "", tags: @[])
|
||||||
|
|
||||||
const ISO_TIME_FORMAT = "yyyy:MM:dd'T'HH:mm:ss"
|
const ISO_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss"
|
||||||
|
|
||||||
const TIME_FORMATS = @[
|
const TIME_FORMATS = @[
|
||||||
"H:mm", "HH:mm", "H:mm:ss", "HH:mm:ss",
|
"yyyy-MM-dd'T'HH:mm:ss", "yyyy-MM-dd HH:mm:ss",
|
||||||
"yyyy:MM:dd'T'HH:mm:ss", "yyyy:MM:dd'T'HH:mm",
|
"yyyy-MM-dd'T'HH:mm", "yyyy-MM-dd HH:mm",
|
||||||
"yyyy:MM:dd HH:mm:ss", "yyyy:MM:dd HH:mm"]
|
"MM-dd'T'HH:mm:ss", "MM-dd HH:mm:ss",
|
||||||
|
"MM-dd'T'HH:mm", "MM-dd HH:mm",
|
||||||
|
"HH:mm:ss", "H:mm:ss", "H:mm", "HH:mm" ]
|
||||||
|
|
||||||
#proc `$`*(mark: Mark): string =
|
#proc `$`*(mark: Mark): string =
|
||||||
#return (($mark.uuid)[
|
#return (($mark.uuid)[
|
||||||
@ -62,9 +64,17 @@ proc loadTimeline(filename: string): Timeline =
|
|||||||
var timeline: Timeline = (name: timelineJson["name"].getStr(), marks: @[])
|
var timeline: Timeline = (name: timelineJson["name"].getStr(), marks: @[])
|
||||||
|
|
||||||
for markJson in timelineJson["marks"]:
|
for markJson in timelineJson["marks"]:
|
||||||
|
|
||||||
|
# TODO: an incorrect time format that was used in version 0.6 and prior.
|
||||||
|
# Version 0.7 between 1.0 support this format on read only and will write
|
||||||
|
# out the correct format (so they can be used to convert older timelines).
|
||||||
|
var time: TimeInfo
|
||||||
|
try: time = parse(markJson["time"].getStr(), ISO_TIME_FORMAT)
|
||||||
|
except: time = parse(markJson["time"].getStr(), "yyyy:MM:dd'T'HH:mm:ss")
|
||||||
|
|
||||||
timeline.marks.add((
|
timeline.marks.add((
|
||||||
id: parseUUID(markJson["id"].getStr()),
|
id: parseUUID(markJson["id"].getStr()),
|
||||||
time: parse(markJson["time"].getStr(), ISO_TIME_FORMAT),
|
time: time, #parse(markJson["time"].getStr(), ISO_TIME_FORMAT),
|
||||||
summary: markJson["summary"].getStr(),
|
summary: markJson["summary"].getStr(),
|
||||||
notes: markJson["notes"].getStr(),
|
notes: markJson["notes"].getStr(),
|
||||||
tags: markJson["tags"].getElems(@[]).map(proc (t: JsonNode): string = t.getStr())))
|
tags: markJson["tags"].getElems(@[]).map(proc (t: JsonNode): string = t.getStr())))
|
||||||
@ -296,6 +306,7 @@ Usage:
|
|||||||
ptk add [options]
|
ptk add [options]
|
||||||
ptk add [options] <summary>
|
ptk add [options] <summary>
|
||||||
ptk amend [options] <id> [<summary>]
|
ptk amend [options] <id> [<summary>]
|
||||||
|
ptk merge <timeline> [<timeline>...]
|
||||||
ptk stop [options]
|
ptk stop [options]
|
||||||
ptk continue
|
ptk continue
|
||||||
ptk delete <id>
|
ptk delete <id>
|
||||||
@ -332,7 +343,7 @@ Options:
|
|||||||
let now = getLocalTime(getTime())
|
let now = getLocalTime(getTime())
|
||||||
|
|
||||||
# Parse arguments
|
# Parse arguments
|
||||||
let args = docopt(doc, version = "ptk 0.5.0")
|
let args = docopt(doc, version = "ptk 0.7.0")
|
||||||
|
|
||||||
if args["--echo-args"]: echo $args
|
if args["--echo-args"]: echo $args
|
||||||
|
|
||||||
@ -378,6 +389,30 @@ Options:
|
|||||||
if args["init"]:
|
if args["init"]:
|
||||||
doInit(foldl(timelineLocations, if len(a) > 0: a else: b))
|
doInit(foldl(timelineLocations, if len(a) > 0: a else: b))
|
||||||
|
|
||||||
|
elif args["merge"]:
|
||||||
|
|
||||||
|
let filesToMerge = args["<timeline>"]
|
||||||
|
let timelines = filesToMerge.mapIt(loadTimeline(it))
|
||||||
|
|
||||||
|
let names = timelines.mapIt(it.name).toSet
|
||||||
|
let mergedName = sequtils.toSeq(names.items).foldl(a & " + " & b)
|
||||||
|
var merged: Timeline = (
|
||||||
|
name: mergedName,
|
||||||
|
marks: @[])
|
||||||
|
|
||||||
|
for timeline in timelines:
|
||||||
|
for mark in timeline.marks:
|
||||||
|
var existingMarkIdx = merged.marks.findById($mark.id)
|
||||||
|
if existingMarkIdx >= 0:
|
||||||
|
if merged.marks[existingMarkIdx].summary != mark.summary:
|
||||||
|
merged.marks[existingMarkIdx].summary &= " | " & mark.summary
|
||||||
|
if merged.marks[existingMarkIdx].notes != mark.notes:
|
||||||
|
merged.marks[existingMarkIdx].notes &= "\r\n--------\r\b" & mark.notes
|
||||||
|
|
||||||
|
else: merged.marks.add(mark)
|
||||||
|
|
||||||
|
writeLine(stdout, pretty(%merged))
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
||||||
if not fileExists(timelineLocation):
|
if not fileExists(timelineLocation):
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Package
|
# Package
|
||||||
|
|
||||||
version = "0.5.0"
|
version = "0.7.0"
|
||||||
author = "Jonathan Bernard"
|
author = "Jonathan Bernard"
|
||||||
description = "Personal Time Keeper"
|
description = "Personal Time Keeper"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
Reference in New Issue
Block a user