Changeset 6428 for trunk/wp-admin/import/wordpress.php

Timestamp:

12/20/2007 05:31:39 AM (19 years ago)

Author:

ryan

Message:

Attachment and post meta import improvements from tellyworth. fixes #5497

File:

• trunk/wp-admin/import/wordpress.php (modified) (9 diffs)

trunk/wp-admin/import/wordpress.php

@@ -367 +367 @@
                                 $this->post_ids_processed[intval($post_ID)] = intval($post_id);
                         }
-
+                        
                         // Add categories.
                         if (count($categories) > 0) {
@@ -439 +439 @@
                         $value = $this->get_tag( $p, 'wp:meta_value' );
                         $value = stripslashes($value); // add_post_meta() will escape.
-                        add_post_meta( $post_id, $key, $value );
+                        
+                        $this->process_post_meta($post_id, $key, $value);
+
                 } }
                 
+                do_action('import_post_added', $post_id);
                 print "</li>\n";
+        }
+        
+        function process_post_meta($post_id, $key, $value) {
+                // the filter can return false to skip a particular metadata key
+                $_key = apply_filters('import_post_meta_key', $key);
+                if ( $_key ) {
+                        add_post_meta( $post_id, $_key, $value );
+                        do_action('import_post_meta', $post_id, $_key, $value);
+                }
         }
         
@@ -456 +468 @@
                                 print '('.size_format(filesize($upload['file'])).')';
                         }
+                        
+                        if ( $info = wp_check_filetype($upload['file']) ) {
+                                $postdata['post_mime_type'] = $info['type'];
+                        }
+                        else {
+                                print __('Invalid file type');
+                                return;
+                        }
                                 
                         $postdata['guid'] = $upload['url'];
@@ -462 +482 @@
                         $post_id = wp_insert_attachment($postdata, $upload['file']);
                         wp_update_attachment_metadata( $post_id, wp_generate_attachment_metadata( $post_id, $upload['file'] ) );
+                        
+                        // remap the thumbnail url.  this isn't perfect because we're just guessing the original url.
+                        if ( preg_match('@^image/@', $info['type']) && $thumb_url = wp_get_attachment_thumb_url($post_id) ) {
+                                $parts = pathinfo($remote_url);
+                                $ext = $parts['extension'];
+                                $name = basename($parts['basename'], ".{$ext}");
+                                $this->url_remap[$parts['dirname'] . '/' . $name . '.thumbnail.' . $ext] = $thumb_url;
+                        }
+                        
                         return $post_id;
                 }
@@ -500 +529 @@
                 
         }
+
+        // sort by strlen, longest string first
+        function cmpr_strlen($a, $b) {
+                return strlen($b) - strlen($a);
+        }
         
         // update url references in post bodies to point to the new local files
@@ -505 +539 @@
                 
                 // make sure we do the longest urls first, in case one is a substring of another
-                function cmpr_strlen($a, $b) {
-                        return strlen($b) - strlen($a);
-                }
-                uksort($this->url_remap, 'cmpr_strlen');
+                uksort($this->url_remap, array(&$this, 'cmpr_strlen'));
                                 
                 global $wpdb;
                 foreach ($this->url_remap as $from_url => $to_url) {
+                        // remap urls in post_content
                         $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->posts} SET post_content = REPLACE(post_content, '%s', '%s')", $from_url, $to_url) );
+                        // remap enclosure urls
+                        $result = $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->postmeta} SET meta_value = REPLACE(meta_value, '%s', '%s') WHERE meta_key='enclosure'", $from_url, $to_url) );
                 }
         }
@@ -528 +562 @@
                 }
         }
+        
+        function is_valid_meta_key($key) {
+                // skip _wp_attached_file metadata since we'll regenerate it from scratch
+                if ( $key == '_wp_attached_file' )
+                        return false;
+                return $key;
+        }
 
         function import($id, $fetch_attachments = false) {
@@ -533 +574 @@
                 $this->fetch_attachments = (bool) $fetch_attachments;
 
+                add_filter('import_post_meta_key', array($this, 'is_valid_meta_key'));
                 $file = get_attached_file($this->id);
                 $this->import_file($file);
@@ -548 +590 @@
                 $this->backfill_parents();
                 $this->backfill_attachment_urls();
+                
+                // clear the caches after backfilling
+                foreach ($this->post_ids_processed as $post_id)
+                        clean_post_cache($post_id);
+                
                 wp_defer_term_counting(false);
                 if ( is_wp_error( $result ) )