Changeset 3418466

Timestamp:

12/12/2025 06:03:16 PM (2 months ago)

Author:

pipdig

Message:

Optimise image import process

Location:

blogger-importer-extended/trunk

Files:

• bootstrap.php (modified) (10 diffs)
• redirects.php (modified) (3 diffs)
• settings.php (modified) (2 diffs)
• uninstall.php (modified) (2 diffs)

blogger-importer-extended/trunk/bootstrap.php

@@ -3 +3 @@
 Plugin Name: Blogger Importer Extended
 Plugin URI: https://wordpress.org/plugins/blogger-importer-extended/
-Description: The only plugin you need to move from Blogger to WordPress. Import all your content and setup 301 redirects automatically.
+Description: The only plugin you need to move from Blogger to WordPress. Import all content and setup 301 redirects automatically.
 Author: pipdig
 Version: 3.2.7
@@ -34 +34 @@
 define('BIE_PATH', plugin_dir_url(__FILE__));
 
- // Wait time between import batches
+// Wait time between import batches
 if (!defined('BIE_WAIT_TIME')) {
     define('BIE_WAIT_TIME', 1500);
+}
+
+// Import the first 15 images from post content to avoid timeout
+if (!defined('BIE_IMAGE_IMPORT_LIMIT')) {
+    define('BIE_IMAGE_IMPORT_LIMIT', 15);
 }
 
