mkdocs-include-markdown-plugin 7.1.2__py3-none-any.whl → 7.1.3__py3-none-any.whl

mkdocs_include_markdown_plugin/cache.py

@@ -43,7 +43,7 @@ class Cache:
             is_file = stat.S_ISREG(os.stat(fpath).st_mode)
         except (FileNotFoundError, OSError):  # pragma: no cover
             return None
-        if is_file:
+        if is_file:  # pragma: no branch
             creation_time = self.get_creation_time_from_fpath(fpath)
             if time.time() < creation_time + self.expiration_seconds:
                 return self.read_file(fpath, encoding=encoding)
@@ -79,7 +79,7 @@ def get_cache_directory(cache_dir: str) -> str | None:
 
     try:
         from platformdirs import user_data_dir
-    except ImportError:
+    except ImportError:  # pragma: no cover
         return None
     else:
         return user_data_dir('mkdocs-include-markdown-plugin')

mkdocs_include_markdown_plugin/directive.py

@@ -306,7 +306,6 @@ def resolve_file_paths_to_exclude(
     docs_dir: str,
 ) -> list[str]:
     """Resolve the file paths to exclude for a directive."""
-    root_dir = None
     if process.is_absolute_path(exclude_string):
         return glob.glob(exclude_string, flags=GLOB_FLAGS)
 
@@ -330,7 +329,7 @@ def resolve_file_paths_to_exclude(
             )
         ]
 
