fix: Improve the aggregations

Author: viccon

aggregated_file.go

@@ -1,5 +1,7 @@
 package pulse
 
+import "cmp"
+
 // AggregatedFile represents a file that has been aggregated
 // for a given time period (day, week, month, year).
 type AggregatedFile struct {
@@ -11,6 +13,10 @@ type AggregatedFile struct {
 
 // merge takes two AggregatedFile, merges them, and returns the result.
 func (a AggregatedFile) merge(b AggregatedFile) AggregatedFile {
-	a.DurationMs += b.DurationMs
-	return a
+	return AggregatedFile{
+		Name:       cmp.Or(a.Name, b.Name),
+		Path:       cmp.Or(a.Path, b.Path),
+		Filetype:   cmp.Or(a.Filetype, b.Filetype),
+		DurationMs: a.DurationMs + b.DurationMs,
+	}
 }

aggregated_files.go

@@ -18,12 +18,12 @@ func (a AggregatedFiles) merge(b AggregatedFiles) AggregatedFiles {
 	aFileMap := createPathFileMap(a)
 	bFileMap := createPathFileMap(b)
 
-	allPaths := make(map[string]bool)
+	allPaths := make(map[string]struct{})
 	for path := range aFileMap {
-		allPaths[path] = true
+		allPaths[path] = struct{}{}
 	}
 	for path := range bFileMap {
-		allPaths[path] = true
+		allPaths[path] = struct{}{}
 	}
 
 	mergedFiles := make([]AggregatedFile, 0, len(allPaths))

aggregated_session.go

@@ -1,5 +1,7 @@
 package pulse
 
+import "cmp"
+
 // AggregatedSession represents a session that has been aggregated
 // for a given time period (day, week, month, year).
 type AggregatedSession struct {
@@ -12,11 +14,11 @@ type AggregatedSession struct {
 }
 
 // merge takes two aggregated sessions, merges them, and returns the result.
-func (a AggregatedSession) merge(b AggregatedSession, date int64, timePeriod Period) AggregatedSession {
+func (a AggregatedSession) merge(b AggregatedSession, epochDateMs int64, timePeriod Period) AggregatedSession {
 	mergedSession := AggregatedSession{
 		Period:       timePeriod,
-		EpochDateMs:  date,
-		DateString:   a.DateString,
+		EpochDateMs:  epochDateMs,
+		DateString:   cmp.Or(a.DateString, b.DateString),
 		TotalTimeMs:  a.TotalTimeMs + b.TotalTimeMs,
 		Repositories: a.Repositories.merge(b.Repositories),
 	}

buffer_stack.go

@@ -30,16 +30,13 @@ func (b *bufferStack) files() Files {
 	sortOrder := make([]string, 0)
 	pathFile := make(map[string]File)
 
-	// Merge the buffers by filepath.
+	// Turn the buffers into files and merge them by filepath.
 	for _, buffer := range b.buffers {
-		file, exists := pathFile[buffer.Filepath]
-		if !exists {
+		file, ok := pathFile[buffer.Filepath]
+		pathFile[buffer.Filepath] = file.merge(fileFromBuffer(buffer))
+		if !ok {
 			sortOrder = append(sortOrder, buffer.Filepath)
-			pathFile[buffer.Filepath] = fileFromBuffer(buffer)
-			continue
 		}
-		file.Duration += buffer.Duration()
-		pathFile[buffer.Filepath] = file
 	}
 
 	// Return the buffers in the original order.

file.go

@@ -1,6 +1,9 @@
 package pulse
 
-import "time"
+import (
+	"cmp"
+	"time"
+)
 
 // File represents a file that has been opened during a coding session.
 type File struct {
@@ -11,6 +14,16 @@ type File struct {
 	Duration   time.Duration `json:"duration"`
 }
 
+func (f File) merge(b File) File {
+	return File{
+		Name:       cmp.Or(f.Name, b.Name),
+		Path:       cmp.Or(f.Path, b.Path),
+		Repository: cmp.Or(f.Repository, b.Repository),
+		Filetype:   cmp.Or(f.Filetype, b.Filetype),
+		Duration:   f.Duration + b.Duration,
+	}
+}
+
 // fileFromBuffer turns a code buffer into a file.
 func fileFromBuffer(b Buffer) File {
 	return File{

repository.go

@@ -1,5 +1,7 @@
 package pulse
 
+import "cmp"
+
 // Repository represents a git repository. A coding session
 // might open files across any number of repos. The files of
 // the coding session are later grouped by repository.
@@ -12,7 +14,7 @@ type Repository struct {
 // merge takes two repositories, merges them, and returns the result.
 func (r Repository) merge(b Repository) Repository {
 	return Repository{
-		Name:       r.Name,
+		Name:       cmp.Or(r.Name, b.Name),
 		Files:      r.Files.merge(b.Files),
 		DurationMs: r.DurationMs + b.DurationMs,
 	}