markdown-to-confluence 0.5.3__py3-none-any.whl → 0.5.5__py3-none-any.whl

markdown_to_confluence-0.5.5.dist-info/RECORD

@@ -0,0 +1,57 @@
+markdown_to_confluence-0.5.5.dist-info/licenses/LICENSE,sha256=SEEBf2BMI1LUHnDvyHnV6L12A6zTAOQcsyMvaawAXWo,1077
+md2conf/__init__.py,sha256=TlQmZzCRIxd5nfwKqbjScEoeeE6okogDHEHRyXzmQBo,402
+md2conf/__main__.py,sha256=4D4OiRJUY1m0UnhndIjg9bOFfAOsuyw12OzgxzypFnw,9480
+md2conf/api.py,sha256=6lJnu-daNxDhOoJdTQ3GAyt6RkFSIP92iC4ptm8sNhs,43028
+md2conf/attachment.py,sha256=3fGLXX3utOP9dZeZqfs9sFiwH5yFgk7ixfhKbTfUb8U,1720
+md2conf/clio.py,sha256=pyiZKipOTQUqR6f0fblchPL1yAr6mM_GPCzS_-Kv1aQ,7851
+md2conf/coalesce.py,sha256=YHnqFwow5wCj6OQ3oosig01D2lxWusAScMF4HAUO2-g,1305
+md2conf/collection.py,sha256=ukN74VCa4HaGSh6tLXpLd0j_UNPywcnKI0X7usgdSCo,824
+md2conf/compatibility.py,sha256=b6n_JFRlNU5Jx4RJqS7FgMp4tk0iYGFxb4--fkIsQcM,873
+md2conf/converter.py,sha256=M7jILSSlY_G1WsyQ9tcZ3MsNmGH1T1GTUIiJQ0SSjlY,66627
+md2conf/csf.py,sha256=w-ng621pWbECwlAwVOWrH0mszG_v9Ac0W39RtHyNa2w,8365
+md2conf/emoticon.py,sha256=0g4rkx3d58xU4nnLak5ms7i0FSDnq0WJrLVFRgGyLC8,542
+md2conf/entities.dtd,sha256=M6NzqL5N7dPs_eUA_6sDsiSLzDaAacrx9LdttiufvYU,30215
+md2conf/environment.py,sha256=TfNEz3Pyw9qe7f8i7e_kph16c09fhZ4cLNZZzIjmI18,3892
+md2conf/extension.py,sha256=_IBf_yhYb6luQM3A-vAAtCpjHay33kE4Au_SGuC3kow,2274
+md2conf/external.py,sha256=uY1G7bdqEMJW66vOvKsh5CS4oHY-YA7h2VVuaSdaqBo,2366
+md2conf/formatting.py,sha256=ygL59VgpioX069axEX-7XjKs0sUjTfIZiBE5fWmITxc,4557
+md2conf/frontmatter.py,sha256=3hUvrxvopI90UxJX7BLwLkjsC6LKLVr4mJ_ctB4r-po,2263
+md2conf/image.py,sha256=E9sLj9xU41pKHBo_8saBcyOuJMwNPwVQFIMmW_7QTzA,5257
+md2conf/latex.py,sha256=RukmO19gvmOFIfWTyBNth1r7FlnihvX56R1EWiaNRdU,2466
+md2conf/local.py,sha256=eY3WpY-lNzLZeAfxX1ACVEhuzz0HDYX_sNQogJfkqcM,3673
+md2conf/markdown.py,sha256=Okhzod811q5-AGn1dOdsYKeB8jBE0GXD2d4_k7Dk9y8,5939
+md2conf/matcher.py,sha256=Xg4YSb87iPkCzhKuKytBut6NOkEab3IM-AjzXbwy64U,6774
+md2conf/metadata.py,sha256=NOjbCIrwLgTIIeNgmo7w5JXuT-pxOXBGSg-irfdpokk,976
+md2conf/options.py,sha256=G6J2l7JW__bIjpTJEQfiFkX3mdB9Q1XbJoN9xduzt3k,7993
+md2conf/png.py,sha256=GU3-0dG6HqwGjedJVUciaIdA-6CdPTy_clsOQGr6dGE,6251
+md2conf/processor.py,sha256=xVLpvKg2FEO0tWsHQ8sm7YpimQepbZ07W0_yUzcvl6c,11116
+md2conf/publisher.py,sha256=n0YkMPw0YZQAUyj-PEW5RSes8YNxIEexFMSMtA7jrTY,14435
+md2conf/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+md2conf/reflection.py,sha256=9b2X9BEisVHpZY5SWv89Z5ZucZ7bO1dIKmWGiooMS68,2638
+md2conf/scanner.py,sha256=2OYBUxooIm8dJBzYMxB3YjdWam6QiNA6fFi5BocvFTo,4217
+md2conf/serializer.py,sha256=fkSzSIPUMSOze4NrpYsqzfFrXQiRYROO9HrueQZoeSo,2144
+md2conf/svg.py,sha256=dR4dnwbjoQq9iIM4nH9PQ4SUdTrZS0BKt0hMyO4C8qE,11607
+md2conf/text.py,sha256=cnYV_JQp_v91LbQHo3qvxcEuhIdaPjCjkmLOKINcNv4,1736
+md2conf/toc.py,sha256=g1mmfcK3c4qff-oQM9dr6s_6gF7WTMbNXoxsDAsiJBY,4614
+md2conf/uri.py,sha256=my0deyR5SlppJrYCbXF1Zz94QA1JT-HTWe9pKw7AJ_A,1158
+md2conf/xml.py,sha256=eR41FaqiketsCxTFBhwKEUW4g1ZQohvlh5J5WC3X-7Q,6690
+md2conf/drawio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+md2conf/drawio/extension.py,sha256=HHLUriTfg82VCfOEyzU-6j2IM9rxR3I1UdSDdujWHgU,4409
+md2conf/drawio/render.py,sha256=BgQRIScH_JpiVX7YTY543x7hQjThskqHf_w9YQ9Y5o0,8636
+md2conf/mermaid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+md2conf/mermaid/config.py,sha256=5Dec2QcdB_GtnuXIW6nhJK8J5caduNZU1oz1mcmmb44,376
+md2conf/mermaid/extension.py,sha256=1drXVM_KbS00dcjSCRru0wwbil4zq3aR81dHMhfe7zA,4021
+md2conf/mermaid/puppeteer-config.json,sha256=-dMTAN_7kNTGbDlfXzApl0KJpAWna9YKZdwMKbpOb60,159
+md2conf/mermaid/render.py,sha256=zO6M5UWSKiezoxPojD8iwFnwrFEDw_P6liQi-C3LQgw,1817
+md2conf/mermaid/scanner.py,sha256=oIpaNxiZBNcmggnjlyYGcIVOXcYQWjf1lEVdyIwE4xE,1379
+md2conf/plantuml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+md2conf/plantuml/config.py,sha256=j0ONhkzmAPagh00ltamTKlVEvXa6R284We9pDxRy-5U,378
+md2conf/plantuml/extension.py,sha256=TPwcQHw9s76GThVQVdgcPB0THmnDFPly2Zqei6pG63I,6285
+md2conf/plantuml/render.py,sha256=Lf1It2KxHPKNGM1rhIDg9zdC3iqhRNCduByqa0_k_qw,3725
+md2conf/plantuml/scanner.py,sha256=Oso6VbHVuMaPMKMazQc_bf4hhOT5WeJN5WiVPM8peyM,1347
+markdown_to_confluence-0.5.5.dist-info/METADATA,sha256=zpy0fBKhzk-S2JcDLMZefDDTI5jrF1hTfIQkY7zyKg0,47514
+markdown_to_confluence-0.5.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+markdown_to_confluence-0.5.5.dist-info/entry_points.txt,sha256=F1zxa1wtEObtbHS-qp46330WVFLHdMnV2wQ-ZorRmX0,50
+markdown_to_confluence-0.5.5.dist-info/top_level.txt,sha256=_FJfl_kHrHNidyjUOuS01ngu_jDsfc-ZjSocNRJnTzU,8
+markdown_to_confluence-0.5.5.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+markdown_to_confluence-0.5.5.dist-info/RECORD,,

