<!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>[2179] 2013/frederickding/importer/trunk: More UI elements for controlling cron importer.</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/2179">2179</a></dd>
<dt>Author</dt> <dd>frederick.ding</dd>
<dt>Date</dt> <dd>2013-07-30 03:06:48 +0000 (Tue, 30 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>More UI elements for controlling cron importer. See <a href="http://gsoc.trac.wordpress.org/ticket/340">#340</a>.
- Fixed bug in which `process_categories()` and `process_posts()` would not
run within a cron job due to dependence on functions that are in wp-admin
includes.
- Removed debugging output in importer status page (now hidden under
`IMPORT_DEBUG` flag).
- Added refresh button on status page and counters of processed items.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013frederickdingimportertrunkclasswordpressimporterphp">2013/frederickding/importer/trunk/class-wordpress-importer.php</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 (2178 => 2179)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/frederickding/importer/trunk/class-wordpress-importer.php 2013-07-30 01:15:34 UTC (rev 2178)
+++ 2013/frederickding/importer/trunk/class-wordpress-importer.php 2013-07-30 03:06:48 UTC (rev 2179)
</span><span class="lines">@@ -10,6 +10,9 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Importer
</span><span class="cx"> */
</span><ins>+
+require_once ABSPATH . '/wp-admin/includes/admin.php';
+
</ins><span class="cx"> class WordPress_Importer extends WP_Importer_Cron {
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -267,7 +270,6 @@
</span><span class="cx"> public function do_import( $file = '' ) {
</span><span class="cx"> // defaults to being done
</span><span class="cx"> $done = true;
</span><del>- $this->error = null;
</del><span class="cx">
</span><span class="cx"> if ( empty( $file ) )
</span><span class="cx"> $file = $this->wxr_file;
</span><span class="lines">@@ -275,6 +277,9 @@
</span><span class="cx"> if ( ! empty( $this->progress[$file] ) ) {
</span><span class="cx"> $done = false;
</span><span class="cx">
</span><ins>+ wp_defer_term_counting( true );
+ wp_defer_comment_counting( true );
+
</ins><span class="cx"> do {
</span><span class="cx"> // we could probably be doing call_user_func() or using some
</span><span class="cx"> // Reflection, but this makes more sense for readability and
</span><span class="lines">@@ -1618,6 +1623,9 @@
</span><span class="cx"> * object
</span><span class="cx"> */
</span><span class="cx"> public function get_param ( $name, $default = null ) {
</span><ins>+ if ( 'wxr_file' == $name )
+ return $this->wxr_file;
+
</ins><span class="cx"> if ( ! isset( $this->wxr_file ) ) {
</span><span class="cx"> // cannot get user options before WXR data is parsed
</span><span class="cx"> return new WP_Error( 'import_param_get_error',
</span><span class="lines">@@ -1643,6 +1651,12 @@
</span><span class="cx"> return $this->params;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public function count( $variable ) {
+ if ( property_exists( $this, $variable ) )
+ return count( $this->$variable );
+ return - 1;
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * Subtracts the lengths of two strings.
</span><span class="cx"> *
</span></span></pre></div>
<a id="2013frederickdingimportertrunkwordpressimporterphp"></a>
<div class="modfile"><h4>Modified: 2013/frederickding/importer/trunk/wordpress-importer.php (2178 => 2179)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/frederickding/importer/trunk/wordpress-importer.php 2013-07-30 01:15:34 UTC (rev 2178)
+++ 2013/frederickding/importer/trunk/wordpress-importer.php 2013-07-30 03:06:48 UTC (rev 2179)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> break;
</span><span class="cx"> case 2:
</span><span class="cx"> check_admin_referer( 'import-wordpress' );
</span><del>-
</del><span class="cx"> $this->id = (int) $_POST['import_id'];
</span><span class="cx"> $file = get_attached_file( $this->id );
</span><span class="cx"> set_time_limit(0);
</span><span class="lines">@@ -79,6 +78,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 3:
</span><span class="cx"> // status
</span><ins>+ check_admin_referer( 'import-wordpress' );
</ins><span class="cx"> $this->status();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -336,26 +336,68 @@
</span><span class="cx"> // since the instance in this class should have loaded its variables
</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><ins>+ if ( ! is_wp_error( $this->importer->get_step() )) :
+ echo '<p><strong>Current step: ' . $this->importer->get_step() . '</strong></p>';
+?>
+<dl>
+ <dt>Authors imported:</dt>
+ <dd><?php printf('%d', $this->importer->count('processed_authors')); ?></dd>
+ <dt>Authors mapped:</dt>
+ <dd><?php printf('%d', $this->importer->count('processed_author_mappings')); ?></dd>
+ <dt>Categories, tags, and terms imported:</dt>
+ <dd><?php printf('%d', $this->importer->count('processed_terms')); ?></dd>
+ <dt>Posts, attachments, menu items, and custom post types imported:</dt>
+ <dd><?php printf('%d', $this->importer->count('processed_posts')); ?></dd>
+<?php if('finish' != $this->importer->get_step()) : ?>
+ <dt>Next cron run:</dt>
+ <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>
+<?php endif; ?>
+</dl>
</ins><span class="cx">
</span><del>- echo '<pre>';
- echo 'Time left? ';
- var_dump($this->importer->have_time());
- echo "\n";
- var_dump(get_option(get_class($this->importer)));
- echo '</pre>';
</del><ins>+<?php
+ endif;
</ins><span class="cx">
</span><span class="cx"> $error = $this->importer->get_error();
</span><span class="cx"> $warnings = $this->importer->get_warnings();
</span><del>- foreach ( $warnings as $warning ) {
- /* @var $warning WP_Error */
- print_r( $warning );
</del><ins>+ if(!empty($warnings)) {
+ printf(
+ '<h3>' .
+ __(
+ 'The import process resulted in %d warnings',
+ 'wordpress-importer' ) .
+ '</h3><div class="error">', count( $warnings ) );
+ foreach ( $warnings as $warning ) {
+ /* @var $warning WP_Error */
+ echo '<p>' . $warning->get_error_message() . '</p>';
+ }
+ echo '</div>';
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( IMPORT_DEBUG ) {
+ echo '<pre>';
+ var_dump( get_option( get_class( $this->importer ) ) );
+ echo '</pre>';
+ }
+
</ins><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 ( 'finish' == $this->importer->get_step() || $_GET['abort'] ) {
</del><ins>+ if ( 'finish' == $this->importer->get_step() || is_wp_error( $error ) ||
+ $_GET['abort'] ) {
</ins><span class="cx"> $this->import_end();
</span><del>- }
</del><ins>+ } else {
+?>
+<form
+ action="<?php echo admin_url( 'admin.php?import=wordpress&step=3' ); ?>"
+ method="post">
+ <?php wp_nonce_field( 'import-wordpress' ); ?>
+ <p class="submit">
+ <input type="submit" class="button"
+ value="<?php esc_attr_e( 'Refresh', 'wordpress-importer' ); ?>" />
+ </p>
+</form>
+<?php
+ } // end else
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>