<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[2188] 2013/frederickding/importer/trunk: Properly report status of post/attachment/menu items with total; fixes #341.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://gsoc.trac.wordpress.org/changeset/2188">2188</a></dd>
<dt>Author</dt> <dd>frederick.ding</dd>
<dt>Date</dt> <dd>2013-08-06 04:19:08 +0000 (Tue, 06 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly report status of post/attachment/menu items with total; fixes <a href="http://gsoc.trac.wordpress.org/ticket/341">#341</a>.
- Sum of `processed_posts` and `processed_menu_items` is the accurate number of items done
- `count()` of `posts` is the accurate total; now reported in the format `%d of %d`</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013frederickdingimportertrunkclasswordpressimporterphp">2013/frederickding/importer/trunk/class-wordpress-importer.php</a></li>
<li><a href="#2013frederickdingimportertrunkreadmetxt">2013/frederickding/importer/trunk/readme.txt</a></li>
<li><a href="#2013frederickdingimportertrunkwordpressimporterphp">2013/frederickding/importer/trunk/wordpress-importer.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013frederickdingimportertrunkclasswordpressimporterphp"></a>
<div class="modfile"><h4>Modified: 2013/frederickding/importer/trunk/class-wordpress-importer.php (2187 => 2188)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/frederickding/importer/trunk/class-wordpress-importer.php 2013-08-06 03:42:16 UTC (rev 2187)
+++ 2013/frederickding/importer/trunk/class-wordpress-importer.php 2013-08-06 04:19:08 UTC (rev 2188)
</span><span class="lines">@@ -914,20 +914,16 @@
</span><span class="cx"> * are imported for the last of the above.
</span><span class="cx"> */
</span><span class="cx"> protected function process_posts() {
</span><del>- if($this->get_param('filtered_wp_import_posts', false) === false) {
</del><ins>+ if ( $this->get_param( 'filtered_wp_import_posts', false ) === false ) {
</ins><span class="cx"> // only filter once!
</span><span class="cx"> $this->posts = apply_filters( 'wp_import_posts', $this->posts );
</span><del>- $this->set_param('filtered_wp_import_posts', true);
</del><ins>+ $this->set_param( 'filtered_wp_import_posts', true );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // use an iterator object with which we can track state
</span><span class="cx"> $iterator = new ArrayIterator( $this->posts );
</span><del>- $skip = $this->get_param( 'process_posts_iterator', 0 );
- if ( $skip )
- $iterator->seek( $skip );
</del><span class="cx">
</span><span class="cx"> foreach ( $iterator as $post ) {
</span><del>- $skip ++;
</del><span class="cx"> $post = apply_filters( 'wp_import_post_data_raw', $post );
</span><span class="cx"> if ( ! post_type_exists( $post['post_type'] ) ) {
</span><span class="cx"> $error_data = array(
</span><span class="lines">@@ -946,6 +942,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // skip already-processed items
</ins><span class="cx"> if ( isset( $this->processed_posts[$post['post_id']] ) &&
</span><span class="cx"> ! empty( $post['post_id'] ) )
</span><span class="cx"> continue;
</span><span class="lines">@@ -1223,17 +1220,15 @@
</span><span class="cx"> break;
</span><span class="cx"> } // foreach
</span><span class="cx">
</span><del>- // only unset after all posts have gone through the foreach
</del><ins>+ // only advance after all posts have gone through the foreach
</ins><span class="cx"> if(! $iterator->valid()) {
</span><span class="cx"> // done
</span><del>- $this->unset_param('process_posts_iterator');
</del><ins>+ $this->set_param( 'count_posts', count( $this->posts ) );
</ins><span class="cx"> unset( $this->posts );
</span><span class="cx"> $this->advance();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // save the state of our iterator
- $this->set_param('process_posts_iterator', $skip);
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1316,14 +1311,10 @@
</span><span class="cx">
</span><span class="cx"> // use an iterator object with which we can track state
</span><span class="cx"> $iterator = new ArrayIterator( $this->processed_url_remap );
</span><del>- $skip = $this->get_param( 'process_urls_iterator', 0 );
- if ( $skip )
- $iterator->seek( $skip );
</del><span class="cx">
</span><span class="cx"> // make sure we do the longest urls first, in case one is a
</span><span class="cx"> // substring of another
</span><span class="cx"> foreach ( $iterator as $from_url => $to_url ) {
</span><del>- $skip ++;
</del><span class="cx"> // remap urls in post_content
</span><span class="cx"> $wpdb->query(
</span><span class="cx"> $wpdb->prepare(
</span><span class="lines">@@ -1335,6 +1326,9 @@
</span><span class="cx"> "UPDATE {$wpdb->postmeta} SET meta_value = REPLACE(meta_value, %s, %s) WHERE meta_key='enclosure'",
</span><span class="cx"> $from_url, $to_url ) );
</span><span class="cx">
</span><ins>+ // unset this key so we don't do it again next time
+ unset( $this->processed_url_remap[$from_url] );
+
</ins><span class="cx"> // stop execution if we've reached the end of this cron run's
</span><span class="cx"> // limit
</span><span class="cx"> if ( ! $this->have_time() )
</span><span class="lines">@@ -1344,13 +1338,10 @@
</span><span class="cx"> // only unset after all posts have gone through the foreach
</span><span class="cx"> if ( ! $iterator->valid() ) {
</span><span class="cx"> // done
</span><del>- $this->unset_param( 'process_urls_iterator' );
</del><span class="cx"> $this->advance();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // save the state of our iterator
- $this->set_param( 'process_urls_iterator', $skip );
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1660,7 +1651,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function count( $variable ) {
</span><del>- if ( property_exists( $this, $variable ) )
</del><ins>+ if ( $this->get_param( 'count_' . $variable, - 1 ) !== - 1 )
+ return $this->get_param( 'count_' . $variable );
+ elseif ( property_exists( $this, $variable ) )
</ins><span class="cx"> return count( $this->$variable );
</span><span class="cx"> return - 1;
</span><span class="cx"> }
</span></span></pre></div>
<a id="2013frederickdingimportertrunkreadmetxt"></a>
<div class="modfile"><h4>Modified: 2013/frederickding/importer/trunk/readme.txt (2187 => 2188)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/frederickding/importer/trunk/readme.txt 2013-08-06 03:42:16 UTC (rev 2187)
+++ 2013/frederickding/importer/trunk/readme.txt 2013-08-06 04:19:08 UTC (rev 2188)
</span><span class="lines">@@ -39,6 +39,10 @@
</span><span class="cx">
</span><span class="cx"> == Changelog ==
</span><span class="cx">
</span><ins>+= 1.0.0 =
+* Import is executed as cron jobs on a per-minute schedule
+* Progress is shown during the import process, especially when it takes more than 1 cron cycle to complete
+
</ins><span class="cx"> = 0.6 =
</span><span class="cx"> * Support for WXR 1.2 and multiple CDATA sections
</span><span class="cx"> * Post aren't duplicates if their post_type's are different
</span></span></pre></div>
<a id="2013frederickdingimportertrunkwordpressimporterphp"></a>
<div class="modfile"><h4>Modified: 2013/frederickding/importer/trunk/wordpress-importer.php (2187 => 2188)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/frederickding/importer/trunk/wordpress-importer.php 2013-08-06 03:42:16 UTC (rev 2187)
+++ 2013/frederickding/importer/trunk/wordpress-importer.php 2013-08-06 04:19:08 UTC (rev 2188)
</span><span class="lines">@@ -337,10 +337,12 @@
</span><span class="cx"> // from the options, we SHOULD be able to query it for status
</span><span class="cx"> echo '<h3>Import Status</h3>';
</span><span class="cx"> if ( ! is_wp_error( $this->importer->get_step() )) :
</span><del>- if ( 'finish' != $this->importer->get_step() )
</del><ins>+ if ( 'finish' != $this->importer->get_step() ) {
</ins><span class="cx"> echo '<p>' . __(
</span><span class="cx"> 'The importer is now processing the data you have selected for import. It will execute tasks in the background; you can monitor the status by the refresh button below. The process may take a few minutes.',
</span><span class="cx"> 'wordpress-importer' ) . '</p>';
</span><ins>+ $this->status_buttons();
+ }
</ins><span class="cx"> printf(
</span><span class="cx"> '<p><strong>' .
</span><span class="cx"> __( 'Current step: %s', 'wordpress-importer' ) .
</span><span class="lines">@@ -348,15 +350,20 @@
</span><span class="cx"> ?>
</span><span class="cx"> <dl>
</span><span class="cx"> <dt>Authors imported and mapped:</dt>
</span><del>- <dd><?php printf('%d', $this->importer->count('processed_author_mappings')); ?></dd>
</del><ins>+ <dd><?php printf( '%d', $this->importer->count( 'processed_author_mappings' ) ); ?></dd>
</ins><span class="cx"> <dt>Categories, tags, and terms imported:</dt>
</span><del>- <dd><?php printf('%d', $this->importer->count('processed_terms')); ?></dd>
</del><ins>+ <dd><?php printf( '%d', $this->importer->count( 'processed_terms' ) ); ?></dd>
</ins><span class="cx"> <dt>Posts, attachments, menu items, and custom post types imported:</dt>
</span><del>- <dd><?php printf('%d', $this->importer->count('processed_posts')); ?></dd>
-<?php if('finish' != $this->importer->get_step()) : ?>
</del><ins>+ <dd><?php printf( '%d of %d', $this->importer->count( 'processed_posts' ) + $this->importer->count( 'processed_menu_items' ),
+ $this->importer->count( 'posts' ) ); ?></dd>
+<?php if( 'finish' != $this->importer->get_step() && ! $this->importer->get_error() ) : ?>
</ins><span class="cx"> <dt>Next cron run:</dt>
</span><del>- <dd><?php echo date_i18n(get_option('date_format') . ' ' . get_option('time_format'),
- wp_next_scheduled('wp_cron_importer_hook', array($this->importer->get_param('wxr_file')))); ?></dd>
</del><ins>+ <dd><?php echo date_i18n( get_option( 'date_format' ) . ' ' . get_option(
+ 'time_format' ),
+ wp_next_scheduled( 'wp_cron_importer_hook',
+ array(
+ $this->importer->get_param( 'wxr_file' )
+ ) ) ); ?></dd>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </dl>
</span><span class="cx">
</span><span class="lines">@@ -365,7 +372,7 @@
</span><span class="cx">
</span><span class="cx"> $error = $this->importer->get_error();
</span><span class="cx"> $warnings = $this->importer->get_warnings();
</span><del>- if(!empty($warnings)) {
</del><ins>+ if(! empty( $warnings ) ) {
</ins><span class="cx"> printf(
</span><span class="cx"> '<h3>' .
</span><span class="cx"> __(
</span><span class="lines">@@ -390,12 +397,25 @@
</span><span class="cx">
</span><span class="cx"> // if done, run the import_end() cleanup; note that this will wipe
</span><span class="cx"> // any error and warning data, so we need to get all that first (above)
</span><del>- if (is_wp_error($error) || $_POST['abort'])
- $this->importer->advance('finish');
</del><ins>+ if ( is_wp_error( $error ) || $_POST['abort'] )
+ $this->importer->advance( 'finish' );
</ins><span class="cx">
</span><span class="cx"> if ( 'finish' == $this->importer->get_step() ) {
</span><span class="cx"> $this->import_end();
</span><span class="cx"> } else {
</span><ins>+ $this->status_buttons();
+ } // end else
+ }
+
+ /**
+ * Added to http_request_timeout filter to force timeout at 60 seconds during import
+ * @return int 60
+ */
+ function bump_request_timeout( $val ) {
+ return 60;
+ }
+
+ function status_buttons () {
</ins><span class="cx"> ?>
</span><span class="cx"> <form
</span><span class="cx"> action="<?php echo admin_url( 'admin.php?import=wordpress&step=3' ); ?>"
</span><span class="lines">@@ -409,16 +429,7 @@
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span><del>- } // end else
</del><span class="cx"> }
</span><del>-
- /**
- * Added to http_request_timeout filter to force timeout at 60 seconds during import
- * @return int 60
- */
- function bump_request_timeout( $val ) {
- return 60;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wordpress_importer_init() {
</span></span></pre>
</div>
</div>
</body>
</html>