-    return glob.glob(
+    return glob.glob(  # pragma: no cover
         exclude_string,
         flags=GLOB_FLAGS,
         root_dir=docs_dir,

mkdocs_include_markdown_plugin/event.py

@@ -83,21 +83,20 @@ def get_file_content(  # noqa: PLR0913, PLR0915
         http_cache: Cache | None = None,
 ) -> str:
     """Return the content of the file to include."""
-    settings_ignore_paths = []
-    if settings.exclude is not None:
-        for path in glob.glob(
-                [
-                    os.path.join(docs_dir, fp)
-                    if not os.path.isabs(fp)
-                    else fp for fp in settings.exclude
-                ],
-                flags=GLOB_FLAGS,
-                root_dir=docs_dir,
-        ):
-            if path not in settings_ignore_paths:
-                settings_ignore_paths.append(path)
+    if settings.exclude:
+        settings_ignore_paths = list(glob.glob(
+            [
+                os.path.join(docs_dir, fp)
+                if not os.path.isabs(fp)
+                else fp for fp in settings.exclude
+            ],
+            flags=GLOB_FLAGS,
+            root_dir=docs_dir,
+        ))
         if page_src_path in settings_ignore_paths:
             return markdown
+    else:
+        settings_ignore_paths = []
 
     new_found_include_contents: list[tuple[str, str]] = []
     new_found_include_markdown_contents: list[tuple[str, str]] = []
@@ -150,8 +149,7 @@ def get_file_content(  # noqa: PLR0913, PLR0915
             for path in resolve_file_paths_to_exclude(
                 exclude_string, page_src_path, docs_dir,
             ):
-                if path not in ignore_paths:
-                    ignore_paths.append(path)
+                ignore_paths.append(path)
 
         file_paths_to_include, is_url = resolve_file_paths_to_include(
             filename,
@@ -361,8 +359,7 @@ def get_file_content(  # noqa: PLR0913, PLR0915
             for path in resolve_file_paths_to_exclude(
                 exclude_string, page_src_path, docs_dir,
             ):
-                if path not in ignore_paths:
-                    ignore_paths.append(path)
+                ignore_paths.append(path)
 
         file_paths_to_include, is_url = resolve_file_paths_to_include(
             filename,

mkdocs_include_markdown_plugin/process.py

@@ -112,6 +112,49 @@ MARKDOWN_LINK_DEFINITION_REGEX = re.compile(
     flags=re.VERBOSE | re.MULTILINE,
 )
 
+# Matched html image and source definition.
+# e.g. <img src="path/to/image.png" alt="alt-text">
+# e.g. <source src="path/to/image.png" alt="alt-text">
+MARKDOWN_HTML_IMAGE_REGEX = re.compile(
+    r'''
+        <(?:img|source)    # img or source
+        (?:\s+             # More than one whitespace
+            (?!src=)       # Not src=
+            [\w-]+         # attribute name
+            (?:\s*=\s*)?   # arbitrary whitespace (optional)
+            (?:
+                "[^"]*"    # Quoted value (double quote)
+                |
+                '[^']*'    # Quoted value (single quote)
+            )?
+        )*                 # Other attributes are repeated 0 or more times
+        \s+                # More than one whitespace
+        src=["'](\S+?)["'] # src = $1 (double quote or single quote)
+    ''',
+    flags=re.VERBOSE | re.MULTILINE,
+)
+
+# Matched html anchor definition.
+# e.g. <a href="https://example.com">example</a>
+MARKDOWN_HTML_ANCHOR_DEFINITION_REGEX = re.compile(
+    r'''
+        <a
+        (?:\s+             # More than one whitespace
+            (?!href=)      # Not href=
+            [\w-]+         # attribute name
+            (?:\s*=\s*)?   # arbitrary whitespace (optional)
+            (?:
+                "[^"]*"    # Quoted value (double quote)
+                |
+                '[^']*'    # Quoted value (single quote)
+            )?
+        )*                 # Other attributes are repeated 0 or more times
+        \s+                # More than one whitespace
+        href=["'](\S+?)["']# href = $1 (double quote or single quote)
+    ''',
+    flags=re.VERBOSE | re.MULTILINE,
+)
+
 
 def transform_p_by_p_skipping_codeblocks(  # noqa: PLR0912, PLR0915
         markdown: str,
@@ -247,6 +290,9 @@ def rewrite_relative_urls(
     from urllib.parse import urlparse, urlunparse
 
     def rewrite_url(url: str) -> str:
+        if is_url(url):
+            return url
+
         scheme, netloc, path, params, query, fragment = urlparse(url)
 
         # absolute or mail
@@ -296,10 +342,18 @@ def rewrite_relative_urls(
             found_href_url_group_index_3,
             paragraph,
         )
-        return MARKDOWN_LINK_DEFINITION_REGEX.sub(
+        paragraph = MARKDOWN_LINK_DEFINITION_REGEX.sub(
             functools.partial(found_href, url_group_index=2),
             paragraph,
         )
+        paragraph = MARKDOWN_HTML_IMAGE_REGEX.sub(
+            functools.partial(found_href, url_group_index=1),
+            paragraph,
+        )
+        return MARKDOWN_HTML_ANCHOR_DEFINITION_REGEX.sub(
+            functools.partial(found_href, url_group_index=1),
+            paragraph,
+        )
 
     return transform_p_by_p_skipping_codeblocks(
         markdown,

{mkdocs_include_markdown_plugin-7.1.2.dist-info → mkdocs_include_markdown_plugin-7.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: mkdocs-include-markdown-plugin
-Version: 7.1.2
+Version: 7.1.3
 Summary: Mkdocs Markdown includer plugin.
 Project-URL: Source, https://github.com/mondeja/mkdocs-include-markdown-plugin
 Project-URL: Documentation, https://github.com/mondeja/mkdocs-include-markdown-plugin#documentation
@@ -9,7 +9,8 @@ Project-URL: Changelog, https://github.com/mondeja/mkdocs-include-markdown-plugi
 Author: Joe Rickerby
 Author-email: Álvaro Mondéjar Rubio <mondejar1994@gmail.com>
 Maintainer-email: Álvaro Mondéjar Rubio <mondejar1994@gmail.com>
-License: Apache-2.0
+License-Expression: Apache-2.0
+License-File: LICENSE
 Keywords: includer,markdown,mkdocs,plugin
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console

mkdocs_include_markdown_plugin-7.1.3.dist-info/RECORD

@@ -0,0 +1,15 @@
+mkdocs_include_markdown_plugin/__init__.py,sha256=ByOde15RQSHlZTmkepPSzIt0GzUIv_-GKORFDnxnOmc,193
+mkdocs_include_markdown_plugin/cache.py,sha256=t0vwBNrUURzUegoHA3eWBhbU8J4Dh9VTcDKF1fbYMYE,3819
+mkdocs_include_markdown_plugin/config.py,sha256=VX95U8-9gFzPUIBSTA8TSL4xOD49qTMSs8dhFiilGns,1091
+mkdocs_include_markdown_plugin/directive.py,sha256=8W7-73GdZSX-NIACRSGX55h3FD5EbfHRnXTxaMebgvE,10455
+mkdocs_include_markdown_plugin/event.py,sha256=LakZDvyyZ4gSZyuUpqT11aiMmRiDVjECH_RnODvlifA,24299
+mkdocs_include_markdown_plugin/files_watcher.py,sha256=hu-63u8syl00mXP59vP_iqD7T1R9iU9JjiZOHDV5fas,298
+mkdocs_include_markdown_plugin/logger.py,sha256=nl63G4IJSt5mEYHbObuh7BmmowSv-aa1l_v9I257570,230
+mkdocs_include_markdown_plugin/plugin.py,sha256=0muHIhmklC7v-QKWsAcAtZKhhZQ2olH6b28b3_3e4gI,3850
+mkdocs_include_markdown_plugin/process.py,sha256=SfNPW58737fz8dsUwD5CM-cevI4gC3AuUk3whJIYihQ,19745
+mkdocs_include_markdown_plugin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mkdocs_include_markdown_plugin-7.1.3.dist-info/METADATA,sha256=J-2SGDeVHNcQjuVdMIyRdt4wPIrVNOvoN0af_NHclmc,12770
+mkdocs_include_markdown_plugin-7.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mkdocs_include_markdown_plugin-7.1.3.dist-info/entry_points.txt,sha256=WEL5m7sw5ZMBwmdOs5S_9mGoZfLCaUDPkDKw7CUk16Q,96
+mkdocs_include_markdown_plugin-7.1.3.dist-info/licenses/LICENSE,sha256=qm1MNzU_lIANFB-1cBpD9hqdD_Htv3_Xr6hobt0IHq8,11365
+mkdocs_include_markdown_plugin-7.1.3.dist-info/RECORD,,

{mkdocs_include_markdown_plugin-7.1.2.dist-info → mkdocs_include_markdown_plugin-7.1.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

{mkdocs_include_markdown_plugin-7.1.2.dist-info → mkdocs_include_markdown_plugin-7.1.3.dist-info}/licenses/LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017-2024 Joe Rickerby and contributors
+   Copyright 2017-2025 Joe Rickerby and contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

mkdocs_include_markdown_plugin-7.1.2.dist-info/RECORD

@@ -1,15 +0,0 @@
-mkdocs_include_markdown_plugin/__init__.py,sha256=ByOde15RQSHlZTmkepPSzIt0GzUIv_-GKORFDnxnOmc,193
-mkdocs_include_markdown_plugin/cache.py,sha256=j4GWPEMOj8jVQrJRXryT-r3TNzWb3mFLE6FCROe_1MQ,3778
-mkdocs_include_markdown_plugin/config.py,sha256=VX95U8-9gFzPUIBSTA8TSL4xOD49qTMSs8dhFiilGns,1091
-mkdocs_include_markdown_plugin/directive.py,sha256=1OEA1XZKlYRvScOAP0gmaSROLmbWXTPbTJgPELk71yg,10455
-mkdocs_include_markdown_plugin/event.py,sha256=nT55KnM2gmzVKmlDS8SEBUDbOJ8TDXRNx0k_qhB5w4w,24507
-mkdocs_include_markdown_plugin/files_watcher.py,sha256=hu-63u8syl00mXP59vP_iqD7T1R9iU9JjiZOHDV5fas,298
-mkdocs_include_markdown_plugin/logger.py,sha256=nl63G4IJSt5mEYHbObuh7BmmowSv-aa1l_v9I257570,230
-mkdocs_include_markdown_plugin/plugin.py,sha256=0muHIhmklC7v-QKWsAcAtZKhhZQ2olH6b28b3_3e4gI,3850
-mkdocs_include_markdown_plugin/process.py,sha256=6mVGPDSMtnuUE5IF05GUwef0PYPUhI9G2FIX5nFHqcU,17779
-mkdocs_include_markdown_plugin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mkdocs_include_markdown_plugin-7.1.2.dist-info/METADATA,sha256=Y0FPqVd0VcmyctgO8jJK89QQxlBvGDg09oqwZPr_U30,12737
-mkdocs_include_markdown_plugin-7.1.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-mkdocs_include_markdown_plugin-7.1.2.dist-info/entry_points.txt,sha256=WEL5m7sw5ZMBwmdOs5S_9mGoZfLCaUDPkDKw7CUk16Q,96
-mkdocs_include_markdown_plugin-7.1.2.dist-info/licenses/LICENSE,sha256=OunyKlPxiuvLB3ENbo2nyV-OPndkwzyZ5Gzwei0ofbc,11365
-mkdocs_include_markdown_plugin-7.1.2.dist-info/RECORD,,