group similar entries

toggl2sheets.py

@@ -124,8 +124,9 @@ def get_toggl_entries(
         None,
     )
 
-    # construct a dict of d["project name"] = [[date, description, duration (hours), wage], ...]
+    # construct a dict of entries d["project name"][(date, description)] = duration
-    out = defaultdict(list)
+    # entries on the same day with the same description get aggregated together
+    packed = defaultdict(lambda: defaultdict(int))
     for entry in reversed(entries):
         if not valid_entry(entry):
             continue
@@ -134,14 +135,15 @@ def get_toggl_entries(
         if end <= last_edit:
             continue  # get better accuracy than toggl lets us in their requests
 
-        out[projects[entry["project_id"]]].append(
+        packed[projects[entry["project_id"]]][(start.astimezone().strftime("%-d. %-m. %Y"), entry["description"])] += entry["duration"] / 60 / 60
-            [
+
-                start.astimezone().strftime("%-d. %-m. %Y"),
+    # unpack into the final output of d["project name"] = [[date, description, duration, hourly_wage], ...]
-                entry["description"],
+    out = {}
-                round(entry["duration"] / 60 / 60, 2),
+    for project, entries in packed.items():
-                HOURLY_WAGE,
+        unpacked = []
-            ]
+        for metadata, duration in entries.items():
-        )
+            unpacked.append([*metadata, round(duration, 2), HOURLY_WAGE])
+        out[project] = unpacked
 
     return out, last_entry