Compare commits
6 Commits
32cb827d26
...
v3
| Author | SHA1 | Date | |
|---|---|---|---|
| e2d27367fe | |||
| f332c1708a | |||
| daffdf4441 | |||
| bfb1bb3433 | |||
| 676ef83e50 | |||
| adbc2cf364 |
@@ -6,6 +6,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"math"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
@@ -13,16 +14,16 @@ import (
|
|||||||
|
|
||||||
// Task represents a parsed todo item.
|
// Task represents a parsed todo item.
|
||||||
type Task struct {
|
type Task struct {
|
||||||
Raw string `json:"raw"`
|
Raw string `json:"raw"`
|
||||||
Completed bool `json:"completed"`
|
Completed bool `json:"completed"`
|
||||||
CompletionDate *time.Time `json:"completion_date,omitempty"`
|
CompletionDate *time.Time `json:"completion_date,omitempty"`
|
||||||
Priority *rune `json:"priority,omitempty"` // 'A'..'Z'
|
Priority *rune `json:"priority,omitempty"` // 'A'..'Z'
|
||||||
CreationDate *time.Time `json:"creation_date,omitempty"`
|
CreationDate *time.Time `json:"creation_date,omitempty"`
|
||||||
DueDate *time.Time `json:"due_date,omitempty"` // parsed from due:YYYY-MM-DD
|
DueDate *time.Time `json:"due_date,omitempty"` // parsed from due:YYYY-MM-DD
|
||||||
Description string `json:"description"` // description with projects/contexts/metadata removed
|
Description string `json:"description"` // description with projects/contexts/metadata removed
|
||||||
Projects []string `json:"projects"`
|
Projects []string `json:"projects"`
|
||||||
Contexts []string `json:"contexts"`
|
Contexts []string `json:"contexts"`
|
||||||
Metadata map[string]string `json:"metadata"`
|
Metadata map[string][]string `json:"metadata"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t Task) ToRemind() string {
|
func (t Task) ToRemind() string {
|
||||||
@@ -36,13 +37,19 @@ func (t Task) ToRemind() string {
|
|||||||
sb.WriteString(" ++5 INFO \"Calendar: TODO.TX\" ")
|
sb.WriteString(" ++5 INFO \"Calendar: TODO.TX\" ")
|
||||||
|
|
||||||
if len(t.Metadata) > 0 {
|
if len(t.Metadata) > 0 {
|
||||||
for k, v := range t.Metadata {
|
for k, values := range t.Metadata {
|
||||||
if k == "due" {
|
if k == "due" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// k must have the first letter uppercase for Remind
|
// k must have the first letter uppercase for Remind
|
||||||
k = strings.ToUpper(k[:1]) + k[1:]
|
kUpper := strings.ToUpper(k[:1]) + k[1:]
|
||||||
sb.WriteString(fmt.Sprintf("INFO \"%s: %s\" ", k, v))
|
if len(values) == 1 {
|
||||||
|
sb.WriteString(fmt.Sprintf("INFO \"%s: %s\" ", kUpper, values[0]))
|
||||||
|
} else {
|
||||||
|
for i, v := range values {
|
||||||
|
sb.WriteString(fmt.Sprintf("INFO \"%s%d: %s\" ", kUpper, i+1, v))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,13 +88,20 @@ func (t Task) ToRemind() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(t.Metadata) > 0 {
|
if len(t.Metadata) > 0 {
|
||||||
for k := range t.Metadata {
|
for k, values := range t.Metadata {
|
||||||
if k == "due" {
|
if k == "due" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// uppercase first letter for Remind
|
// uppercase first letter for Remind
|
||||||
k = strings.ToUpper(k[:1]) + k[1:]
|
kUpper := strings.ToUpper(k[:1]) + k[1:]
|
||||||
sb.WriteString(fmt.Sprintf("%%_%s: %%<%s>", k, k))
|
if len(values) == 1 {
|
||||||
|
sb.WriteString(fmt.Sprintf("%%_%s: %%<%s>", kUpper, kUpper))
|
||||||
|
} else {
|
||||||
|
for i := range values {
|
||||||
|
kNumbered := fmt.Sprintf("%s%d", kUpper, i+1)
|
||||||
|
sb.WriteString(fmt.Sprintf("%%_%s: %%<%s>", kNumbered, kNumbered))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,12 +118,10 @@ func (t Task) PriorityAsRemind() int {
|
|||||||
if p < 'A' || p > 'Z' {
|
if p < 'A' || p > 'Z' {
|
||||||
return 5000
|
return 5000
|
||||||
}
|
}
|
||||||
step := 9999 / 25 // 399
|
pInt := int(p) - 65 // 'A' = 65
|
||||||
val := 9999 - int(p-'A')*step
|
value := 9999 - (float64(pInt) * (float64(9999) / float64(25)))
|
||||||
if p == 'Z' {
|
value = math.Round(value)
|
||||||
return 0
|
return int(value)
|
||||||
}
|
|
||||||
return val
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t Task) MarshalJSON() ([]byte, error) {
|
func (t Task) MarshalJSON() ([]byte, error) {
|
||||||
@@ -182,7 +194,7 @@ func ParseReader(r io.Reader) ([]Task, []error) {
|
|||||||
func ParseLine(line string) (Task, error) {
|
func ParseLine(line string) (Task, error) {
|
||||||
t := Task{
|
t := Task{
|
||||||
Raw: line,
|
Raw: line,
|
||||||
Metadata: make(map[string]string),
|
Metadata: make(map[string][]string),
|
||||||
}
|
}
|
||||||
|
|
||||||
working := strings.TrimSpace(line)
|
working := strings.TrimSpace(line)
|
||||||
@@ -263,14 +275,14 @@ func ParseLine(line string) (Task, error) {
|
|||||||
}
|
}
|
||||||
val += " " + toks[i]
|
val += " " + toks[i]
|
||||||
}
|
}
|
||||||
t.Metadata["location"] = val
|
t.Metadata["location"] = append(t.Metadata["location"], val)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if !strings.ContainsAny(tok, " \t") && strings.Contains(tok, ":") {
|
if !strings.ContainsAny(tok, " \t") && strings.Contains(tok, ":") {
|
||||||
parts := strings.SplitN(tok, ":", 2)
|
parts := strings.SplitN(tok, ":", 2)
|
||||||
k, v := parts[0], parts[1]
|
k, v := parts[0], parts[1]
|
||||||
if k != "" && v != "" && !isProtocolKey(k) {
|
if k != "" && v != "" && !isProtocolKey(k) {
|
||||||
t.Metadata[k] = v
|
t.Metadata[k] = append(t.Metadata[k], v)
|
||||||
if k == "due" && dateRe.MatchString(v) {
|
if k == "due" && dateRe.MatchString(v) {
|
||||||
if dt, err := time.Parse(dateLayout, v); err == nil {
|
if dt, err := time.Parse(dateLayout, v); err == nil {
|
||||||
t.DueDate = &dt
|
t.DueDate = &dt
|
||||||
@@ -278,6 +290,7 @@ func ParseLine(line string) (Task, error) {
|
|||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
descParts = append(descParts, tok)
|
descParts = append(descParts, tok)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user