Changeset 831

Timestamp:

12/05/06 09:17:37 (2 years ago)

Author:

fumiakiy

Message:

Implemented backup progress screen. BugID: 28878

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (13 diffs)
• branches/wheeljack/lib/MT/BackupRestore.pm (modified) (4 diffs)
• branches/wheeljack/tmpl/cms/backup_end.tmpl (added)
• branches/wheeljack/tmpl/cms/backup_files.tmpl (deleted)
• branches/wheeljack/tmpl/cms/backup_start.tmpl (added)

branches/wheeljack/lib/MT/App/CMS.pm

@@ -148 +148 @@
-        'backup_restore' => \&backup_restore,
-        'backup' => \&backup,
+        'backup_download' => \&backup_download,
-        'restore' => \&restore,
-        'restore_upload_manifest' => \&restore_upload_manifest,
@@ -10819 +10820 @@
-}
-
+sub _backup_finisher {
+    my $app = shift;
+    my ($fname, $param) = @_;
+    $param->{filename} = $fname;
+    $param->{backup_success} = 1;
+    require MT::Session;
+    my $sess = MT::Session->new;
+    $sess->id($app->make_magic_token());
+    $sess->kind('BU'); # BU == Backup
+    $sess->name($fname);
+    $sess->start(time);
+    $sess->save;
+    $app->print($app->build_page('backup_end.tmpl', $param));
+}
+
-sub backup {
-    my $app = shift;
@@ -10841 +10857 @@
-    my $archive = $q->param('backup_archive_format');
-    my $enc = $app->config('PublishCharset') || 'utf-8';
-    my $file = '';
-    my @ts = gmtime(time);
-    my $ts = sprintf "%04d-%02d-%02d-%02d-%02d-%02d",
-        $ts[5]+1900, $ts[4]+1, @ts[3,2,1,0];
-$file .
+my $file 
-
-    if ('1' eq $archive) {
@@ -10859 +10874 @@
-    }
-
+    my $param = {};
+    $app->{no_print_body} = 1;
+    $app->add_breadcrumb($app->translate('Backup & Restore'), $app->uri(mode => 'backup_restore'));
+    $app->add_breadcrumb($app->translate('Backup'));
+    $param->{system_overview_nav} = 1;
+    $param->{nav_backup} = 1;
+
+    local $| = 1;
+    my $charset = MT::ConfigMgr->instance->PublishCharset;
+    $app->send_http_header('text/html' .
+        ($charset ? "; charset=$charset" : ''));
+    $app->print($app->build_page('backup_start.tmpl', $param));
+    require File::Temp;
+    require File::Spec;
+    my $temp_dir = $app->config('TempDir');
+
-    require MT::BackupRestore;
-    require MT::Asset;
@@ -10866 +10897 @@
-    my $finisher;
-    my $fh;
+    my $fname;
-    my $arc_buf;
-    if (!($number || $num_assets)) {
-        $app->{no_print_body} = 1;
-        $splitter = sub {};
+
-        if ('0' eq $archive) {
-
-
-
-
-
+
+
+
+
+
+
+
+
-        } elsif ('1' eq $archive) { # tar.gz
-            require Archive::Tar;
-            require Compress::Zlib;
-
-
-
+
-            $finisher = sub {
-                my ($asset_files) = @_;
+                ($fh, my $filepath) = File::Temp::tempfile('tar.XXXXXXXX', DIR => $temp_dir);
+                (my $vol, my $dir, $fname) = File::Spec->splitpath($filepath);
-                my $arc = Archive::Tar->new;
-                $arc->add_data("$file.xml", $arc_buf);
@@ -10891 +10926 @@
-                require Compress::Zlib;
-                my $dest = Compress::Zlib::memGzip($arc->write);
-
+
+
+
+
-            }
-        } elsif ('2' eq $archive) { # zip
-            require Archive::Zip;
-
-
-
+
-            $finisher = sub {
-                my ($asset_files) = @_;
+                ($fh, my $filepath) = File::Temp::tempfile('zip.XXXXXXXX', DIR => $temp_dir);
+                (my $vol, my $dir, $fname) = File::Spec->splitpath($filepath);
-                my $arc = Archive::Zip->new;
-                $arc->addString($arc_buf, "$file.xml");
@@ -10905 +10943 @@
-                    "<manifest xmlns='" . MT::BackupRestore::NS_MOVABLETYPE() . "'><file type='backup' name='$file.xml' /></manifest>", 
-                    "$file.manifest");
-
-
-
-
-
+
+
+
-            };
-        }
@@ -10919 +10955 @@
-        open $fh, ">$filename";
-        push @files, { filename => $file . "-1.xml" };
-print $fh $_[0]
+my ($data, $message) = @_; print $fh $data; $app->print($message)
-        $splitter = sub {
-            my ($findex) = @_;
@@ -10956 +10992 @@
-            push @files, { filename => "$file.manifest" };
-            if ('0' eq $archive) {
-                my $param = {};
-                $app->add_breadcrumb($app->translate('Backup & Restore'), $app->uri(mode => 'backup_restore'));
-                $app->add_breadcrumb($app->translate('Backup'));
-                $param->{system_overview_nav} = 1;
-                $param->{nav_backup} = 1;
-                $param->{files_loop} = \@files;
-
-
+
-            } elsif ('1' eq $archive) { # tar.gz
-                require Archive::Tar;
@@ -10978 +11008 @@
-                    }
-                }
+                my ($fh_arc, $filepath) = File::Temp::tempfile('tar.XXXXXXXX', DIR => $temp_dir);
+                (my $vol, my $dir, $fname) = File::Spec->splitpath($filepath);
-                require Compress::Zlib;
-                my $dest = Compress::Zlib::memGzip($arc->write);
-$app->{no_print_body} = 1
-$app->set_header("Content-Disposition" => "attachment; filename=$file.tar.gz")
-$app->send_http_header('application/x-tar-gz')
-print($dest
+binmode $fh_arc
+print $fh_arc $dest
+close $fh_arc
+_backup_finisher($fname, $param
-            } elsif ('2' eq $archive) { # zip
-                require Archive::Zip;
-                my $arc = Archive::Zip->new;
-                $app->{no_print_body} = 1;
-                $app->set_header("Content-Disposition" => "attachment; filename=$file.zip");
-                $app->send_http_header('application/zip');
-                for my $f (@files) {
-                    if (defined $f->{path}) {
@@ -10998 +11027 @@
-                    }
-                }
-
-
-
-
-
-
-
-
+
+
+
+
+
-            }
-        };
@@ -11012 +11038 @@
-    MT::BackupRestore->backup(
-        \@blog_ids, $printer, $splitter, $finisher, $number, $enc);
+}
+
+sub backup_download {
+    my $app = shift;
+    my $user = $app->user;
+    return $app->errtrans("Permission denied.") if !$user->is_superuser;
+    $app->validate_magic() or return;
+    my $filename = $app->param('filename');
+    my $temp_dir = $app->config('TempDir');
+    require File::Spec;
+    my $fname = File::Spec->catfile($temp_dir, $filename);
+    
+    my $sess = MT::Session->load( { kind => 'BU', name => $filename } );
+    if (!defined($sess) || !$sess) {
+        return $app->errtrans("Specified file was not found.");
+    }
+    my @ts = gmtime($sess->start);
+    my $ts = sprintf "%04d-%02d-%02d-%02d-%02d-%02d",
+        $ts[5]+1900, $ts[4]+1, @ts[3,2,1,0];
+    my $newfilename = "Movable_Type-$ts" . '-Backup';
+    $sess->remove;
+
+    $app->{no_print_body} = 1;
+    my $contenttype;
+    if ($filename =~ m/^xml\..+$/i) {
+        my $enc = $app->config('PublishCharset') || 'utf-8';
+        $contenttype = "text/xml; charset=$enc";
+        $newfilename .= '.xml';
+    } elsif ($filename =~ m/^tar\..+$/i) {
+        $contenttype = 'application/x-tar-gz';
+        $newfilename .= '.tar.gz';
+    } elsif ($filename =~ m/^zip\..+$/i) {
+        $contenttype = 'application/zip';
+        $newfilename .= '.zip';
+    } else {
+        $app->send_http_header('application/octet-stream');
+    }
+
+    $app->set_header("Content-Disposition" => "attachment; filename=$newfilename");
+    $app->send_http_header($contenttype);
+    
+    open my $fh, "<$fname";
+    my $data;
+    while (read $fh, my($chunk), 8192) {
+        $data .= $chunk;
+    }
+    close $fh;
+    $app->print($data);
+    unlink $fname;
-}
-
@@ -11073 +11148 @@
-            } else {
-                my $temp_dir = $app->config('TempDir');
-;
+
-                my $tmp = File::Temp::tempdir($uploaded_filename . 'XXXX', DIR => $temp_dir, CLEANUP => 1);
-                my $buffer;

branches/wheeljack/lib/MT/BackupRestore.pm

@@ -72 +72 @@
-    my $header .= "<movabletype xmlns='" . NS_MOVABLETYPE . "'>\n";
-    $header = "<?xml version='1.0' encoding='$enc'?>\n$header" if $enc !~ m/utf-?8/i;
-
+, q()
-
-    my $files = {};
@@ -79 +79 @@
-
-    my $else_xml = MT->run_callbacks('Backup.else');
-
-
-
+, q()
+
+, q()
-    $finisher->($files);
-}
@@ -99 +99 @@
-        my $err = $@;
-        if ($err) {
-
+, "$err\n"
-            next;
-        }
@@ -117 +117 @@
-                    $splitter->(int($counter / $number + 1));
-                }
-
+
+
+
-                if ($class eq 'MT::Author') {
-                    # MT::Author may be duplicated because of how terms and args are created.