mkdocs2confluence 0.7.19__tar.gz → 0.7.22__tar.gz

{mkdocs2confluence-0.7.19 → mkdocs2confluence-0.7.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.19
+Version: 0.7.22
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later

{mkdocs2confluence-0.7.19 → mkdocs2confluence-0.7.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.7.19"
+version = "0.7.22"
 description = "Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }

{mkdocs2confluence-0.7.19 → mkdocs2confluence-0.7.22}/src/mkdocs2confluence.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.19
+Version: 0.7.22
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later

{mkdocs2confluence-0.7.19 → mkdocs2confluence-0.7.22}/src/mkdocs_to_confluence/cli.py

@@ -492,6 +492,7 @@ def _cmd_publish(args: argparse.Namespace) -> None:
             partial = bool(getattr(args, "page", None) or getattr(args, "section", None))
             report = execute_publish(
                 plan, client, dry_run=False, space_id=space_id,
+                space_key=conf_config.space_key,
                 docs_dir=config.docs_dir, full_width=conf_config.full_width,
                 root_page_id=conf_config.parent_page_id,
                 prune=getattr(args, "prune", False) and not partial,

{mkdocs2confluence-0.7.19 → mkdocs2confluence-0.7.22}/src/mkdocs_to_confluence/publisher/client.py

@@ -33,6 +33,7 @@ class ConfluenceClient:
     def __init__(self, config: ConfluenceConfig) -> None:
         self._config = config
         self._client: httpx.Client | None = None
+        self._space_states: dict[str, list[dict[str, Any]]] = {}  # space_key → list of ContentState
 
     # ── Context manager ────────────────────────────────────────────────────────
 
@@ -361,16 +362,29 @@ class ConfluenceClient:
             resp = self._http.post(label_url, json=payload)
             self._raise_for_status(resp, f"set_page_labels({page_id!r})")
 
-    def set_page_status(self, page_id: str, status_key: str) -> None:
+    def set_page_status(self, page_id: str, status_key: str, space_key: str | None = None) -> None:
         """Set the Confluence page content state (e.g. ``rough-draft``, ``in-progress``).
 
-        Uses the v1 ``PUT /content/{id}/state`` endpoint.  *status_key* is a
-        kebab-case alias that is converted to a title-case name matching the
-        built-in Confluence space states (e.g. ``in-progress`` → ``In Progress``).
+        Uses the v1 ``PUT /content/{id}/state`` endpoint.  When *space_key* is
+        provided the space states are fetched once (cached) so the correct
+        ``id``, ``name``, and ``color`` are sent — required to match an
+        existing space state rather than creating a new custom one.
         """
         name = status_key.replace("-", " ").title()
+        state_body: dict[str, Any] = {"name": name}
+
+        if space_key:
+            if space_key not in self._space_states:
+                resp = self._http.get(self._v1(f"/space/{space_key}/state"))
+                if resp.is_success:
+                    self._space_states[space_key] = resp.json() if isinstance(resp.json(), list) else []
+            for state in self._space_states.get(space_key, []):
+                if state.get("name", "").lower() == name.lower():
+                    state_body = {"id": state["id"], "name": state["name"], "color": state["color"]}
+                    break
+
         url = self._v1(f"/content/{page_id}/state")
-        resp = self._http.put(url, json={"name": name})
+        resp = self._http.put(url, json=state_body)
         self._raise_for_status(resp, f"set_page_status({page_id!r}, {status_key!r})")
 
     def list_attachments(self, page_id: str) -> dict[str, dict[str, Any]]:

{mkdocs2confluence-0.7.19 → mkdocs2confluence-0.7.22}/src/mkdocs_to_confluence/publisher/pipeline.py

@@ -636,6 +636,7 @@ def _post_process_action(
     full_width: bool,
     docs_dir: Path,
     report: PublishReport,
+    space_key: str | None = None,
     quiet: bool = False,
 ) -> None:
     """Run all non-fatal post-create/update work for a single action."""
@@ -663,7 +664,7 @@ def _post_process_action(
     # Set Confluence page status (rough-draft / in-progress / etc.) — non-fatal.
     if action.page_id and action.confluence_status and not action.is_folder:
         try:
-            client.set_page_status(action.page_id, action.confluence_status)
+            client.set_page_status(action.page_id, action.confluence_status, space_key=space_key)
         except Exception as exc:
             if not quiet:
                 print(f"  [warn] could not set page status '{action.confluence_status}': {exc}", file=sys.stderr)
@@ -685,6 +686,7 @@ def execute_publish(
     *,
     dry_run: bool = False,
     space_id: str,
+    space_key: str | None = None,
     docs_dir: Path,
     full_width: bool = True,
     root_page_id: str | None = None,
@@ -725,6 +727,16 @@ def execute_publish(
     for action in plan:
         if action.action == "skip":
             report.skipped += 1
+            # Still apply status even for unchanged pages.
+            if action.page_id and action.confluence_status and not action.is_folder:
+                try:
+                    client.set_page_status(action.page_id, action.confluence_status, space_key=space_key)
+                except Exception as exc:
+                    if not quiet:
+                        print(
+                            f"  [warn] could not set page status '{action.confluence_status}': {exc}",
+                            file=sys.stderr,
+                        )
             continue
 
         counter += 1
@@ -746,7 +758,10 @@ def execute_publish(
         if action.node.is_section and action.page_id:
             _wire_children(action, action_by_node)
 
-        _post_process_action(action, client, full_width=full_width, docs_dir=docs_dir, report=report, quiet=quiet)
+        _post_process_action(
+            action, client,
+            full_width=full_width, docs_dir=docs_dir, space_key=space_key, report=report, quiet=quiet,
+        )
 
     if prune and root_page_id:
         published_ids = {a.page_id for a in plan if a.page_id}