[tasks] Fix timestamps for notes and syncing from org-mode (32973bb3)

vrobbler/apps/scrobbles/scrobblers.py

@@ -35,6 +35,7 @@ from scrobbles.notifications import ScrobbleNtfyNotification
 from scrobbles.utils import (
     convert_to_seconds,
     extract_domain,
+    make_note_timestamp,
     next_url_if_exists,
     remove_last_part,
 )
@@ -528,7 +529,7 @@ def email_scrobble_board_game(
         stop_timestamp = timestamp + timedelta(seconds=duration_seconds)
 
         if comments:
-            log_data["notes"] = {str(int(stop_timestamp.timestamp())): comments}
+            log_data["notes"] = {make_note_timestamp(stop_timestamp): comments}
 
         logger.info(f"Creating scrobble for {base_game} at {timestamp}")
         log_data["raw_data"] = bgstat_data
@@ -688,7 +689,7 @@ def todoist_scrobble_update_task(
         )
         return
 
-    timestamp = todoist_note.get("posted_at") or str(int(timezone.now().timestamp()))
+    timestamp = todoist_note.get("posted_at") or make_note_timestamp()
     if not scrobble.log.get("notes"):
         scrobble.log["notes"] = {}
     scrobble.log["notes"][timestamp] = todoist_note.get("notes")
@@ -786,12 +787,37 @@ def todoist_scrobble_task(
     return scrobble
 
 
+ORG_HEADING_RE = re.compile(r"^(\*+\s+.*)$", re.MULTILINE)
+NOTE_CONTENT_SPLIT = re.compile(r"^\*{3,}\s", re.MULTILINE)
+
+
+def _truncate_at_org_header(text: str) -> str:
+    """Truncate text at the first org-mode heading (*** or more)."""
+    parts = NOTE_CONTENT_SPLIT.split(text, maxsplit=1)
+    return parts[0].strip()
+
+
+def _extract_org_section(body: str | None, heading: str) -> str | None:
+    """Extract content under a specific org-mode sub-heading (e.g. '*** Description')."""
+    if not body:
+        return None
+    sections = ORG_HEADING_RE.split(body)
+    # sections alternates: [prefix, heading1, content1, heading2, content2, ...]
+    for i, section in enumerate(sections):
+        if section.strip().startswith(heading):
+            if i + 1 < len(sections):
+                return sections[i + 1].strip()
+            return ""
+    return None
+
+
 def emacs_scrobble_update_task(
     emacs_id: str,
     emacs_notes: list,
     user_id: int,
     description: Optional[str] = None,
 ) -> Optional[Scrobble]:
+    description = _extract_org_section(description, "*** Description")
     scrobble = Scrobble.objects.filter(
         in_progress=True,
         user_id=user_id,
@@ -818,6 +844,11 @@ def emacs_scrobble_update_task(
     for note in emacs_notes:
         timestamp = note.get("timestamp")
         content = note.get("content")
+        if not content:
+            continue
+        content = _truncate_at_org_header(content)
+        if not content:
+            continue
         if timestamp:
             existing = scrobble.log["notes"].get(timestamp)
             if existing != content:
@@ -896,7 +927,7 @@ def emacs_scrobble_task(
 
     task_data.pop("notes", None)
     task_data["title"] = task_data.pop("description")
-    task_data["description"] = task_data.pop("body")
+    task_data["description"] = _extract_org_section(task_data.pop("body"), "*** Description")
     task_data["labels"] = task_data.pop("labels")
 
     task_data["orgmode_id"] = task_data.pop("source_id")