fix: regex for image and video

reuixiy · Oct 27, 2024 · 9a9827e · 9a9827e
1 parent c3e45ed
commit 9a9827e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/layouts/partials/utils/auto-detect-images.html b/layouts/partials/utils/auto-detect-images.html
@@ -3,8 +3,8 @@
 <!-- https://regex101.com/ -->
 {{- $imgs := slice -}}
 {{- if and .IsPage (in .Site.Params.mainSections .Section) -}}
-    {{- range (findRE `<img src="/?([^"]+)` .Content | uniq) -}}
-        {{- $url := replaceRE `<img src="/?([^"]+)` `$1` . -}}
+    {{- range (findRE `<img\s+[^>]*?src="/?([^"]+)` .Content | uniq) -}}
+        {{- $url := replaceRE `<img\s+[^>]*?src="/?([^"]+)` `$1` . -}}
         {{- $imgs = union $imgs (slice $url) -}}
     {{- end -}}
 {{- end -}}

diff --git a/layouts/partials/utils/content.html b/layouts/partials/utils/content.html
@@ -114,12 +114,12 @@
 <!-- Image Hosting -->
 {{- if and .Site.Params.enableImageHost (eq hugo.Environment "production") -}}
     {{- $hostURL := strings.TrimSuffix "/" .Site.Params.imageHostURL -}}
-    {{- $temps := findRE `<(img) src="/?([^":]+)` $Content | uniq -}}
+    {{- $temps := findRE `<(img)\s+[^>]*?src="/?([^":]+)` $Content | uniq -}}
     {{- with $temps -}}
         {{- range . -}}
-            {{- $url := replaceRE `<(img) src="/?([^":]+)` `$2` . -}}
+            {{- $url := replaceRE `<(img)\s+[^>]*?src="/?([^":]+)` `$2` . -}}
             {{- if ne (substr $url 0 4) "http" -}}
-                {{- $prefix := replaceRE `(<(img) src=")/?([^":]+)` `$1` . -}}
+                {{- $prefix := replaceRE `(<(img)\s+[^>]*?src=")/?([^":]+)` `$1` . -}}
                 {{- $replacement := (printf `%s%s/%s` $prefix $hostURL $url) -}}
                 {{- $Content = replace $Content . $replacement -}}
             {{- end -}}
@@ -130,12 +130,12 @@
 <!-- Video Hosting -->
 {{- if and .Site.Params.enableVideoHost (eq hugo.Environment "production") -}}
     {{- $hostURL := strings.TrimSuffix "/" .Site.Params.videoHostURL -}}
-    {{- $temps := findRE `<(video) src="/?([^":]+)` $Content | uniq -}}
+    {{- $temps := findRE `<(video)\s+[^>]*?src="/?([^":]+)` $Content | uniq -}}
     {{- with $temps -}}
         {{- range . -}}
-            {{- $url := replaceRE `<(video) src="/?([^":]+)` `$2` . -}}
+            {{- $url := replaceRE `<(video)\s+[^>]*?src="/?([^":]+)` `$2` . -}}
             {{- if ne (substr $url 0 4) "http" -}}
-                {{- $prefix := replaceRE `(<(video) src=")/?([^":]+)` `$1` . -}}
+                {{- $prefix := replaceRE `(<(video)\s+[^>]*?src=")/?([^":]+)` `$1` . -}}
                 {{- $replacement := (printf `%s%s/%s` $prefix $hostURL $url) -}}
                 {{- $Content = replace $Content . $replacement -}}
             {{- end -}}