slidesync 0.6.0__tar.gz → 0.6.2__tar.gz

{slidesync-0.6.0/slidesync.egg-info → slidesync-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidesync
-Version: 0.6.0
+Version: 0.6.2
 Summary: Bidirectional sync between a Slidev markdown deck and Google Slides as native, editable objects
 Author-email: Daniel Hails <slidesync@hails.info>
 License: MIT
@@ -22,7 +22,7 @@ Bidirectional sync between a [Slidev](https://sli.dev) markdown deck and **Googl
 Slides** — as native, editable objects (title/body/bullets/tables/positioned
 images, brand-styled text boxes), not pasted screenshots.
 
-Version: 0.6.0
+Version: 0.6.2
 
 ```bash
 uvx slidesync --help            # run without installing

{slidesync-0.6.0 → slidesync-0.6.2}/README.md

@@ -4,7 +4,7 @@ Bidirectional sync between a [Slidev](https://sli.dev) markdown deck and **Googl
 Slides** — as native, editable objects (title/body/bullets/tables/positioned
 images, brand-styled text boxes), not pasted screenshots.
 
-Version: 0.6.0
+Version: 0.6.2
 
 ```bash
 uvx slidesync --help            # run without installing

{slidesync-0.6.0 → slidesync-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "slidesync"
-version = "0.6.0"
+version = "0.6.2"
 authors = [
     { name = "Daniel Hails", email = "slidesync@hails.info" },
 ]
@@ -32,7 +32,7 @@ include = ["slidesync*"]
 dev = ["pytest>=8"]
 
 [tool.bumpver]
-current_version = "0.6.0"
+current_version = "0.6.2"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

{slidesync-0.6.0 → slidesync-0.6.2}/slidesync/__init__.py

@@ -30,7 +30,7 @@ from slidesync._sync import (
     write_slidev,
 )
 
-__version__ = "0.6.0"
+__version__ = "0.6.2"
 
 __all__ = [
     "Para",

{slidesync-0.6.0 → slidesync-0.6.2}/slidesync/_sync.py

@@ -1282,31 +1282,43 @@ def _restore_threads(drive, deck, creates) -> None:
     if not slides_with:
         return
     live = shape_comments(list_comments(drive, deck))
+    me = drive.about().get(
+        fields="user(displayName)").execute()["user"]["displayName"]
+
+    def bare(content: str) -> str:
+        # A re-created foreign thread carries its attribution in-content
+        # ("@Fabien: ..."); strip it so every generation of a thread matches.
+        return " ".join(re.sub(r"^@[^:]+:\s*", "", content).split())
+
     for s, blocks in slides_with:
         for entries in blocks:
             _author, head = entries[0]
             norm = " ".join(head.split())
-            match = next((c for c in live if not c["resolved"]
-                          and " ".join(c["content"].split()) == norm), None)
-            if match is None or match["page"] == s.object_id:
+            matches = [c for c in live if not c["resolved"]
+                       and bare(c["content"]) == norm]
+            if not matches or any(c["page"] == s.object_id for c in matches):
                 continue  # resolved/deleted (don't revive) or already anchored
+            content = matches[0]["content"]
+            if matches[0]["author"] not in ("", me) \
+                    and not content.lstrip().startswith("@"):
+                content = f"@{matches[0]['author']}: {content}"
             anchor_json = json.dumps({"type": "page", "pages": [s.object_id]})
             new = drive.comments().create(
-                fileId=deck,
-                body={"content": match["content"], "anchor": anchor_json},
+                fileId=deck, body={"content": content, "anchor": anchor_json},
                 fields="id").execute()
-            for r in match["replies"]:
+            for r in matches[0]["replies"]:
                 drive.replies().create(
                     fileId=deck, commentId=new["id"],
                     body={"content": f"@{r['author']}: {r['content']}"
-                          if r["author"] else r["content"]},
+                          if r["author"] not in ("", me) else r["content"]},
                     fields="id").execute()
-            try:
-                drive.comments().delete(fileId=deck,
-                                        commentId=match["id"]).execute()
-            except Exception as exc:  # noqa: BLE001 — foreign-authored thread
-                logger.warning(f"left dangling thread {match['id']} in place "
-                               f"(not deletable): {exc}")
+            for c in matches:  # retire every stale copy we are allowed to
+                try:
+                    drive.comments().delete(fileId=deck,
+                                            commentId=c["id"]).execute()
+                except Exception as exc:  # noqa: BLE001 — foreign-authored
+                    logger.warning(f"left dangling thread {c['id']} by "
+                                   f"{c['author']} in place (not deletable): {exc}")
             logger.info(f"re-anchored comment thread on '{s.key}'")
 
 
@@ -2366,6 +2378,11 @@ def cmd_sync(args):
         local = _content_lines(sl.src or "", sl.template_name) or []
         status = classify_drift(base, local, live_lines)
         if status in ("clean", "converged"):
+            if s["objectId"] != sl.object_id:
+                # Rendered text matches, but the content hash moved — a
+                # comment/notes-level local change that still needs a push.
+                logger.info(f"[notes-edit] {sl.key} — push will update it")
+                state["pushable"] = True
             continue
         if status == "local-edit":
             logger.info(f"[local-edit] {sl.key} — push will update it")

{slidesync-0.6.0 → slidesync-0.6.2/slidesync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidesync
-Version: 0.6.0
+Version: 0.6.2
 Summary: Bidirectional sync between a Slidev markdown deck and Google Slides as native, editable objects
 Author-email: Daniel Hails <slidesync@hails.info>
 License: MIT
@@ -22,7 +22,7 @@ Bidirectional sync between a [Slidev](https://sli.dev) markdown deck and **Googl
 Slides** — as native, editable objects (title/body/bullets/tables/positioned
 images, brand-styled text boxes), not pasted screenshots.
 
-Version: 0.6.0
+Version: 0.6.2
 
 ```bash
 uvx slidesync --help            # run without installing

{slidesync-0.6.0 → slidesync-0.6.2}/tests/test_e2e_scenarios.py

@@ -168,13 +168,16 @@ class _FakeComments:
 
     def create(self, fileId, body=None, fields=None):
         def go():
-            self.d.add_raw(body.get("anchor"), body["content"])
+            self.d.add_raw(body.get("anchor"), body["content"], author=self.d.me)
             return {"id": self.d.threads[-1]["id"]}
         return _Req(go)
 
     def delete(self, fileId, commentId):
         def go():
-            self.d.threads = [t for t in self.d.threads if t["id"] != commentId]
+            t = next(t for t in self.d.threads if t["id"] == commentId)
+            if t["author"]["displayName"] != self.d.me:
+                raise RuntimeError("403: insufficient permissions")  # like Drive
+            self.d.threads.remove(t)
             return {}
         return _Req(go)
 
@@ -193,6 +196,8 @@ class _FakeReplies:
 
 
 class FakeDrive:
+    me = "Daniel Hails"  # the authenticated account's display name
+
     def __init__(self):
         self.threads = []  # raw Drive comment dicts
         self.n = 0
@@ -203,6 +208,10 @@ class FakeDrive:
     def replies(self):
         return _FakeReplies(self)
 
+    def about(self):
+        return SimpleNamespace(get=lambda fields=None: _Req(
+            lambda: {"user": {"displayName": self.me}}))
+
     def add_raw(self, anchor, content, author="Daniel Hails"):
         self.n += 1
         self.threads.append({
@@ -492,3 +501,75 @@ def test_resolved_threads_are_not_revived(env):
     _sync_cmd(env)
     assert all(t.get("resolved") for t in env.drive.threads), \
         "push must not re-create resolved threads"
+
+
+def test_foreign_thread_mirrors_with_attribution_and_survives_rerenders(env):
+    # Fabien (not the authenticated account) comments on a slide.
+    env.drive.add(env.store.oid_of("Takeaway A"), "have you controlled for length?",
+                  author="Fabien")
+    _sync_cmd(env)
+    # Mirrored with HIS name, kept out of the speaker notes.
+    text = env.path.read_text()
+    assert "<!-- @Fabien: have you controlled for length? -->" in text
+    slide = next(s for s in env.store.slides
+                 if any("Takeaway A" in sh["text"] for sh in s["shapes"].values()))
+    assert "controlled for length" not in slide["notes"]
+    # Re-anchored copy exists on the current page, attributed in-content; the
+    # undeletable foreign original may dangle, but the count must stay BOUNDED
+    # across further re-render cycles (no duplication).
+    def live_pages():
+        return {json.loads(t["anchor"])["pages"][0] for t in env.drive.threads}
+    assert slide["id"] in live_pages()
+    n_after_first = len(env.drive.threads)
+    for marker in ("cycle two", "cycle three"):
+        env.path.write_text(env.path.read_text().replace(
+            "One solid point", f"One solid point ({marker})"))
+        _sync_cmd(env)
+    assert len(env.drive.threads) == n_after_first, "threads must not duplicate"
+    current = next(s for s in env.store.slides
+                   if any("Takeaway A" in sh["text"] for sh in s["shapes"].values()))
+    assert current["id"] in live_pages(), "thread follows the slide across renders"
+    anchored = [t for t in env.drive.threads
+                if json.loads(t["anchor"])["pages"][0] == current["id"]]
+    assert any("@Fabien:" in t["content"] for t in anchored), \
+        "re-created head keeps Fabien's attribution in-content"
+
+
+def test_plain_attribution_notes_are_speaker_notes_not_threads(tmp_path, monkeypatch):
+    # The 2026-06-01 deck's mentor annotations are unprefixed attribution notes
+    # ("Fabien: ..."), not @-mirrors — they must stay presenter notes.
+    store, drive = FakeStore(), FakeDrive()
+    slides_api = FakeSlides(store)
+    monkeypatch.setattr(_sync, "get_services", lambda account: (slides_api, drive))
+    path = tmp_path / "deck.slidev.md"
+    path.write_text(MD.replace(
+        "<!-- presenter note A -->",
+        '<!-- Fabien: over-triggering is "the classic one." Stack-rank fixes '
+        "by difficulty / importance / access. -->"))
+    push(slides_api, drive, DECK, load_slides(path), anchor=None, prune=False,
+         base_dir=tmp_path)
+    slide = next(s for s in store.slides
+                 if any("Takeaway A" in sh["text"] for sh in s["shapes"].values()))
+    assert "over-triggering" in slide["notes"], "plain notes stay in the pane"
+    assert not drive.threads, "no comment thread is fabricated from notes"
+
+
+def test_force_push_does_not_churn_already_anchored_threads(env):
+    env.drive.add(env.store.oid_of("Takeaway A"), "anchored and settled")
+    _sync_cmd(env)  # capture + re-anchor onto the current page
+    stable_ids = {t["id"] for t in env.drive.threads}
+    _push(env, force=True)  # re-render with UNCHANGED content -> same objectIds
+    assert {t["id"] for t in env.drive.threads} == stable_ids, \
+        "an already-anchored thread must not be deleted/recreated"
+
+
+def test_comment_only_local_change_still_syncs(env):
+    # Converting a presenter note to an @-annotation changes no rendered text,
+    # but it changes the speaker notes + marker — sync must still push it.
+    env.path.write_text(env.path.read_text().replace(
+        "<!-- presenter note A -->", "<!-- @Ted: presenter note A -->"))
+    _sync_cmd(env)
+    slide = next(s for s in env.store.slides
+                 if any("Takeaway A" in sh["text"] for sh in s["shapes"].values()))
+    assert "presenter note A" not in slide["notes"], \
+        "the @-annotation must leave the speaker-notes pane on the next sync"