Changeset 1778 for branches/release-33/lib/MT/CMS/Blog.pm

Timestamp:

04/05/08 01:31:43 (20 months ago)

Author:

bchoate

Message:

Changes to update type-based touches prior to any rebuilding. Added 'pre_build', 'post_build' callbacks that wrap entire build process (pre_build is called at start of multi-request build process; post_build is called at the end). Added a total publish time message at end of build process. BugId:74814

Files:

• branches/release-33/lib/MT/CMS/Blog.pm (modified) (10 diffs)

branches/release-33/lib/MT/CMS/Blog.pm

@@ -531 +531 @@
         }
     }
+    $app->run_callbacks('post_build');
     $app->call_return;
 }
@@ -541 +542 @@
     require MT::Blog;
     my $q             = $app->param;
-    my $blog_id       = $q->param('blog_id');
+    my $start_time    = $q->param('start_time');
+
+    if ( ! $start_time ) {
+        # start of build; invoke callback
+        $app->run_callbacks('pre_build');
+        $start_time = time;
+    }
+
+    my $blog_id       = int($q->param('blog_id'));
+    return $app->errtrans("Invalid request.") unless $blog_id;
+
     my $blog          = MT::Blog->load($blog_id);
     my $order         = $q->param('type');
@@ -550 +561 @@
     my $archiver      = $app->publisher->archiver($type);
     my $archive_label = $archiver ? $archiver->archive_label : '';
+
     $archive_label = $app->translate($type) unless $archive_label;
     $archive_label = $archive_label->() if ( ref $archive_label ) eq 'CODE';
@@ -556 +568 @@
     my $offset = 0;
     my ($total) = $q->param('total');
-
-    ## Tells MT::_rebuild_entry_archive_type to cache loaded templates so
-    ## that each template is only loaded once.
-    $app->{cache_templates} = 1;
 
     my ($tmpl_saved);
@@ -774 +782 @@
             offset          => $offset,
             complete        => $complete,
+            start_time      => $start_time,
             incomplete      => 100 - $complete,
             entry_id        => scalar $q->param('entry_id'),
@@ -783 +792 @@
     }
     else {
+        $app->run_callbacks( 'post_build' );
         if ( $q->param('entry_id') ) {
             require MT::Entry;
@@ -809 +819 @@
             }
             my %param = (
-                all          => $all,
-                type         => $archive_label,
-                is_one_index => $is_one_index,
-                is_entry     => $is_entry,
-                archives     => $type ne 'index',
+                all             => $all,
+                type            => $archive_label,
+                is_one_index    => $is_one_index,
+                is_entry        => $is_entry,
+                archives        => $type ne 'index',
+                start_timestamp => MT::Util::epoch2ts($blog, $start_time),
+                total_time      => time - $start_time,
             );
             if ($is_one_index) {
@@ -838 +850 @@
             }
             else {    # popup--just go to cnfrmn. page
-                $app->run_callbacks( 'rebuild', $blog );
                 return $app->load_tmpl( 'popup/rebuilt.tmpl', \%param );
             }
@@ -854 +865 @@
     my $app           = shift;
     my $q             = $app->param;
+    my $start_time    = $q->param('start_time');
+
+    if ( ! $start_time ) {
+        # start of build; invoke callback
+        $app->run_callbacks('pre_build');
+        $start_time = time;
+    }
+
     my $type          = $q->param('type');
     my $next          = $q->param('next') || 0;
@@ -906 +925 @@
         build_next      => $next,
         total           => $total,
+        start_time      => $start_time,
         complete        => 0,
         incomplete      => 100,