Fix regex bug: quote issue and empty alt issue (#14 #19)

Author: blueswen

CHANGELOG

@@ -1,3 +1,7 @@
+mkdocs-glightbox-0.3.4 (2023-04-25)
+
+    * Fixed regex bug: quote issue and empty alt issue (#14 #19)
+
 mkdocs-glightbox-0.3.3 (2023-04-20)
 
     * Refactored processing logic with regex (#14)

mkdocs_glightbox/plugin.py

@@ -114,60 +114,66 @@ def on_page_content(self, html, page, config, **kwargs):
 
     def wrap_img_with_anchor(self, match, plugin_config, skip_class, meta):
         """Wrap image tags with anchor tags"""
-        a_pattern = re.compile(r"<a(?P<attr>.*?)>")
-        if a_pattern.match(match.group(0)):
-            return match.group(0)
-
-        img_tag = match.group(0)
-        img_attr = match.group("attr")
-        classes = re.findall(r'class="([^"]+)"', img_attr)
-        classes = [c for match in classes for c in match.split()]
-
-        if set(skip_class) & set(classes):
-            return img_tag
-
-        src = re.search(r"src=[\"\']([^\"\']+)", img_attr).group(1)
-        a_tag = f'<a class="glightbox" href="{src}" data-type="image"'
-        # setting data-width and data-height with plugin options
-        for k, v in plugin_config.items():
-            a_tag += f' data-{k}="{v}"'
-        slide_options = [
-            "title",
-            "description",
-            "caption-position",
-            "gallery",
-        ]
-        for option in slide_options:
-            attr = f"data-{option}"
-            if attr == "data-title":
-                val = re.search(r"data-title=[\"\']([^\"\']+)", img_attr)
-                if self.config["auto_caption"] or (
-                    "glightbox.auto_caption" in meta
-                    and meta.get("glightbox.auto_caption", False) is True
-                ):
-                    val = (
-                        val.group(1)
-                        if val
-                        else re.search(r"alt=[\"\']([^\"\']+)", img_attr).group(1)
-                    )
+        try:
+            a_pattern = re.compile(r"<a(?P<attr>.*?)>")
+            if a_pattern.match(match.group(0)):
+                return match.group(0)
+
+            img_tag = match.group(0)
+            img_attr = match.group("attr")
+            classes = re.findall(r'class="([^"]+)"', img_attr)
+            classes = [c for match in classes for c in match.split()]
+
+            if set(skip_class) & set(classes):
+                return img_tag
+
+            src = re.search(r"src=[\"\']([^\"\']+)", img_attr).group(1)
+            a_tag = f'<a class="glightbox" href="{src}" data-type="image"'
+            # setting data-width and data-height with plugin options
+            for k, v in plugin_config.items():
+                a_tag += f' data-{k}="{v}"'
+            slide_options = [
+                "title",
+                "description",
+                "caption-position",
+                "gallery",
+            ]
+            for option in slide_options:
+                attr = f"data-{option}"
+                if attr == "data-title":
+                    val = re.search(r"data-title=[\"]([^\"]+)", img_attr)
+                    if self.config["auto_caption"] or (
+                        "glightbox.auto_caption" in meta
+                        and meta.get("glightbox.auto_caption", False) is True
+                    ):
+                        if val:
+                            val = val.group(1)
+                        else:
+                            val = re.search(r"alt=[\"]([^\"]+)", img_attr)
+                            val = val.group(1) if val else ""
+                    else:
+                        val = val.group(1) if val else ""
+                elif attr == "data-caption-position":
+                    val = re.search(r"data-caption-position=[\"]([^\"]+)", img_attr)
+                    val = val.group(1) if val else self.config["caption_position"]
                 else:
+                    val = re.search(f'{attr}=["]([^"]+)', img_attr)
                     val = val.group(1) if val else ""
-            elif attr == "data-caption-position":
-                val = re.search(r"data-caption-position=[\"\']([^\"\']+)", img_attr)
-                val = val.group(1) if val else self.config["caption_position"]
-            else:
-                val = re.search(f"{attr}=[\"']([^\"']+)", img_attr)
-                val = val.group(1) if val else ""
-
-            # skip val is empty
-            if val != "":
-                # convert data-caption-position to data-desc-position
-                if attr == "data-caption-position":
-                    a_tag += f' data-desc-position="{val}"'
-                else:
-                    a_tag += f' {attr}="{val}"'
-        a_tag += f">{img_tag}</a>"
-        return a_tag
+
+                # skip val is empty
+                if val != "":
+                    # convert data-caption-position to data-desc-position
+                    if attr == "data-caption-position":
+                        a_tag += f' data-desc-position="{val}"'
+                    else:
+                        a_tag += f' {attr}="{val}"'
+            a_tag += f">{img_tag}</a>"
+            return a_tag
+        except Exception as e:
+            log.warning(
+                f"Error in wrapping img tag with anchor tag: {e} {match.group(0)}"
+            )
+            return match.group(0)
 
     def on_post_build(self, config, **kwargs):
         """Copy glightbox"s css and js files to assets directory"""

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="mkdocs-glightbox",
-    version="0.3.3",
+    version="0.3.4",
     author="Blueswen",
     author_email="blueswen.tw@gmail.com",
     url="https://blueswen.github.io/mkdocs-glightbox",