@@ -499 +504 @@
             $.post(ajaxurl, data, function(response) {
                 
-                //console.log(response);
+                console.log(response);
                 
                 if (!checkIsJsonString(response)) {
@@ -798 +803 @@
         foreach ($response->items as $item) {
             
-            $exists = (int) $wpdb->get_var( $wpdb->prepare('SELECT post_id FROM '.$wpdb->prefix.'bie_redirects WHERE blogger_post_id = %s', $item->id) );
+            $exists = (int) $wpdb->get_var( $wpdb->prepare("SELECT post_id FROM {$wpdb->prefix}bie_redirects WHERE blogger_post_id = %s LIMIT 1", $item->id) );
             
             if ($exists !== 0) {
@@ -900 +905 @@
                 foreach ($response->items as $item) {
                     
-                    $exists = (int) $wpdb->get_var( $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_value = %s AND meta_key = 'blogger_post_id'", $item->id) );
+                    $exists = (int) $wpdb->get_var( $wpdb->prepare("SELECT post_id FROM {$wpdb->postmeta} WHERE meta_value = %s AND meta_key = 'blogger_post_id' LIMIT 1", $item->id) );
                     
                     if ($exists !== 0) {
@@ -1043 +1048 @@
         
         $query_args['page_query'] = $response->nextPageToken; // request next page, keep other args
-                
+        
         $response = pipdig_blogger_get_response($query_args);
         
@@ -1145 +1150 @@
         }
         
+        $images = array_unique($images); // remove dupes
+        
         if (!empty($images)) {
             
-            $x = 0;
-            
-            foreach ($images as $found_image) {
-                
-                // skip if returns 404
-                $headers = get_headers($found_image, 1);
-                if (isset($headers[0]) && strpos($headers[0], '404') !== false) {
-                    continue;
+            foreach ($images as $i => $found_image) {
+                
+                if ($i >= BIE_IMAGE_IMPORT_LIMIT) {
+                    break;
                 }
                 
                 $found_image_original = $found_image; // keep original for later, we need it for str_replace in content
                 
-                /*
-                preg_match('/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $found_image, $matches);
-                
-                if (empty($matches[0])) {
-                    continue;
-                }
-                */
-                
-                // check mime
-                $file_size = getimagesize($found_image);
-                
-                $lets_go = false;
-                
-                if (!empty($file_size['mime'])) {
-                    
-                    $mime = strtolower($file_size['mime']);
-                    
-                    $allowed_types = ['jpg', 'jpeg', 'jpe', 'png', 'gif', 'webp'];
-                    
-                    foreach ($allowed_types as $allowed_type) {
-                        
-                        if (strpos($mime, $allowed_type) !== false) {
-                            $file_ext = '.'.$allowed_type;
-                            $lets_go = true;
-                            break;
-                        }
-                        
-                    }
-                    
-                }
-                
-                if (!$lets_go) {
-                    continue;
-                }
-                
                 // urldecode twice to better rename imported Chinese characters. See support ticket #47809 for more info
-                $name = urldecode(urldecode(wp_basename($found_image)));
-                
-                // Are Chinese characters in $name?
-                if (preg_match("/\p{Han}+/u", $name)) {
-                    
-                    // Chinese chars found, so urldecode twice for better filename
-                    $found_image = urldecode(urldecode($found_image)); // needed to overcome long filenames.
-                    
-                } else {
-                    // No Chinese characters found, so revert back to standard filename.
-                    // TODO - This might not be necessary if it is safe to double urldecode any filenames. Needs more testing to confirm.
-                    $name = wp_basename($found_image);
-                }
+                $name = wp_basename(urldecode(urldecode($found_image)));
+                $found_image = urldecode(urldecode($found_image));
                 
                 if (empty($name)) {
                     continue;
                 }
+                
+                $tmp = download_url($found_image);
+                if (is_wp_error($tmp)) {
+                    continue;
+                }
+
+                $info = getimagesize($tmp);
+                if (!$info || empty($info['mime'])) {
+                    @unlink($tmp);
+                    continue;
+                }
+                
+                $ext_map = [
+                    'image/jpeg' => '.jpg',
+                    'image/png'  => '.png',
+                    'image/gif'  => '.gif',
+                    'image/webp' => '.webp',
+                ];
+
+                $file_ext = isset($ext_map[$info['mime']]) ? $ext_map[$info['mime']] : '.jpg';
                 
                 // Some filesystems can't handle long filenames. So fallback to post slug.
@@ -1230 +1207 @@
                 $file = array(
                     'name' => $name,
-                    'tmp_name' => download_url($found_image),
+                    'tmp_name' => $tmp,
                 );
                 
-                if (is_wp_error($file['tmp_name'])) {
-                    @unlink($file['tmp_name']);
-                    continue;
-                }
-                
-                // remove extension if it's ther. E.g. rtim .jpeg first, then re-add it after. Needed in case there isn't an extension already set
-                $filename = rtrim($file['name'], $file_ext).$file_ext;
+                // remove extension if it's there. E.g. rtim .jpeg first, then re-add it after. Needed in case there isn't an extension already set
+                $filename = pathinfo($file['name'], PATHINFO_FILENAME).$file_ext;
                 
                 $image_id = media_handle_sideload($file, $post_id, $filename, array('post_date' => $post_date, 'post_author' => $author_id));
@@ -1260 +1232 @@
                     
                     // if this is the first image, include it in the return as the featured_image_id
-                    if ($x === 0) {
+                    if ($i === 0) {
                         
                         $featured_image_id = $image_id;
@@ -1271 +1243 @@
                     }
                     
-                    $x++;
-                    
                 }
                 

blogger-importer-extended/trunk/redirects.php

@@ -98 +98 @@
         
     }
-        
+    
     if (!$redirect) {
         if (isset($options['redirect_404s']) && $options['redirect_404s']) {
@@ -195 +195 @@
     jQuery(document).ready(function($) {
         
-        var hrefBlogger301Redirect = $('tr[data-slug="blogger-301-redirect"] .deactivate a').attr('href');
+        let hrefBlogger301Redirect = $('tr[data-slug="blogger-301-redirect"] .deactivate a').attr('href');
         if (hrefBlogger301Redirect) {
             $('#showDeactivateBlogger301RedirectText').show();
@@ -201 +201 @@
         $('#deactivateBlogger301RedirectPlugin').attr('href', hrefBlogger301Redirect);
         
-        var hrefBloggerToWordPress = $('tr[data-slug="blogger-to-wordpress-redirection"] .deactivate a').attr('href');
+        let hrefBloggerToWordPress = $('tr[data-slug="blogger-to-wordpress-redirection"] .deactivate a').attr('href');
         if (hrefBloggerToWordPress) {
             $('#showDeactivateBloggerToWordPressText').show();
         }
         $('#deactivateBloggerToWordPress').attr('href', hrefBloggerToWordPress);
+        
     });
     </script>

blogger-importer-extended/trunk/settings.php

@@ -31 +31 @@
     #bieNoticeOk {
         display: block !important;
-        /* max-width: 691px; */
     }
     .card {
@@ -350 +349 @@
     
     die;
+    
 });

blogger-importer-extended/trunk/uninstall.php

@@ -10 +10 @@
 
 global $wpdb;
-$results = $wpdb->get_results("SELECT option_name FROM $wpdb->options WHERE option_name LIKE 'bie_page_token_%'");
+$results = $wpdb->get_results("SELECT option_name FROM {$wpdb->options} WHERE option_name LIKE 'bie_page_token_%'");
 foreach ($results as $result) {
     delete_option($result->option_name);
@@ -16 +16 @@
 
 /*
-// Do we want to delete the redirects on uninstall?
-// Todo - add option to settings page
+// Do we want to delete the redirects on uninstall? Maybe not
 global $wpdb;
 $table_name = $wpdb->prefix.'bie_redirects';