- fixed issue with duration when computer sleeps

timemate · Nov 5, 2021 · 1d2de84 · 1d2de84
1 parent 28d3110
commit 1d2de84
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/main.go b/main.go
@@ -27,7 +27,7 @@ func init() {
 }
 
 func updateEntries(trackerSvc trackers.TrackerApi, syncSvc sync.SyncApi, projects []interface{}, start time.Time, end time.Time) error {
-	fmt.Printf("Update entries for duration %s\n", end.Sub(start))
+	log.Printf("Update entries for duration %s\n", end.Sub(start))
 	entries, err := trackerSvc.GetTimeEntries(start, end)
 	if err != nil {
 		return err
@@ -75,6 +75,8 @@ func main() {
 					log.Fatal(err)
 				}
 
+				log.Printf("Sync started with config period: %s, every: %s", lookupTimeframe, every)
+
 				end := time.Now()
 				start := end.Add(-lookupTimeframe)
 
@@ -95,14 +97,21 @@ func main() {
 				if err != nil {
 					log.Fatal(err)
 				}
+				lastRun := time.Now().Format("2006-01-02T15:04:05-0700")
 				if service {
-					ticker := time.NewTicker(every)
+					ticker := time.NewTicker(time.Second)
 					quit := make(chan error, 1)
 					go func() {
 						for {
 							select {
 							case <-ticker.C:
-								err = updateEntries(trackerSvc, syncSvc, (jiraConf["projects"]).([]interface{}), start, end)
+								nowFormatted := time.Now().Format("2006-01-02T15:04:05-0700")
+								now, err := time.Parse("2006-01-02T15:04:05-0700", nowFormatted)
+								last, err := time.Parse("2006-01-02T15:04:05-0700", lastRun)
+								if now.Sub(last).Seconds() > every.Seconds() {
+									err = updateEntries(trackerSvc, syncSvc, (jiraConf["projects"]).([]interface{}), start, end)
+									lastRun = time.Now().Format("2006-01-02T15:04:05-0700")
+								}
 								if err != nil {
 									quit <- err
 								}

diff --git a/pkg/sync/jira.go b/pkg/sync/jira.go
@@ -1,7 +1,8 @@
 package sync
 
 import (
-	"fmt"
+	"log"
+
 	"github.com/andygrunwald/go-jira"
 	"godep.io/timemate/pkg/trackers"
 )
@@ -48,9 +49,6 @@ func findWorklog(worklogs []jira.WorklogRecord, entry trackers.TimeEntry) *jira.
 
 func (ji *JiraSync) Sync(tasks []Task) (err error) {
 	for _, t := range tasks {
-		//is, _, err := ji.api.Issue.Get(t.Id, &jira.GetQueryOptions{
-		//	Fields: "worklog, worklogs",
-		//})
 		worklog, _, err := ji.api.Issue.GetWorklogs(t.Id, jira.WithQueryOptions(&jira.AddWorklogQueryOptions{
 			Expand: "properties",
 		}))
@@ -61,6 +59,10 @@ func (ji *JiraSync) Sync(tasks []Task) (err error) {
 			w := findWorklog(worklog.Worklogs, e)
 			st := jira.Time(e.Start())
 			diff := e.Stop().Sub(e.Start())
+			// do not perform update if we have the same values for time/description
+			if w != nil && w.Comment == e.Description() && int(diff.Seconds()) == w.TimeSpentSeconds {
+				continue
+			}
 			record := &jira.WorklogRecord{
 				Comment:          e.Description(),
 				Started:          &st,
@@ -79,7 +81,7 @@ func (ji *JiraSync) Sync(tasks []Task) (err error) {
 			} else {
 				_, _, err = ji.api.Issue.AddWorklogRecord(t.Id, record)
 			}
-			fmt.Printf("Synchronized time entry of %s for task %s\n", diff, t.Id)
+			log.Printf("Synchronized time entry of %s for task %s\n", diff, t.Id)
 		}
 	}
 	return err