Changeset 3066506

Timestamp:

04/08/2024 03:14:51 AM (23 months ago)

Author:

beleaf

Message:

Release 1.6.0

Location:

lazy-embed

Files:

• tags/1.5.1 (added)
• tags/1.5.1/index.php (added)
• tags/1.5.1/lazy-embed.php (added)
• tags/1.5.1/licence.txt (added)
• tags/1.5.1/partials (added)
• tags/1.5.1/partials/embed-styles.css (added)
• tags/1.5.1/partials/play.svg (added)
• tags/1.5.1/readme.txt (added)
• trunk/lazy-embed.php (modified) (9 diffs)
• trunk/readme.txt (modified) (2 diffs)

lazy-embed/trunk/lazy-embed.php

@@ -7 +7 @@
  * Plugin URI: https://bitbucket.org/beleaf-au/lazy-embed/
  * Description: Improves the performance and reduces the emissions of your website by only loading embeds (youtube, vimeo, etc) when they are clicked.
- * Version: 1.5.1
+ * Version: 1.6.0
  * Requires PHP: 7.1
  * Requires at least: 6.2.0
@@ -31 +31 @@
         }
 
-        public static function alterBlockIframeClass($html, $block): string
+        public static function alterBlockIframeClass(string $html, array $block): string
         {
             if ($block['blockName'] === 'core/embed' || $block['blockName'] === 'core/video') {
@@ -73 +73 @@
         private static function modifyVideos(string $html): string
         {
-            $html = preg_replace_callback('/<iframe[^>]*>/i', [__CLASS__, 'iframeReplaceCallback'], $html);
-            $html = preg_replace_callback('/<video[^>]*>/i', [__CLASS__, 'videoReplaceCallback'], $html);
-
-            return $html;
-        }
-
-        private static function iframeReplaceCallback(array $match): string
-        {
-            $html = $match[0];
-
             $processor = new \WP_HTML_Tag_Processor($html);
-            $processor->next_tag('iframe');
-
+
+            while ($processor->next_tag()) {
+                if ($processor->get_tag() === 'IFRAME') {
+                    $processor = self::iframeReplaceCallback($processor);
+                } elseif ($processor->get_tag() === 'VIDEO') {
+                    $processor = self::videoReplaceCallback($processor);
+                }
+            }
+
+            return $processor->get_updated_html();
+        }
+
+        private static function iframeReplaceCallback(\WP_HTML_Tag_Processor $processor): \WP_HTML_Tag_Processor
+        {
             // Dont modify the iframe if it is ignored
             if (self::ignoredVideo($processor)) {
-                return $html;
-            }
+                return $processor;
+            }
+
+            // Extract the video src
+            $src = $processor->get_attribute('src') ?? '';
 
             // Extract the provider
-            $provider = self::extractProvider($processor->get_attribute('src'));
+            $provider = self::extractProvider($src);
 
             // Extract an image
-            $imageSrc = self::getImage($processor, $provider, $html);
+            $imageSrc = self::getImage($processor, $provider);
 
             // Dont modify the iframe if there is no image
             if ($imageSrc === '') {
-                return $html;
+                return $processor;
             }
 
             // This will normally add things like autoplay, mute, and cleanup the embed
-            $iframeSrc = self::modifyIframeSrc($processor->get_attribute('src'), $provider, $html);
+            $iframeSrc = self::modifyIframeSrc($src, $provider);
 
             // An empty string for iframeSrc is another nice way to bail out
             if ($iframeSrc === '') {
-                return $html;
+                return $processor;
+            }
+
+            $srcdoc = self::srcdoc($iframeSrc, $imageSrc, $processor);
+
+            if ($srcdoc === '') {
+                return $processor;
             }
 
@@ -113 +124 @@
             $processor->set_attribute('src', $iframeSrc);
 
-            $srcdoc = self::srcdoc($iframeSrc, $imageSrc, $html);
-
-            if ($srcdoc === '') {
-                return $html;
-            }
-
             // Add the srcdoc attribute which is the magic sauce
             $processor->set_attribute('srcdoc', $srcdoc);
 
-            return $processor->get_updated_html();
-        }
-
-        private static function videoReplaceCallback($match): string
-        {
-            $html = $match[0];
-
-            $processor = new \WP_HTML_Tag_Processor($html);
-            $processor->next_tag('video');
-
+            return $processor;
+        }
+
+        private static function videoReplaceCallback(\WP_HTML_Tag_Processor $processor): \WP_HTML_Tag_Processor
+        {
             // Dont modify the iframe if it is ignored
             if (self::ignoredVideo($processor)) {
-                return $html;
-            }
-
-            if (str_contains($html, 'preload="')) {
-                if (str_contains($html, 'preload="auto"')) {
-                    $html = str_replace('preload="auto"', 'preload="none"', $html);
-                } elseif (str_contains($html, 'preload="metadata"')) {
-                    $html = str_replace('preload="metadata"', 'preload="none"', $html);
-                }
-            } else {
-                $html = str_replace('<video', '<video preload="none"', $html);
-            }
-
-            return $html;
-        }
-
-        private static function getImage(\WP_HTML_Tag_Processor $processor, string $provider, string $html): string
-        {
-            $src = $processor->get_attribute('data-image') ?? '';
-
-            if ($src === '') {
-                $src = self::imageSrcFromSrc(
-                    $processor->get_attribute('src'),
+                return $processor;
+            }
+
+            $processor->set_attribute('preload', 'none');
+
+            return $processor;
+        }
+
+        private static function getImage(\WP_HTML_Tag_Processor $processor, string $provider): string
+        {
+            $imageURL = $processor->get_attribute('data-image') ?? '';
+
+            if ($imageURL === '') {
+                $imageURL = self::imageSrcFromSrc(
+                    $processor->get_attribute('src') ?? '',
                     $provider
                 );
@@ -162 +154 @@
 
             // Allow for modification of the image src
-            $src = apply_filters('lazy-embed/imagesrc', $src, $html, $provider);
-
-            return $src;
+            $imageURL = apply_filters('lazy-embed/imagesrc', $imageURL, $provider);
+
+            return $imageURL;
         }
 
@@ -179 +171 @@
         }
 
-        private static function srcdoc(string $iframeSrc, string $imageSrc, string $html): string
+        private static function srcdoc(string $iframeSrc, string $imageSrc, \WP_HTML_Tag_Processor $processor): string
         {
             // Pull content for the srcdoc
-            $play = apply_filters('lazy-embed/partial/play', self::partialContent('play.svg'), $html);
-            $css = apply_filters('lazy-embed/partial/css', self::partialContent('embed-styles.css'), $html);
+            $play = apply_filters('lazy-embed/partial/play', self::partialContent('play.svg'), $processor);
+            $css = apply_filters('lazy-embed/partial/css', self::partialContent('embed-styles.css'), $processor);
 
             // Construct the srcdoc
@@ -192 +184 @@
             $srcdoc .= '</a>';
 
-            return apply_filters('lazy-embed/srcdoc', $srcdoc, $iframeSrc, $imageSrc);
+            return apply_filters('lazy-embed/srcdoc', $srcdoc, $iframeSrc, $imageSrc, $processor);
         }
 
@@ -211 +203 @@
         }
 
-        private static function modifyIframeSrc(string $src, string $provider, string $html): string
+        private static function modifyIframeSrc(string $src, string $provider): string
         {
             if ($provider === 'vimeo') {
@@ -233 +225 @@
 
             // Allow for modification of the iframesrc
-            $src = apply_filters('lazy-embed/iframesrc', $src, $html, $provider);
+            $src = apply_filters('lazy-embed/iframesrc', $src, $provider);
 
             return $src;

lazy-embed/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 6.2.0
 Tested up to: 6.4
-Stable tag: 1.5.1
+Stable tag: 1.6.0
 Requires PHP: 5.6
 License: GPLv2 or later
@@ -26 +26 @@
 
 == Changelog ==
+
+= 1.6.0 =
+Feat: Replace regular expressions with WP_HTML_Tag_Processor
+Fix: A missing src tag on an iframe resulted in a fatal error. This nolonger happens. Thanks Dan
 
 = 1.5.1 - 18/03/2024 =