Cancel tracker

.gitea/workflows/ci.yaml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.24.0' # The Go version to download (if necessary) and use.
+          go-version: '1.24.4' # The Go version to download (if necessary) and use.
       - uses: https://gitea.com/actions/go-hashfiles@v0.0.1
         id: hash-go
         with:
@@ -40,54 +40,3 @@ jobs:
         with:
           name: coverage.html
           path: ./cover.html
-
-  build:
-    needs: test
-    runs-on: ubuntu-22.04
-    env: 
-      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version: '1.24.0' # The Go version to download (if necessary) and use.
-      - uses: https://gitea.com/actions/go-hashfiles@v0.0.1
-        id: hash-go
-        with:
-          patterns: |
-            go.mod
-            go.sum
-      - name: Echo hash
-        run: echo ${{ steps.hash-go.outputs.hash }}
-      - name: Cache go
-        id: cache-go
-        uses: https://github.com/actions/cache@v3 # Action cache
-        with: # specify with your GOMODCACHE and GOCACHE
-          path: |-
-            /root/go/pkg/mod
-            /root/.cache/go-build
-          key: go_cache-${{ steps.hash-go.outputs.hash }}
-          restore-keys: |-
-            go_cache-${{ steps.hash-go.outputs.hash }}
-
-      # build all binaries
-      - name: build binaries
-        run: |
-          GOOS=darwin   GOARCH=amd64 CGO_ENABLED=0 go build -o charmite_darwin_amd64 .
-          GOOS=darwin   GOARCH=arm64 CGO_ENABLED=0 go build -o charmite_darwin_arm64 .
-          GOOS=linux   GOARCH=amd64 CGO_ENABLED=0 go build -o charmite_linux_amd64 .
-          GOOS=windows  GOARCH=amd64 CGO_ENABLED=0 go build -o charmite_windows_amd64.exe .
-
-      # upload
-      - name: Upload artifacts to Gitea package repository
-        env:
-          GITEA_API_URL: https://code.ppl.town/api
-          GITEA_TOKEN: ${{ secrets.PACKAGE_API_KEY }}
-          REPOSITORY: charmite
-          VERSION: 0.0.1
-        run: |
-          curl -D- -s -X PUT "$GITEA_API_URL/packages/$REPOSITORY/generic/charmite/$VERSION/charmite_darwin_amd64" \
-          -H "Authorization: token $GITEA_TOKEN" \
-          -H "Content-Type: application/octet-stream" \
-          --data-binary @charmite_darwin_amd64
-      

.gitignore

@@ -0,0 +1,2 @@
+dist/
+.DS_Store

.goreleaser.yaml