{markdown_to_confluence-0.5.3.dist-info → markdown_to_confluence-0.5.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

md2conf/__init__.py

@@ -5,7 +5,7 @@ Parses Markdown files, converts Markdown content into the Confluence Storage For
 Confluence API endpoints to upload images and content.
 """
 
-__version__ = "0.5.3"
+__version__ = "0.5.5"
 __author__ = "Levente Hunyadi"
 __copyright__ = "Copyright 2022-2026, Levente Hunyadi"
 __license__ = "MIT"

md2conf/__main__.py

@@ -16,17 +16,23 @@ import sys
 import typing
 from io import StringIO
 from pathlib import Path
-from typing import Any, Iterable, Literal, Sequence
+from types import TracebackType
+from typing import Any, Iterable, Sequence
+
+from requests.exceptions import HTTPError, JSONDecodeError
 
 from . import __version__
+from .clio import add_arguments, get_options
 from .compatibility import override
 from .environment import ArgumentError, ConfluenceSiteProperties, ConnectionProperties
 from .metadata import ConfluenceSiteMetadata
-from .options import ConfluencePageID, ConverterOptions, DocumentOptions, ImageLayoutOptions, LayoutOptions
+from .options import ConfluencePageID, ConverterOptions, DocumentOptions
+
+LOGGER = logging.getLogger(__name__)
 
 
 class Arguments(argparse.Namespace):
-    mdpath: Path
+    mdpath: list[Path]
     domain: str | None
     path: str | None
     api_url: str | None
@@ -34,25 +40,14 @@ class Arguments(argparse.Namespace):
     api_key: str | None
     space: str | None
     loglevel: str
-    heading_anchors: bool
-    ignore_invalid_url: bool
     root_page: str | None
     keep_hierarchy: bool
-    skip_title_heading: bool
     title_prefix: str | None
     generated_by: str | None
-    prefer_raster: bool
-    render_drawio: bool
-    render_mermaid: bool
-    render_plantuml: bool
-    render_latex: bool
-    diagram_output_format: Literal["png", "svg"]
+    skip_update: bool
+    line_numbers: bool
     local: bool
     headers: dict[str, str]
-    webui_links: bool
-    alignment: Literal["center", "left", "right"]
-    max_image_width: int | None
-    use_panel: bool
 
 
 class KwargsAppendAction(argparse.Action):
@@ -100,7 +95,7 @@ def get_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(formatter_class=PositionalOnlyHelpFormatter)
     parser.prog = os.path.basename(os.path.dirname(__file__))
     parser.add_argument("--version", action="version", version=__version__)
-    parser.add_argument("mdpath", help="Path to Markdown file or directory to convert and publish.")
+    parser.add_argument("mdpath", type=Path, nargs="+", help="Path to Markdown file or directory to convert and publish.")
     parser.add_argument("-d", "--domain", help="Confluence organization domain.")
     parser.add_argument("-p", "--path", help="Base path for Confluence (default: '/wiki/').")
     parser.add_argument(
@@ -123,16 +118,7 @@ def get_parser() -> argparse.ArgumentParser:
     parser.add_argument(
         "-l",
         "--loglevel",
-        choices=[
-            logging.getLevelName(level).lower()
-            for level in (
-                logging.DEBUG,
-                logging.INFO,
-                logging.WARN,
-                logging.ERROR,
-                logging.CRITICAL,
-            )
-        ],
+        choices=[logging.getLevelName(level).lower() for level in (logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR, logging.CRITICAL)],
         default=logging.getLevelName(logging.INFO),
         help="Use this option to set the log verbosity.",
     )
@@ -148,16 +134,16 @@ def get_parser() -> argparse.ArgumentParser:
         help="Maintain source directory structure when exporting to Confluence.",
     )
     parser.add_argument(
-        "--flatten-hierarchy",
+        "--skip-hierarchy",
         dest="keep_hierarchy",
         action="store_false",
-        help="Flatten directories with no index.md or README.md when exporting to Confluence.",
+        help="Flatten directories with no `index.md` or `README.md` when exporting to Confluence.",
     )
     parser.add_argument(
         "--generated-by",
         default="This page has been generated with a tool.",
         metavar="MARKDOWN",
-        help="Add prompt to pages (default: 'This page has been generated with a tool.').",
+        help="Add prompt to pages.",
     )
     parser.add_argument(
         "--no-generated-by",
@@ -167,107 +153,20 @@ def get_parser() -> argparse.ArgumentParser:
         help="Do not add 'generated by a tool' prompt to pages.",
     )
     parser.add_argument(
-        "--render-drawio",
-        dest="render_drawio",
-        action="store_true",
-        default=True,
-        help="Render draw.io diagrams as image files. (Installed utility required to covert.)",
-    )
-    parser.add_argument(
-        "--no-render-drawio",
-        dest="render_drawio",
-        action="store_false",
-        help="Upload draw.io diagram sources as Confluence page attachments. (Marketplace app required to display.)",
-    )
-    parser.add_argument(
-        "--render-mermaid",
-        dest="render_mermaid",
-        action="store_true",
-        default=True,
-        help="Render Mermaid diagrams as image files. (Installed utility required to convert.)",
-    )
-    parser.add_argument(
-        "--no-render-mermaid",
-        dest="render_mermaid",
-        action="store_false",
-        help="Upload Mermaid diagram sources as Confluence page attachments. (Marketplace app required to display.)",
-    )
-    parser.add_argument(
-        "--render-plantuml",
-        dest="render_plantuml",
-        action="store_true",
-        default=True,
-        help="Render PlantUML diagrams as image files. (Installed utility required to convert.)",
-    )
-    parser.add_argument(
-        "--no-render-plantuml",
-        dest="render_plantuml",
-        action="store_false",
-        help="Upload PlantUML diagram sources as Confluence page attachments. (Marketplace app required to display.)",
-    )
-    parser.add_argument(
-        "--render-latex",
-        dest="render_latex",
-        action="store_true",
-        default=True,
-        help="Render LaTeX formulas as image files. (Matplotlib required to convert.)",
-    )
-    parser.add_argument(
-        "--no-render-latex",
-        dest="render_latex",
-        action="store_false",
-        help="Inline LaTeX formulas in Confluence page. (Marketplace app required to display.)",
-    )
-    parser.add_argument(
-        "--diagram-output-format",
-        dest="diagram_output_format",
-        choices=["png", "svg"],
-        default="png",
-        help="Format for rendering Mermaid and draw.io diagrams (default: 'png').",
-    )
-    parser.add_argument(
-        "--prefer-raster",
-        dest="prefer_raster",
-        action="store_true",
-        default=True,
-        help="Prefer PNG over SVG when both exist (default: enabled).",
-    )
-    parser.add_argument(
-        "--no-prefer-raster",
-        dest="prefer_raster",
-        action="store_false",
-        help="Use SVG files directly instead of preferring PNG equivalents.",
-    )
-    parser.add_argument(
-        "--heading-anchors",
+        "--skip-update",
         action="store_true",
         default=False,
-        help="Place an anchor at each section heading with GitHub-style same-page identifiers.",
-    )
-    parser.add_argument(
-        "--no-heading-anchors",
-        action="store_false",
-        dest="heading_anchors",
-        help="Don't place an anchor at each section heading.",
-    )
-    parser.add_argument(
-        "--ignore-invalid-url",
-        action="store_true",
-        default=False,
-        help="Emit a warning but otherwise ignore relative URLs that point to ill-specified locations.",
-    )
-    parser.add_argument(
-        "--skip-title-heading",
-        action="store_true",
-        default=False,
-        help="Skip the first heading from document body when it is used as the page title (does not apply if title comes from front-matter).",
-    )
-    parser.add_argument(
-        "--no-skip-title-heading",
-        dest="skip_title_heading",
-        action="store_false",
-        help="Keep the first heading in document body even when used as page title (default).",
-    )
+        help="Skip saving Confluence page ID in Markdown files.",
+    )
+    add_arguments(parser, ConverterOptions)
+    if sys.version_info >= (3, 13):
+        parser.add_argument(
+            "--ignore-invalid-url",
+            dest="force_valid_url",
+            action="store_false",
+            help="Emit a warning but otherwise ignore relative URLs that point to ill-specified locations.",
+            deprecated=True,
+        )
     parser.add_argument(
         "--title-prefix",
         default=None,
@@ -275,30 +174,11 @@ def get_parser() -> argparse.ArgumentParser:
         help="String to prepend to Confluence page title for each published page.",
     )
     parser.add_argument(
-        "--webui-links",
-        action="store_true",
-        default=False,
-        help="Enable Confluence Web UI links. (Typically required for on-prem versions of Confluence.)",
-    )
-    parser.add_argument(
-        "--alignment",
-        dest="alignment",
-        choices=["center", "left", "right"],
-        default="center",
-        help="Alignment for block-level images and formulas (default: 'center').",
-    )
-    parser.add_argument(
-        "--max-image-width",
-        dest="max_image_width",
-        type=int,
-        default=None,
-        help="Maximum display width for images [px]. Wider images are scaled down for page display. Original size kept for full-size viewing.",
-    )
-    parser.add_argument(
-        "--use-panel",
+        "--line-numbers",
+        dest="line_numbers",
         action="store_true",
         default=False,
-        help="Transform admonitions and alerts into a Confluence custom panel.",
+        help="Inject line numbers in Markdown source to help localize conversion errors.",
     )
     parser.add_argument(
         "--local",
@@ -324,13 +204,31 @@ def get_help() -> str:
         return buf.getvalue()
 
 
+def _exception_hook(exc_type: type[BaseException], exc_value: BaseException, traceback: TracebackType | None) -> None:
+    LOGGER.exception("Exception raised: %s", exc_type.__name__, exc_info=exc_value)
+    ex: BaseException | None = exc_value
+    while ex is not None:
+        print(f"\033[95m{ex.__class__.__name__}\033[0m: {ex}")
+
+        if isinstance(ex, HTTPError):
+            # print details for a response with JSON body
+            if ex.response is not None:
+                try:
+                    LOGGER.error(ex.response.json())
+                except JSONDecodeError:
+                    pass
+
+        ex = ex.__cause__
+
+
+sys.excepthook = _exception_hook  # spellchecker:disable-line
+
+
 def main() -> None:
     parser = get_parser()
     args = Arguments()
     parser.parse_args(namespace=args)
 
-    args.mdpath = Path(args.mdpath)
-
     logging.basicConfig(
         level=getattr(logging, args.loglevel.upper(), logging.INFO),
         format="%(asctime)s - %(levelname)s - %(funcName)s [%(lineno)d] - %(message)s",
@@ -341,25 +239,9 @@ def main() -> None:
         keep_hierarchy=args.keep_hierarchy,
         title_prefix=args.title_prefix,
         generated_by=args.generated_by,
-        converter=ConverterOptions(
-            heading_anchors=args.heading_anchors,
-            ignore_invalid_url=args.ignore_invalid_url,
-            skip_title_heading=args.skip_title_heading,
-            prefer_raster=args.prefer_raster,
-            render_drawio=args.render_drawio,
-            render_mermaid=args.render_mermaid,
-            render_plantuml=args.render_plantuml,
-            render_latex=args.render_latex,
-            diagram_output_format=args.diagram_output_format,
-            webui_links=args.webui_links,
-            use_panel=args.use_panel,
-            layout=LayoutOptions(
-                image=ImageLayoutOptions(
-                    alignment=args.alignment,
-                    max_width=args.max_image_width,
-                ),
-            ),
-        ),
+        skip_update=args.skip_update,
+        converter=get_options(args, ConverterOptions),
+        line_numbers=args.line_numbers,
     )
     if args.local:
         from .local import LocalConverter
@@ -377,10 +259,10 @@ def main() -> None:
             base_path=site_properties.base_path,
             space_key=site_properties.space_key,
         )
-        LocalConverter(options, site_metadata).process(args.mdpath)
+        converter = LocalConverter(options, site_metadata)
+        for item in args.mdpath:
+            converter.process(item)
     else:
-        from requests import HTTPError, JSONDecodeError
-
         from .api import ConfluenceAPI
         from .publisher import Publisher
 
@@ -396,20 +278,10 @@ def main() -> None:
             )
         except ArgumentError as e:
             parser.error(str(e))
-        try:
-            with ConfluenceAPI(properties) as api:
-                Publisher(api, options).process(args.mdpath)
-        except HTTPError as err:
-            logging.error(err)
-
-            # print details for a response with JSON body
-            if err.response is not None:
-                try:
-                    logging.error(err.response.json())
-                except JSONDecodeError:
-                    pass
-
-            sys.exit(1)
+        with ConfluenceAPI(properties) as api:
+            publisher = Publisher(api, options)
+            for item in args.mdpath:
+                publisher.process(item)
 
 
 if __name__ == "__main__":

md2conf/api.py

@@ -402,12 +402,7 @@ class ConfluenceAPI:
         )
         return self.session
 
-    def __exit__(
-        self,
-        exc_type: type[BaseException] | None,
-        exc_val: BaseException | None,
-        exc_tb: TracebackType | None,
-    ) -> None:
+    def __exit__(self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None) -> None:
         """
         Closes an open connection.
         """
@@ -429,15 +424,7 @@ class ConfluenceSession:
     _space_id_to_key: dict[str, str]
     _space_key_to_id: dict[str, str]
 
-    def __init__(
-        self,
-        session: requests.Session,
-        *,
-        api_url: str | None,
-        domain: str | None,
-        base_path: str | None,
-        space_key: str | None,
-    ) -> None:
+    def __init__(self, session: requests.Session, *, api_url: str | None, domain: str | None, base_path: str | None, space_key: str | None) -> None:
         self.session = session
         self._space_id_to_key = {}
         self._space_key_to_id = {}
@@ -488,12 +475,7 @@ class ConfluenceSession:
         self.session.close()
         self.session = requests.Session()
 
-    def _build_url(
-        self,
-        version: ConfluenceVersion,
-        path: str,
-        query: dict[str, str] | None = None,
-    ) -> str:
+    def _build_url(self, version: ConfluenceVersion, path: str, query: dict[str, str] | None = None) -> str:
         """
         Builds a full URL for invoking the Confluence API.
 
@@ -506,14 +488,7 @@ class ConfluenceSession:
         base_url = f"{self.api_url}{version.value}{path}"
         return build_url(base_url, query)
 
-    def _get(
-        self,
-        version: ConfluenceVersion,
-        path: str,
-        response_type: type[T],
-        *,
-        query: dict[str, str] | None = None,
-    ) -> T:
+    def _get(self, version: ConfluenceVersion, path: str, response_type: type[T], *, query: dict[str, str] | None = None) -> T:
         "Executes an HTTP request via Confluence API."
 
         url = self._build_url(version, path, query)
@@ -829,13 +804,7 @@ class ConfluenceSession:
         LOGGER.info("Updating attachment: %s", attachment_id)
         self._put(ConfluenceVersion.VERSION_1, path, request, None)
 
-    def get_page_properties_by_title(
-        self,
-        title: str,
-        *,
-        space_id: str | None = None,
-        space_key: str | None = None,
-    ) -> ConfluencePageProperties:
+    def get_page_properties_by_title(self, title: str, *, space_id: str | None = None, space_key: str | None = None) -> ConfluencePageProperties:
         """
         Looks up a Confluence wiki page ID by title.
 
@@ -890,10 +859,10 @@ class ConfluenceSession:
                 else:
                     raise
 
-        # This should not be reached, but satisfies type checker
+        # this should not be reached, but satisfies type checker
         if last_error is not None:
             raise last_error
-        raise ConfluenceError(f"Failed to get page {page_id}")
+        raise ConfluenceError(f"failed to get page: {page_id}")
 
     def get_page_properties(self, page_id: str) -> ConfluencePageProperties:
         """
@@ -916,14 +885,7 @@ class ConfluenceSession:
 
         return self.get_page_properties(page_id).version.number
 
-    def update_page(
-        self,
-        page_id: str,
-        content: str,
-        *,
-        title: str,
-        version: int,
-    ) -> None:
+    def update_page(self, page_id: str, content: str, *, title: str, version: int, message: str) -> None:
         """
         Updates a page via the Confluence API.
 
@@ -939,35 +901,28 @@ class ConfluenceSession:
             status=ConfluenceStatus.CURRENT,
             title=title,
             body=ConfluencePageBody(storage=ConfluencePageStorage(representation=ConfluenceRepresentation.STORAGE, value=content)),
-            version=ConfluenceContentVersion(number=version, minorEdit=True),
+            version=ConfluenceContentVersion(number=version, minorEdit=True, message=message),
         )
         LOGGER.info("Updating page: %s", page_id)
         self._put(ConfluenceVersion.VERSION_2, path, request, None)
 
-    def create_page(
-        self,
-        parent_id: str,
-        title: str,
-        new_content: str,
-    ) -> ConfluencePage:
+    def create_page(self, *, title: str, content: str, parent_id: str, space_id: str) -> ConfluencePage:
         """
         Creates a new page via Confluence API.
         """
 
         LOGGER.info("Creating page: %s", title)
 
-        parent_page = self.get_page_properties(parent_id)
-
         path = "/pages/"
         request = ConfluenceCreatePageRequest(
-            spaceId=parent_page.spaceId,
+            spaceId=space_id,
             status=ConfluenceStatus.CURRENT,
             title=title,
             parentId=parent_id,
             body=ConfluencePageBody(
                 storage=ConfluencePageStorage(
                     representation=ConfluenceRepresentation.STORAGE,
-                    value=new_content,
+                    value=content,
                 )
             ),
         )
@@ -1009,23 +964,15 @@ class ConfluenceSession:
             response = self.session.delete(url, verify=True)
             response.raise_for_status()
 
-    def page_exists(
-        self,
-        title: str,
-        *,
-        space_id: str | None = None,
-        space_key: str | None = None,
-    ) -> str | None:
+    def page_exists(self, title: str, *, space_id: str | None = None) -> str | None:
         """
         Checks if a Confluence page exists with the given title.
 
         :param title: Page title. Pages in the same Confluence space must have a unique title.
-        :param space_key: Identifies the Confluence space.
-
+        :param space_id: Identifies the Confluence space.
         :returns: Confluence page ID of a matching page (if found), or `None`.
         """
 
-        space_id = self._get_space_id(space_id=space_id, space_key=space_key)
         path = "/pages"
         query = {"title": title}
         if space_id is not None:
@@ -1058,17 +1005,19 @@ class ConfluenceSession:
 
         :param title: Page title. Pages in the same Confluence space must have a unique title.
         :param parent_id: Identifies the parent page for a new child page.
+        :returns: Confluence page info for the found or newly created page.
         """
 
         parent_page = self.get_page_properties(parent_id)
-        page_id = self.page_exists(title, space_id=parent_page.spaceId)
+        space_id = parent_page.spaceId
+        page_id = self.page_exists(title, space_id=space_id)
 
         if page_id is not None:
             LOGGER.debug("Retrieving existing page: %s", page_id)
             return self.get_page(page_id)
         else:
             LOGGER.debug("Creating new page with title: %s", title)
-            return self.create_page(parent_id, title, "")
+            return self.create_page(title=title, content="", parent_id=parent_id, space_id=space_id)
 
     def get_labels(self, page_id: str) -> list[ConfluenceIdentifiedLabel]:
         """
@@ -1132,6 +1081,23 @@ class ConfluenceSession:
             remove_labels.sort()
             self.remove_labels(page_id, remove_labels)
 
+    def get_content_property_for_page(self, page_id: str, key: str) -> ConfluenceIdentifiedContentProperty | None:
+        """
+        Retrieves a content property for a Confluence page.
+
+        :param page_id: The Confluence page ID.
+        :param key: The name of the property to fetch (with case-sensitive match).
+        :returns: The content property value, or `None` if not found.
+        """
+
+        path = f"/pages/{page_id}/properties"
+        results = self._fetch(path, query={"key": key})
+        properties = json_to_object(list[ConfluenceIdentifiedContentProperty], results)
+        if len(properties) == 1:
+            return properties.pop()
+        else:
+            return None
+
     def get_content_properties_for_page(self, page_id: str) -> list[ConfluenceIdentifiedContentProperty]:
         """
         Retrieves content properties for a Confluence page.

md2conf/attachment.py

@@ -40,6 +40,9 @@ class AttachmentCatalog:
         self.embedded_files[filename] = data
 
 
+_DISALLOWED_CHAR_REGEXP = re.compile(r"[^\-0-9A-Za-z_.]", re.UNICODE)
+
+
 def attachment_name(ref: Path | str) -> str:
     """
     Safe name for use with attachment uploads.
@@ -60,13 +63,11 @@ def attachment_name(ref: Path | str) -> str:
     if path.drive or path.root:
         raise ValueError(f"required: relative path; got: {ref}")
 
-    regexp = re.compile(r"[^\-0-9A-Za-z_.]", re.UNICODE)
-
     def replace_part(part: str) -> str:
         if part == "..":
             return "PAR"
         else:
-            return regexp.sub("_", part)
+            return _DISALLOWED_CHAR_REGEXP.sub("_", part)
 
     parts = [replace_part(p) for p in path.parts]
     return Path(*parts).as_posix().replace("/", "_")