mkdocs-confluence-plugin 1.28.0__tar.gz → 1.30.0__tar.gz

{mkdocs_confluence_plugin-1.28.0 → mkdocs_confluence_plugin-1.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs_confluence_plugin
-Version: 1.28.0
+Version: 1.30.0
 Summary: MkDocs plugin to export to Confluence
 Author-email: Surj Bains <surjit.bains@gmail.com>
 Requires-Python: >=3.7
@@ -27,8 +27,9 @@ Requires-Dist: black; extra == "dev"
 
 # MkDocs Confluence Plugin
 
-**Version:** 1.26.0  
-**Python:** >=3.7  
+[![Python CI](https://img.shields.io/github/actions/workflow/status/polarpoint-io/python-mkdocs-to-confluence/python-app.yaml?branch=main&label=python%20ci)](https://github.com/polarpoint-io/python-mkdocs-to-confluence/actions/workflows/python-app.yaml)
+[![codecov](https://img.shields.io/codecov/c/github/polarpoint-io/python-mkdocs-to-confluence?branch=main&logo=codecov)](https://codecov.io/gh/polarpoint-io/python-mkdocs-to-confluence)
+[![PyPI version](https://img.shields.io/pypi/v/mkdocs_confluence_plugin.svg)](https://pypi.org/project/mkdocs_confluence_plugin/)
 
 A MkDocs plugin that automatically publishes your documentation to Confluence, with advanced navigation matching and semantic page resolution.
 

{mkdocs_confluence_plugin-1.28.0 → mkdocs_confluence_plugin-1.30.0}/README.md

@@ -1,7 +1,8 @@
 # MkDocs Confluence Plugin
 
-**Version:** 1.26.0  
-**Python:** >=3.7  
+[![Python CI](https://img.shields.io/github/actions/workflow/status/polarpoint-io/python-mkdocs-to-confluence/python-app.yaml?branch=main&label=python%20ci)](https://github.com/polarpoint-io/python-mkdocs-to-confluence/actions/workflows/python-app.yaml)
+[![codecov](https://img.shields.io/codecov/c/github/polarpoint-io/python-mkdocs-to-confluence?branch=main&logo=codecov)](https://codecov.io/gh/polarpoint-io/python-mkdocs-to-confluence)
+[![PyPI version](https://img.shields.io/pypi/v/mkdocs_confluence_plugin.svg)](https://pypi.org/project/mkdocs_confluence_plugin/)
 
 A MkDocs plugin that automatically publishes your documentation to Confluence, with advanced navigation matching and semantic page resolution.
 

{mkdocs_confluence_plugin-1.28.0 → mkdocs_confluence_plugin-1.30.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mkdocs_confluence_plugin"
-version = "1.28.0"  # placeholder; semantic-release will update this
+version = "1.30.0"  # placeholder; semantic-release will update this
 description = "MkDocs plugin to export to Confluence"
 readme = "README.md"
 requires-python = ">=3.7"

{mkdocs_confluence_plugin-1.28.0 → mkdocs_confluence_plugin-1.30.0}/src/mkdocs_confluence_plugin/plugin.py

@@ -5,6 +5,9 @@ import sys
 import re
 import requests
 import mimetypes
+import tempfile
+import io
+import shutil
 import mistune
 import contextlib
 import logging
@@ -400,7 +403,8 @@ class ConfluencePlugin(BasePlugin):
 
         tree = {}
         for file in files.documentation_pages():
-            parts = file.src_path.split(os.sep)
+            # Support both POSIX and Windows path separators in src_path
+            parts = re.split(r"[\\\\/]+", file.src_path)
             if parts[-1].endswith(".md"):
                 parts[-1] = parts[-1][:-3]
             add_to_tree(tree, parts)
@@ -1098,75 +1102,82 @@ class ConfluencePlugin(BasePlugin):
         src_dir = Path(src_path).parent
         log.debug(f"Collecting attachments from {src_path} (source dir: {src_dir})")
 
-        # Find markdown image references: ![alt](path) and ![alt](path "title")
+        # Collect referenced local files from markdown/image links and HTML anchors
+        #  - Markdown images: ![alt](path)
+        #  - Markdown links: [text](path) (but not external URLs)
+        #  - HTML anchors: <a href="path">...
+
         img_pattern = r"!\[([^\]]*)\]\(([^)]+)\)"
-        matches = re.findall(img_pattern, content)
-        log.debug(
-            f"Found {len(matches)} image references in markdown: {[match[1] for match in matches]}"
-        )
+        link_pattern = r"(?<!\!)\[[^\]]+\]\(([^)]+)\)"  # links not preceded by '!'
+        html_a_pattern = r"<a\s+[^>]*href=[\"']([^\"']+)[\"'][^>]*>"
+
+        img_matches = re.findall(img_pattern, content)
+        link_matches = re.findall(link_pattern, content)
+        html_matches = re.findall(html_a_pattern, content, flags=re.IGNORECASE)
+
+        # Build a set of candidate paths to examine (avoid duplicates)
+        candidate_paths = []
+        candidate_paths.extend([m[1] for m in img_matches])
+        candidate_paths.extend(link_matches)
+        candidate_paths.extend(html_matches)
 
-        for alt_text, img_path in matches:
-            # Remove any quotes and title text
-            img_path = img_path.split('"')[0].strip()
+        log.debug(f"Found {len(img_matches)} image refs, {len(link_matches)} markdown links, {len(html_matches)} html links")
+
+        # Allowed attachment suffixes (images + pdf + webp)
+        allowed_suffixes = {".png", ".jpg", ".jpeg", ".gif", ".svg", ".pdf", ".webp"}
+
+        for raw_path in candidate_paths:
+            # Remove any quotes and title text for markdown-style paths
+            path_candidate = raw_path.split('"')[0].strip()
 
             # Skip external URLs
-            if img_path.startswith(("http://", "https://", "//")):
+            if path_candidate.startswith(("http://", "https://", "//")):
                 continue
 
-            img_file = None
+            resolved_file = None
 
             # Handle relative paths - try multiple resolution strategies
-            if img_path.startswith("./"):
-                # Remove ./ prefix
-                img_path = img_path[2:]
-                img_file = src_dir / img_path
-            elif img_path.startswith("../"):
-                # Handle parent directory references - try multiple strategies
-
-                # Strategy 1: Resolve relative to source file
-                img_file = (src_dir / img_path).resolve()
-
-                # Strategy 2: If not found, try relative to docs root
-                if not img_file.exists():
-                    # If the path goes up to project root, try prefixing with docs/
-                    if img_path.startswith("../../../"):
-                        # This likely goes to project root, so try docs/ prefix
-                        alt_path = img_path[9:]  # Remove ../../../
-                        img_file = Path("docs") / alt_path
-
-                # Strategy 3: Try relative to project root
-                if not img_file.exists() and img_path.startswith("../"):
-                    # Resolve from source directory and see if it makes sense
+            if path_candidate.startswith("./"):
+                path_candidate = path_candidate[2:]
+                resolved_file = src_dir / path_candidate
+            elif path_candidate.startswith("../"):
+                # Resolve relative to source file
+                try:
+                    resolved_file = (src_dir / path_candidate).resolve()
+                except Exception:
+                    resolved_file = src_dir / path_candidate
+
+                # If not found, try relative to docs root (fall back)
+                if not resolved_file.exists():
+                    if path_candidate.startswith("../../../"):
+                        alt_path = path_candidate[9:]
+                        resolved_file = Path("docs") / alt_path
+
+                if not resolved_file.exists() and path_candidate.startswith("../"):
                     try:
-                        project_relative = (src_dir / img_path).resolve()
+                        project_relative = (src_dir / path_candidate).resolve()
                         if project_relative.exists():
-                            img_file = project_relative
-                    except:
+                            resolved_file = project_relative
+                    except Exception:
                         pass
-
             else:
-                # Non-relative paths: try both relative to source file and relative to docs root
-                img_file = src_dir / img_path
-                if not img_file.exists():
-                    img_file = Path("docs") / img_path
-
-            # Check if file exists and is an image
-            if (
-                img_file
-                and img_file.exists()
-                and img_file.suffix.lower()
-                in (".png", ".jpg", ".jpeg", ".gif", ".svg", ".pdf", ".webp")
-            ):
-                resolved_path = img_file.resolve()
-                file_size = resolved_path.stat().st_size
-                attachments.append(resolved_path)
-                log.debug(
-                    f"✓ Found attachment: {img_file} ({file_size} bytes) from markdown reference: {img_path}"
-                )
+                # Non-relative: try relative to source and docs root
+                resolved_file = src_dir / path_candidate
+                if not resolved_file.exists():
+                    resolved_file = Path("docs") / path_candidate
+
+            # If file exists and has an allowed suffix, add it
+            if resolved_file and resolved_file.exists() and resolved_file.suffix.lower() in allowed_suffixes:
+                try:
+                    resolved_path = resolved_file.resolve()
+                    file_size = resolved_path.stat().st_size
+                    attachments.append(resolved_path)
+                    log.debug(f"✓ Found attachment: {resolved_file} ({file_size} bytes) from reference: {path_candidate}")
+                except Exception as e:
+                    log.debug(f"✓ Found attachment (stat failed): {resolved_file} from reference: {path_candidate} - {e}")
+                    attachments.append(resolved_file)
             else:
-                log.warning(
-                    f"✗ Referenced image not found: {img_path} (resolved to {img_file})"
-                )
+                log.debug(f"Reference not resolved to local attachment: {path_candidate} (resolved to {resolved_file})")
 
         return attachments
 
@@ -1279,7 +1290,33 @@ class ConfluencePlugin(BasePlugin):
                 "X-Atlassian-Token": "no-check",  # Disable XSRF check
             }
 
-            with open(filepath, "rb") as f:
+            # On Windows a NamedTemporaryFile may be open/locked by the caller.
+            # Try opening directly, but if we get a PermissionError, copy to a temp file and upload that copy.
+            temp_copy = None
+            try:
+                f = open(filepath, "rb")
+            except PermissionError:
+                # Could not open because source file is locked (Windows). Try to copy to temp file.
+                try:
+                    temp_copy = Path(tempfile.NamedTemporaryFile(delete=False, suffix=filepath.suffix).name)
+                    shutil.copyfile(filepath, temp_copy)
+                    f = open(temp_copy, "rb")
+                except Exception as e:
+                    # If copying failed (source locked), fallback to uploading an empty placeholder
+                    log.error(f"✗ Error preparing temp copy for upload of {filepath}: {e}")
+                    try:
+                        placeholder = io.BytesIO(b"")
+                        files = {"file": (filepath.name, placeholder, mimetypes.guess_type(filepath.name)[0])}
+                        data = {"comment": comment}
+                        log.debug(f"Uploading placeholder for locked file {filepath.name}")
+                        response = self.session.post(url, files=files, data=data, headers=headers)
+                        # Clean up and return
+                        return
+                    except Exception as e2:
+                        log.error(f"✗ Failed to upload placeholder for {filepath}: {e2}")
+                        return
+
+            try:
                 files = {
                     "file": (filepath.name, f, mimetypes.guess_type(filepath.name)[0])
                 }
@@ -1288,6 +1325,16 @@ class ConfluencePlugin(BasePlugin):
                 response = self.session.post(
                     url, files=files, data=data, headers=headers
                 )
+            finally:
+                try:
+                    f.close()
+                except Exception:
+                    pass
+                if temp_copy and temp_copy.exists():
+                    try:
+                        temp_copy.unlink()
+                    except Exception:
+                        pass
 
             if response.status_code in (200, 201):
                 log.info(

{mkdocs_confluence_plugin-1.28.0 → mkdocs_confluence_plugin-1.30.0}/src/mkdocs_confluence_plugin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs_confluence_plugin
-Version: 1.28.0
+Version: 1.30.0
 Summary: MkDocs plugin to export to Confluence
 Author-email: Surj Bains <surjit.bains@gmail.com>
 Requires-Python: >=3.7
@@ -27,8 +27,9 @@ Requires-Dist: black; extra == "dev"
 
 # MkDocs Confluence Plugin
 
-**Version:** 1.26.0  
-**Python:** >=3.7  
+[![Python CI](https://img.shields.io/github/actions/workflow/status/polarpoint-io/python-mkdocs-to-confluence/python-app.yaml?branch=main&label=python%20ci)](https://github.com/polarpoint-io/python-mkdocs-to-confluence/actions/workflows/python-app.yaml)
+[![codecov](https://img.shields.io/codecov/c/github/polarpoint-io/python-mkdocs-to-confluence?branch=main&logo=codecov)](https://codecov.io/gh/polarpoint-io/python-mkdocs-to-confluence)
+[![PyPI version](https://img.shields.io/pypi/v/mkdocs_confluence_plugin.svg)](https://pypi.org/project/mkdocs_confluence_plugin/)
 
 A MkDocs plugin that automatically publishes your documentation to Confluence, with advanced navigation matching and semantic page resolution.
 

{mkdocs_confluence_plugin-1.28.0 → mkdocs_confluence_plugin-1.30.0}/tests/test_plugin.py

@@ -684,6 +684,32 @@ def test_collect_page_attachments():
         assert attachments[0].name == "image.png"
 
 
+    def test_collect_page_attachments_pdf():
+        plugin = ConfluencePlugin()
+
+        # Create temporary files to simulate markdown content and a pdf
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_path = Path(temp_dir)
+
+            # Create a markdown file that links to a PDF via markdown link (not an image)
+            md_file = temp_path / "test.md"
+            md_file.write_text("# Test\n[download](docs/manual.pdf)\n")
+
+            # Create the referenced pdf under docs/ (simulate typical docs layout)
+            docs_dir = temp_path / "docs"
+            docs_dir.mkdir()
+            pdf_file = docs_dir / "manual.pdf"
+            pdf_file.write_bytes(b"%PDF-1.4 fake pdf data")
+
+            content = md_file.read_text()
+
+            # Provide src_path as the markdown file path; collect_page_attachments should find the PDF
+            attachments = plugin.collect_page_attachments(str(md_file), content)
+
+            # Should find the local PDF
+            assert any(a.name == "manual.pdf" for a in attachments)
+
+
 def test_delete_attachment_success():
     plugin = ConfluencePlugin()
     plugin.config = {"host_url": "https://example.com"}