@@ -0,0 +1,47 @@
+# This is an example .goreleaser.yml file with some sensible defaults.
+# Make sure to check the documentation at https://goreleaser.com
+
+# The lines below are called `modelines`. See `:help modeline`
+# Feel free to remove those if you don't want/need to use them.
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=cnqoj
+
+version: 2
+
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+
+archives:
+  - formats: [tar.gz]
+    # this name template makes the OS and Arch compatible with the results of `uname`.
+    name_template: >-
+      {{ .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}
+    # use zip for windows archives
+    format_overrides:
+      - goos: windows
+        formats: [zip]
+
+gitea_urls:
+  api: https://code.ppl.town/api/v1
+  download: https://code.ppl.town
+
+release:
+  footer: >-
+
+    ---
+
+    Released by [GoReleaser](https://github.com/goreleaser/goreleaser).

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "cSpell.ignoreWords": [
+        "FORMENTRY",
+        "TIMEENTRIES",
+        "ancel",
+        "lipgloss",
+        "oday"
+    ]
+}

README.md

@@ -0,0 +1,23 @@
+# charmite
+
+Charmite is a simple TUI to add/view time entries in the [Mite](https://mite.de/en/)
+time tracking tool.
+
+## Installation
+
+Download the appropriate binary from https://code.ppl.town/justin/charmite/releases
+
+Or compile from the source code with:
+
+    go build .
+
+## Using
+
+You'll need to set the environment variables:
+
+* MITE_API
+* MITE_DOMAIN
+
+To appropriate values.
+
+See the [Mite FAQ](https://mite.de/en/faq.html) under "How do I allow API access for my account? Where can I get an API key?" for details on how to obtain your API key.

build.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-GOOS=linux GOARCH=amd64 go build -o cal_linux_amd64
-GOOS=darwin GOARCH=arm64 go build -o cal_darwin_arm64
-GOOS=windows GOARCH=amd64 go build -o cal_windows_lol_amd64
-
-zip cal.zip cal_linux_amd64 cal_darwin_arm64 cal_windows_lol_amd64
-
-
-open .

go.mod

@@ -2,10 +2,7 @@ module charmcal
 
 go 1.24.1
 
-require (
-	github.com/charmbracelet/bubbles v0.21.0
-	github.com/stretchr/testify v1.10.0
-)
+require github.com/charmbracelet/bubbles v0.21.0
 
 require (
 	github.com/atotto/clipboard v0.1.4 // indirect
@@ -36,8 +33,5 @@ require (
 	github.com/charmbracelet/bubbletea v1.3.5
 	github.com/charmbracelet/huh v0.7.0
 	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -38,8 +38,6 @@ github.com/charmbracelet/x/xpty v0.1.2 h1:Pqmu4TEJ8KeA9uSkISKMU3f+C1F6OGBn8ABuGl
 github.com/charmbracelet/x/xpty v0.1.2/go.mod h1:XK2Z0id5rtLWcpeNiMYBccNNBrP2IJnzHI0Lq13Xzq4=
 github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
@@ -60,13 +58,9 @@ github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELU
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
@@ -79,7 +73,3 @@ golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
 golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
 golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

mite/mite.go

@@ -3,6 +3,7 @@ package mite
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
@@ -50,13 +51,15 @@ type Project struct {
 func (p Project) String() string {
 	return fmt.Sprintf("%d: %s (%s)", p.ID, p.Name, p.CustomerName)
 }
-func (p Project) GetID() int      { return p.ID }
-func (p Project) GetName() string { return p.Name }
+func (p Project) GetID() int { return p.ID }
+func (p Project) GetName() string {
+	return p.Name + " (" + p.CustomerName + ")"
+}
 
 func (a APIClient) GetProjects() (Projects, error) {
 	// GET /projects.json
 	p := APIProjects{}
-	err := get(a.domain, a.apiKey, "/projects.json", &p)
+	err := a.get("/projects.json", &p)
 	if err != nil {
 		return nil, err
 	}
@@ -98,7 +101,7 @@ func (c Customer) GetName() string { return c.Name }
 func (a APIClient) GetCustomers() (Customers, error) {
 	// GET /customers.json
 	p := apiCustomers{}
-	err := get(a.domain, a.apiKey, "/customers.json", &p)
+	err := a.get("/customers.json", &p)
 	if err != nil {
 		return nil, err
 	}
@@ -129,13 +132,20 @@ type Service struct {
 func (s Service) String() string {
 	return fmt.Sprintf("%d: %s", s.ID, s.Name)
 }
-func (s Service) GetID() int      { return s.ID }
-func (s Service) GetName() string { return s.Name }
+func (s Service) GetID() int { return s.ID }
+func (s Service) GetName() string {
+	prefix := "💰"
+	if !s.Billable {
+		prefix = "☮️"
+	}
+	return prefix + " " + s.Name
+
+}
 
 func (a APIClient) GetServices() (Services, error) {
 	// GET /services.json
 	p := apiServices{}
-	err := get(a.domain, a.apiKey, "/services.json", &p)
+	err := a.get("/services.json", &p)
 	if err != nil {
 		return nil, err
 	}
@@ -208,7 +218,7 @@ func (a APIClient) GetTimeEntries(from, to time.Time) (TimeEntries, error) {
 	p := apiTimeEntry{}
 	u := fmt.Sprintf("/time_entries.json?from=%s&to=%s", from.Format(time.DateOnly), to.Format(time.DateOnly))
 
-	err := get(a.domain, a.apiKey, u, &p)
+	err := a.get(u, &p)
 	if err != nil {
 		return nil, err
 	}
@@ -224,13 +234,15 @@ type requestAddTimeEntry struct {
 	RequestTimeEntryHolder struct {
 		DateAt    string `json:"date_at"`
 		Minutes   int    `json:"minutes"`
-		ProjectID int    `json:"project_id,omit_empty"`
-		ServiceID int    `json:"service_id,omit_empty"`
+		ProjectID int    `json:"project_id,omitempty"`
+		ServiceID int    `json:"service_id,omitempty"`
 		Note      string `json:"note"`
 	} `json:"time_entry"`
 }
 
-func (a APIClient) AddTimeEntry(date string, minutes int, notes string, projectId, serviceId int) error {
+type apiPostTimeEntry timeEntryHolder
+
+func (a APIClient) AddTimeEntry(date string, minutes int, notes string, projectId, serviceId int) (int, error) {
 	// POST /time_entries.json
 	// {
 	// 	"time_entry": {
@@ -246,44 +258,113 @@ func (a APIClient) AddTimeEntry(date string, minutes int, notes string, projectI
 	req.RequestTimeEntryHolder.ProjectID = projectId
 	req.RequestTimeEntryHolder.ServiceID = serviceId
 
-	err := post(a.domain, a.apiKey, "/time_entries.json", req)
-	return err
+	res := apiPostTimeEntry{}
 
+	err := a.post("/time_entries.json", req, &res)
+	return res.TimeEntry.ID, err
 }
 
-func post(domain, apiKey, path string, data any) error {
-
-	b, err := json.Marshal(data)
-	if err != nil {
-		return err
-	}
-
-	req, err := http.NewRequest("POST", baseurl(domain, path), bytes.NewBuffer(b))
-	if err != nil {
-		return err
-	}
-	req.Header.Add("X-MiteApiKey", apiKey)
-	req.Header.Add("Content-Type", "application/json")
-	resp, err := http.DefaultClient.Do(req)
-
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode >= 300 {
-		return fmt.Errorf("expected 2XX, got %d", resp.StatusCode)
-	}
-
-	return nil
-
+type apiTimeTrackerEntry struct {
+	TimeTrackerHolder timeTrackerHolder `json:"tracker"`
 }
 
-func get(domain, apiKey, path string, data any) error {
-	req, err := http.NewRequest("GET", baseurl(domain, path), nil)
+type timeTrackerHolder struct {
+	TrackingTimeEntry *TrackingTimeEntry `json:"tracking_time_entry"`
+	StoppedTimeEntry  *StoppedTimeEntry  `json:"stopped_time_entry"`
+}
+
+type TrackingTimeEntry struct {
+	ID      int       `json:"id"`
+	Minutes int       `json:"minutes"`
+	Since   time.Time `json:"since"`
+}
+
+type StoppedTimeEntry struct {
+	ID      int `json:"id"`
+	Minutes int `json:"minutes"`
+}
+
+// {
+// 	"tracker": {
+// 	  "tracking_time_entry": {
+// 		"id": 36135322,
+// 		"minutes": 0,
+// 		"since": "2015-10-15T17:33:52+02:00"
+// 	  },
+// 	 "stopped_time_entry": {
+// 		"id": 36134329,
+// 		"minutes": 46
+// 	  }
+// 	}
+//   }
+
+// {
+// 	"tracker": {
+// 	  "tracking_time_entry": {
+// 		"id": 36135321,
+// 		"minutes": 247,
+// 		"since": "2015-10-15T17:05:04+02:00"
+// 	  }
+// 	}
+//   }
+
+var ErrNoTracker = errors.New("no time tracker running")
+
+// GetTimeTracker gets the current running time tracker. If no tracker is
+// running, the error returned will be ErrNoTracker
+func (a APIClient) GetTimeTracker() (TrackingTimeEntry, error) {
+	r := apiTimeTrackerEntry{}
+	err := a.get("/tracker.json", &r)
+	if err != nil {
+		return TrackingTimeEntry{}, err
+	}
+	if r.TimeTrackerHolder.TrackingTimeEntry == nil {
+		return TrackingTimeEntry{}, ErrNoTracker
+	}
+	return *r.TimeTrackerHolder.TrackingTimeEntry, nil
+}
+
+func (a APIClient) StartTimeTracker(id int) (TrackingTimeEntry, *StoppedTimeEntry, error) {
+	url := fmt.Sprintf("/tracker/%d.json", id)
+	r := apiTimeTrackerEntry{}
+
+	err := a.patch(url, &r)
+
+	if err != nil {
+		return TrackingTimeEntry{}, nil, err
+	}
+	if r.TimeTrackerHolder.TrackingTimeEntry == nil {
+		// I don't think this should happen, the patch should have been a 404?
+
+		panic(fmt.Sprintf("unexpected failure to find a tracking entry in a successful PATCH\n%#v", r.TimeTrackerHolder))
+	}
+	return *r.TimeTrackerHolder.TrackingTimeEntry, r.TimeTrackerHolder.StoppedTimeEntry, nil
+}
+
+func (a APIClient) StopTimeTracker(id int) (StoppedTimeEntry, error) {
+	url := fmt.Sprintf("/tracker/%d.json", id)
+	r := apiTimeTrackerEntry{}
+
+	err := a.delete(url, &r)
+
+	if err != nil {
+		return StoppedTimeEntry{}, err
+	}
+	if r.TimeTrackerHolder.StoppedTimeEntry == nil {
+		// I don't think this should happen, the patch should have been a 404?
+
+		panic(fmt.Sprintf("unexpected failure to find a tracking entry in a successful DELETE\n%#v", r.TimeTrackerHolder))
+	}
+	return *r.TimeTrackerHolder.StoppedTimeEntry, nil
+}
+
+func (a APIClient) delete(path string, data any) error {
+
+	req, err := http.NewRequest("DELETE", baseurl(a.domain, path), nil)
 	if err != nil {
 		return err
 	}
-	req.Header.Add("X-MiteApiKey", apiKey)
+	req.Header.Add("X-MiteApiKey", a.apiKey)
 	resp, err := http.DefaultClient.Do(req)
 
 	if err != nil {
@@ -298,7 +379,83 @@ func get(domain, apiKey, path string, data any) error {
 		return err
 	}
 	return nil
+}
 
+func (a APIClient) patch(path string, data any) error {
+
+	req, err := http.NewRequest("PATCH", baseurl(a.domain, path), nil)
+	if err != nil {
+		return err
+	}
+	req.Header.Add("X-MiteApiKey", a.apiKey)
+	resp, err := http.DefaultClient.Do(req)
+
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode >= 300 {
+		return fmt.Errorf("expected 2XX, got %d", resp.StatusCode)
+	}
+	err = json.NewDecoder(resp.Body).Decode(&data)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (a APIClient) post(path string, dataIn any, dataOut any) error {
+
+	b, err := json.Marshal(dataIn)
+	if err != nil {
+		return err
+	}
+
+	req, err := http.NewRequest("POST", baseurl(a.domain, path), bytes.NewBuffer(b))
+	if err != nil {
+		return err
+	}
+	req.Header.Add("X-MiteApiKey", a.apiKey)
+	req.Header.Add("Content-Type", "application/json")
+	resp, err := http.DefaultClient.Do(req)
+
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode >= 300 {
+		return fmt.Errorf("expected 2XX, got %d", resp.StatusCode)
+	}
+
+	err = json.NewDecoder(resp.Body).Decode(&dataOut)
+	if err != nil {
+		return err
+	}
+
+	return nil
+
+}
+
+func (a APIClient) get(path string, data any) error {
+	req, err := http.NewRequest("GET", baseurl(a.domain, path), nil)
+	if err != nil {
+		return err
+	}
+	req.Header.Add("X-MiteApiKey", a.apiKey)
+	resp, err := http.DefaultClient.Do(req)
+
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode >= 300 {
+		return fmt.Errorf("expected 2XX, got %d", resp.StatusCode)
+	}
+	err = json.NewDecoder(resp.Body).Decode(&data)
+	if err != nil {
+		return err
+	}
+	return nil
 }
 
 func baseurl(domain, path string) string {

mite/mite_test.go

@@ -0,0 +1,82 @@
+package mite
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+func TestUnmarshalTimeTracking(t *testing.T) {
+
+	trackerOff := []byte(`{
+	"tracker": {}
+  }`)
+	off := apiTimeTrackerEntry{}
+	err := json.Unmarshal(trackerOff, &off)
+	if err != nil {
+		t.Error(err)
+	} else {
+		if off.TimeTrackerHolder.TrackingTimeEntry != nil {
+			t.Error("expected nil, but is not")
+		}
+	}
+	trackerOn := []byte(`
+	{
+		"tracker": {
+		  "tracking_time_entry": {
+			"id": 36135321,
+			"minutes": 247,
+			"since": "2015-10-15T17:05:04+02:00"
+		  }
+		}
+	  }`)
+	on := apiTimeTrackerEntry{}
+	err = json.Unmarshal(trackerOn, &on)
+	if err != nil {
+		t.Error(err)
+	} else {
+		if on.TimeTrackerHolder.TrackingTimeEntry == nil {
+			t.Error("expected not nil, but is not")
+		} else {
+			if on.TimeTrackerHolder.TrackingTimeEntry.ID != 36135321 {
+				t.Error("bad unmarshal?")
+			}
+		}
+	}
+
+	trackerStart := []byte(`{
+  "tracker": {
+    "tracking_time_entry": {
+      "id": 36135322,
+      "minutes": 0,
+      "since": "2015-10-15T17:33:52+02:00"
+    },
+   "stopped_time_entry": {
+      "id": 36134329,
+      "minutes": 46
+    }
+  }
+}`)
+	start := apiTimeTrackerEntry{}
+	err = json.Unmarshal(trackerStart, &start)
+	if err != nil {
+		t.Error(err)
+	} else {
+		if start.TimeTrackerHolder.TrackingTimeEntry == nil {
+			t.Error("expected not nil, but is not")
+		} else {
+			if start.TimeTrackerHolder.TrackingTimeEntry.ID != 36135322 {
+				t.Error("bad unmarshal?")
+			}
+		}
+
+		if start.TimeTrackerHolder.StoppedTimeEntry == nil {
+			t.Error("expected not nil, but is nil")
+		} else {
+			if start.TimeTrackerHolder.StoppedTimeEntry.ID != 36134329 {
+				t.Error("bad unmarshal")
+			}
+		}
+
+	}
+
+}

model.go

@@ -4,7 +4,7 @@ import (
 	"charmcal/mite"
 	"errors"
 	"fmt"
-	"strconv"
+	"slices"
 	"strings"
 	"time"
 
@@ -32,7 +32,19 @@ const MODE_CAL tuiMode = "MODE_CAL"
 const MODE_TIMEENTRIES tuiMode = "MODE_TIMEENTRIES"
 const MODE_FORMENTRY tuiMode = "MODE_FORMENTRY"
 
+var version = "dev"
+
+type tickMsg time.Time
+
+func tick() tea.Cmd {
+	return tea.Tick(time.Second, func(t time.Time) tea.Msg {
+		return tickMsg(t)
+	})
+}
+
 type model struct {
+	currentTime time.Time
+
 	miteAPI     mite.APIClient
 	start       calendarTime
 	dest        calendarTime
@@ -51,9 +63,11 @@ type model struct {
 	timeData struct {
 		entries mite.TimeEntries
 		table   table.Model
+		tracker *mite.TrackingTimeEntry
 	}
 	statusBarMessage string
 	windowWidth      int
+	windowHeight     int
 }
 
 func initialModel(miteDomain, miteApiKey string) model {
@@ -73,10 +87,10 @@ func initialModel(miteDomain, miteApiKey string) model {
 	tab.SetStyles(s)
 
 	tab.SetColumns([]table.Column{
-		table.Column{Title: "min", Width: 5},
-		table.Column{Title: "lck", Width: 4},
-		table.Column{Title: "customer", Width: 10},
-		table.Column{Title: "description", Width: 40},
+		{Title: " min", Width: 4},
+		{Title: "🔐", Width: 2},
+		{Title: "customer", Width: 10},
+		{Title: "description", Width: 40},
 	})
 
 	m.start = calendarTime{time.Now()}
@@ -92,88 +106,12 @@ func initialModel(miteDomain, miteApiKey string) model {
 	return m
 }
 
-func (m model) buildForm() *huh.Form {
-
-	clOptions := []huh.Option[string]{}
-	for _, cust := range m.formData.customers {
-		op := miteToHuhOption(cust)
-		clOptions = append(clOptions, op)
-	}
-
-	svcOptions := []huh.Option[string]{}
-	for _, svc := range m.formData.services {
-		op := miteToHuhOption(svc)
-		svcOptions = append(svcOptions, op)
-	}
-
-	cl := huh.NewSelect[string]().
-		Key("client").
-		Options(clOptions...).
-		Title("Client").Height(5).Value(&m.formData.selected.customer)
-
-	sl := huh.NewSelect[string]().
-		Key("service").
-		Options(svcOptions...).
-		Title("Service").Height(5)
-
-	pl := huh.NewSelect[string]().
-		Key("project").
-		Title("Project").Height(3).
-		OptionsFunc(func() []huh.Option[string] {
-			out := []huh.Option[string]{}
-			for _, proj := range m.formData.projects {
-				if fmt.Sprint(proj.CustomerID) == m.formData.selected.customer {
-					out = append(out, miteToHuhOption(proj))
-				}
-			}
-			return out
-		}, &m.formData.selected.customer)
-
-	form := huh.NewForm(
-		huh.NewGroup(
-			cl,
-			sl,
-			pl,
-		),
-		huh.NewGroup(
-			huh.NewText().
-				Key("description").
-				Title("description").
-				Validate(func(s string) error {
-					if s == "" {
-						return errors.New("must enter a description")
-					}
-					return nil
-				}),
-			huh.NewInput().
-				Key("minutes").
-				CharLimit(5).
-				Validate(
-					func(s string) error {
-						h, err := strconv.ParseInt(s, 10, 64)
-						if err != nil {
-							return err
-						}
-						if h < 0 {
-							return errors.New("must be positive")
-						}
-						return err
-					}).
-				Title("Minutes"),
-		),
-	)
-	return form
-}
-
-func miteToHuhOption[T mite.APIObject](i T) huh.Option[string] {
-	return huh.Option[string]{
-		Key:   i.GetName(),
-		Value: fmt.Sprint(i.GetID()),
-	}
-}
-
 func (m model) Init() tea.Cmd {
-	return m.fetchMiteData()
+
+	return tea.Batch(
+		m.fetchMiteData(),
+		tick(),
+	)
 }
 
 func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -182,19 +120,28 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	switch msg := msg.(type) {
 
+	case tickMsg:
+		m.currentTime = time.Time(msg)
+		return m, tick() // schedule next tick
+
 	case miteDataFetchedMsg:
 		if msg.Error != nil {
 			m.statusBarMessage = fmt.Sprintf("Error fetching: %s", msg.Error.Error())
 			m.fetchedData = false
 
 		} else {
-			m.statusBarMessage = fmt.Sprintf("Fetched %d time entries", len(msg.TimeEntries))
+			m.statusBarMessage = fmt.Sprintf("Fetched %d time entries in %s", len(msg.TimeEntries), time.Since(msg.start).Truncate(time.Millisecond))
 			m.timeData.entries = msg.TimeEntries
 			m.formData.customers = msg.Customers
 			m.formData.services = msg.Services
 			m.formData.projects = msg.Projects
+			m.timeData.tracker = msg.Tracker
 			m.fetchedData = true
 
+			slices.SortFunc(m.formData.customers, func(a, b mite.Customer) int { return strings.Compare(a.GetName(), b.GetName()) })
+			slices.SortFunc(m.formData.services, func(a, b mite.Service) int { return strings.Compare(a.GetName(), b.GetName()) })
+			slices.SortFunc(m.formData.projects, func(a, b mite.Project) int { return strings.Compare(a.GetName(), b.GetName()) })
+
 			// just in case there is data for the currently focused day
 			m.timeData.table.SetRows(m.tableDataForDate(m.dest.Time))
 		}
@@ -206,13 +153,14 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	}
 	m.debug = append(m.debug, fmt.Sprintf("Got a %#v", msg))
 
-	if m.tuiMode == MODE_TIMEENTRIES {
+	switch m.tuiMode {
+	case MODE_TIMEENTRIES:
 		return m.updateEntries(msg)
-	} else if m.tuiMode == MODE_CAL {
+	case MODE_CAL:
 		return m.updateCal(msg)
-	} else if m.tuiMode == MODE_FORMENTRY {
+	case MODE_FORMENTRY:
 		return m.updateForm(msg)
-	} else {
+	default:
 		panic(m.tuiMode)
 	}
 }
@@ -261,13 +209,29 @@ func (m model) updateEntries(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.formData.form = m.buildForm()
 			m.formData.form.Init()
 			return m, nil
+		case "c":
+			if m.timeData.tracker != nil {
+				m, msg := m.cancelTracker()
+				return m, msg
+			}
 		}
 	}
 
 	newTable, tableCmd := m.timeData.table.Update(msg)
 	m.timeData.table = newTable
 	return m, tableCmd
+}
 
+func (m model) cancelTracker() (model, tea.Cmd) {
+	stopped, err := m.miteAPI.StopTimeTracker(m.timeData.tracker.ID)
+	if err != nil {
+		m.statusBarMessage = err.Error()
+		return m, nil
+	} else {
+		m.statusBarMessage = fmt.Sprintf("Stopped tracking: %d", stopped.ID)
+		m.timeData.tracker = nil
+		return m, m.fetchMiteData()
+	}
 }
 
 func (m model) updateCal(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -275,6 +239,7 @@ func (m model) updateCal(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tea.WindowSizeMsg:
 		m.windowWidth = msg.Width
+		m.windowHeight = msg.Height
 
 	// Is it a key press?
 	case tea.KeyMsg:
@@ -306,6 +271,12 @@ func (m model) updateCal(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.statusBarMessage = "Fetching data from API"
 			return m, m.fetchMiteData()
 
+			// cancel tracker
+		case "c":
+			if m.timeData.tracker != nil {
+				return m.cancelTracker()
+			}
+
 		// // The "up" and "k" keys move the cursor up
 		// case "up", "k":
 		// 	if m.cursor > 0 {
@@ -347,7 +318,7 @@ func (m model) updateCal(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.timeData.table.SetRows(m.tableDataForDate(m.dest.Time))
 			return m, nil
 		}
-	// The "enter" key and the spacebar (a literal space) toggle
+	// The "enter" key and the space bar (a literal space) toggle
 	// the selected state for the item that the cursor is pointing at.
 	// case "enter", " ":
 	// 	_, ok := m.selected[m.cursor]
@@ -376,34 +347,46 @@ func (m model) tableDataForDate(t time.Time) []table.Row {
 		if entry.Locked {
 			lock = "🔐"
 		}
-		rows = append(rows, table.Row{fmt.Sprint(entry.Minutes), lock, entry.CustomerName, entry.Note})
+		rows = append(rows, table.Row{fmt.Sprintf("%4d", entry.Minutes), lock, entry.CustomerName, entry.Note})
 	}
 	return rows
 }
 
 type miteDataFetchedMsg struct {
+	start       time.Time
 	TimeEntries mite.TimeEntries
 	Customers   mite.Customers
 	Services    mite.Services
 	Projects    mite.Projects
+	Tracker     *mite.TrackingTimeEntry
 	Error       error
 }
 
 func (m model) fetchMiteData() tea.Cmd {
 	return func() tea.Msg {
+		t0 := time.Now()
 		from := time.Now().Add(-time.Hour * 24 * 30 * 6) // about 6 months
 		to := time.Now().Add(time.Hour * 20 * 30)        // about 1 month
 		te, err1 := m.miteAPI.GetTimeEntries(from, to)
 		cst, err2 := m.miteAPI.GetCustomers()
 		svc, err3 := m.miteAPI.GetServices()
 		pjt, err4 := m.miteAPI.GetProjects()
+		tt, err5 := m.miteAPI.GetTimeTracker()
+
+		var msgTT = &tt
+		if err5 == mite.ErrNoTracker {
+			err5 = nil
+			msgTT = nil
+		}
 
 		return miteDataFetchedMsg{
 			TimeEntries: te,
 			Customers:   cst,
 			Services:    svc,
 			Projects:    pjt,
+			Tracker:     msgTT,
 			Error:       errors.Join(err1, err2, err3, err4),
+			start:       t0,
 		}
 	}
 }
@@ -415,6 +398,12 @@ func (m model) View() string {
 	lhs := strings.Builder{}
 	rhs := strings.Builder{}
 
+	nb := lipgloss.NewStyle().Border(lipgloss.NormalBorder())
+	db := lipgloss.NewStyle().Border(lipgloss.DoubleBorder())
+
+	lhsS := nb
+	rhsS := nb
+
 	// if any entries are not "locked", we always use that
 	// regular colour in preference
 	styles := map[string]lipgloss.Style{}
@@ -436,29 +425,49 @@ func (m model) View() string {
 
 	if m.tuiMode == MODE_CAL {
 		lhs.WriteString("(f)etch time data\n")
+		lhsS = db
 	} else {
 		lhs.WriteString("\n")
 	}
-	if m.tuiMode != MODE_FORMENTRY {
+	if m.globalKeyMode() {
 		lhs.WriteString("(a)dd time entry\n")
 	} else {
 		lhs.WriteString("\n")
 	}
+
 	if m.tuiMode == MODE_FORMENTRY {
 		lhs.WriteString("(esc) abort form\n")
 		lhs.WriteString("\n")
+		rhsS = db
 	} else {
 		lhs.WriteString("(tab) switch panes\n")
 		lhs.WriteString("(q)uit\n")
 	}
 
-	calendarWidth := 25
-	tableWidth := m.windowWidth - calendarWidth
+	if m.timeData.tracker != nil {
+		activeTime := time.Since(m.timeData.tracker.Since).Truncate(time.Second).String()
+		activeTime = strings.Replace(activeTime, "0ms", "", 1)
+		lhs.WriteString("\nTracker active: " + activeTime + "\n")
+		if m.globalKeyMode() {
+			lhs.WriteString("(c)ancel\n")
+		} else {
+			lhs.WriteString("\n")
+		}
+	}
+
+	if m.tuiMode == MODE_TIMEENTRIES {
+		rhsS = db
+	}
+
+	lhsWidth := 25
+	rhsWidth := m.windowWidth - lhsWidth - 4
 
 	if m.tuiMode == MODE_FORMENTRY {
 		rhs.WriteString(m.formData.form.View())
 	} else {
 		if m.fetchedData {
+			m.timeData.table.Columns()[3].Width = rhsWidth - 30
+			m.timeData.table.SetHeight(14)
 			rhs.WriteString(m.timeData.table.View())
 			rhs.WriteString("\n")
 		}
@@ -466,14 +475,29 @@ func (m model) View() string {
 
 	out := lipgloss.JoinHorizontal(
 		lipgloss.Top,
-		lipgloss.NewStyle().Width(calendarWidth).Render(lhs.String()),
-		lipgloss.NewStyle().Width(tableWidth).Render(rhs.String()),
+		lhsS.Render(lipgloss.NewStyle().Width(lhsWidth).Render(lhs.String())),
+		rhsS.Render(lipgloss.NewStyle().Width(rhsWidth).Render(rhs.String())),
 	)
 
 	sofar := lipgloss.Height(out)
 
 	statusMsg := strings.ReplaceAll(m.statusBarMessage, "\n", " ")
-	out += styleStatusBar.MarginTop(19 - sofar).Width(m.windowWidth).Render(statusMsg)
+
+	mainMsg := styleStatusBar.Width(m.windowWidth - len(version)).MarginTop(m.windowHeight - sofar).Render(statusMsg)
+	versionMsg := styleStatusBar.MarginTop(m.windowHeight - sofar).Render(version)
+
+	bar := lipgloss.JoinHorizontal(lipgloss.Top,
+		mainMsg,
+		versionMsg,
+	)
+
+	out += bar
 
 	return out
 }
+
+// globalKeyMode indicates when the UI can receive most keystrokes for global operations -
+// mostly this means the form is not active
+func (m model) globalKeyMode() bool {
+	return m.tuiMode != MODE_FORMENTRY
+}

model_form.go

@@ -1,7 +1,9 @@
 package main
 
 import (
+	"charmcal/mite"
 	"errors"
+	"fmt"
 	"strconv"
 	"time"
 
@@ -18,6 +20,8 @@ func (m model) updateForm(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case "esc":
 			m.tuiMode = MODE_CAL
 			return m, nil
+		case "ctrl+c":
+			return m, tea.Quit
 		}
 	}
 
@@ -31,6 +35,7 @@ func (m model) updateForm(msg tea.Msg) (tea.Model, tea.Cmd) {
 		projectID := m.formData.form.GetString("project")
 		description := m.formData.form.GetString("description")
 		minutes := m.formData.form.GetString("minutes")
+		tracker := m.formData.form.GetBool("tracker")
 
 		minutesInt, err1 := strconv.ParseInt(minutes, 10, 64)
 		serviceIDInt, err2 := strconv.ParseInt(serviceID, 10, 64)
@@ -41,13 +46,27 @@ func (m model) updateForm(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.tuiMode = MODE_CAL
 		} else {
 
-			err := m.miteAPI.AddTimeEntry(m.dest.Format(time.DateOnly), int(minutesInt), description, int(projectIDInt), int(serviceIDInt))
+			id, err := m.miteAPI.AddTimeEntry(m.dest.Format(time.DateOnly), int(minutesInt), description, int(projectIDInt), int(serviceIDInt))
 			if err != nil {
-				m.statusBarMessage = errors.Join(err1, err2, err3).Error()
+				m.statusBarMessage = err.Error()
 				m.tuiMode = MODE_CAL
 			} else {
-				m.statusBarMessage = "Successfully logged time"
-				m.tuiMode = MODE_CAL
+				if tracker {
+					_, _, err = m.miteAPI.StartTimeTracker(id)
+					if err != nil {
+						m.statusBarMessage = err.Error()
+						m.tuiMode = MODE_CAL
+					} else {
+						m.statusBarMessage = "Successfully logged time and started tracker"
+						m.tuiMode = MODE_CAL
+						return m, m.fetchMiteData()
+					}
+				} else {
+
+					m.statusBarMessage = "Successfully logged time"
+					m.tuiMode = MODE_CAL
+					return m, m.fetchMiteData()
+				}
 			}
 		}
 
@@ -55,3 +74,100 @@ func (m model) updateForm(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	return m, formCmd
 }
+
+func (m model) buildForm() *huh.Form {
+
+	clOptions := []huh.Option[string]{}
+	for _, cust := range m.formData.customers {
+		op := miteToHuhOption(cust)
+		clOptions = append(clOptions, op)
+	}
+
+	svcOptions := []huh.Option[string]{}
+	for _, svc := range m.formData.services {
+		op := miteToHuhOption(svc)
+		svcOptions = append(svcOptions, op)
+	}
+
+	projOptions := []huh.Option[string]{
+		{
+			Key:   "[no project]",
+			Value: "0",
+		},
+	}
+	for _, proj := range m.formData.projects {
+		op := miteToHuhOption(proj)
+		projOptions = append(projOptions, op)
+	}
+
+	// cl := huh.NewSelect[string]().
+	// 	Key("client").
+	// 	Options(clOptions...).
+	// 	Title("Client").Height(5).Value(&m.formData.selected.customer)
+
+	sl := huh.NewSelect[string]().
+		Key("service").
+		Options(svcOptions...).
+		Title("Service").
+		Height(6)
+
+	pl := huh.NewSelect[string]().
+		Key("project").
+		Title("Project").
+		Options(projOptions...).
+		Height(6)
+
+	description := huh.NewText().
+		Key("description").
+		Title("description").
+		Validate(func(s string) error {
+			if s == "" {
+				return errors.New("must enter a description")
+			}
+			return nil
+		})
+
+	defMinutes := "0"
+	minutes := huh.NewInput().
+		Key("minutes").
+		CharLimit(5).
+		Validate(
+			func(s string) error {
+				h, err := strconv.ParseInt(s, 10, 64)
+				if err != nil {
+					return err
+				}
+				if h < 0 {
+					return errors.New("must be positive")
+				}
+				return err
+			}).
+		Title("Minutes").
+		Value(&defMinutes)
+
+	confirmTracker := huh.NewConfirm().
+		Key("tracker").
+		Affirmative("Yes").
+		Negative("No").
+		Title("Start tracker")
+
+	form := huh.NewForm(
+		huh.NewGroup(
+			pl,
+			sl,
+			description,
+		),
+		huh.NewGroup(
+			minutes,
+			confirmTracker,
+		),
+	)
+	return form
+}
+
+func miteToHuhOption[T mite.APIObject](i T) huh.Option[string] {
+	return huh.Option[string]{
+		Key:   i.GetName(),
+		Value: fmt.Sprint(i.GetID()),
+	}
+}