Changeset 809

Timestamp:

11/30/06 12:21:06 (2 years ago)

Author:

fumiakiy

Message:

Implemented assets backup and restore. BugId: 45484

Files:

• branches/wheeljack/lib/MT/App/CMS.pm (modified) (24 diffs)
• branches/wheeljack/tmpl/cms/backup_files.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/dialog_restore_end.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/dialog_restore_upload.tmpl (modified) (1 diff)

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

@@ -152 +152 @@
-        'backup' => \&backup,
-        'restore' => \&restore,
-        'backup_download' => \&backup_download,
-        'restore_upload_manifest' => \&restore_upload_manifest,
-        'dialog_restore_upload' => \&dialog_restore_upload,
@@ -10825 +10824 @@
-sub _loop_through_objects {
-    my $app = shift;
-
+, $files
-
-    my $counter = 0;
@@ -10845 +10844 @@
-                    $splitter->(int($counter / $number + 1));
-                }
-
+
+
+
+
+
+
-                my $xml = MT->run_callbacks('CMSBackup.' . $object->datasource, $app, $object)
-                    or $printer->($app->error(MT->errstr()));
@@ -10882 +10886 @@
-    }
-
+    require MT::Asset;
+    my $num_assets = MT::Asset->count();
-    my $printer;
-    my $splitter;
@@ -10887 +10893 @@
-    my $fh;
-    my $arc_buf;
-$number
+($number || $num_assets)
-        $app->{no_print_body} = 1;
-        $splitter = sub {};
@@ -10895 +10901 @@
-                                        : 'text/xml');
-            $printer = sub { $app->print(@_); };
-
+ my ($asset_files) = @_; 1; 
-        } elsif ('1' eq $archive) { # tar.gz
-            require Archive::Tar;
@@ -10903 +10909 @@
-            $printer = sub { $arc_buf .= $_[0]; };
-            $finisher = sub {
+                my ($asset_files) = @_;
-                my $arc = Archive::Tar->new;
-                $arc->add_data("$file.xml", $arc_buf);
+                $arc->add_data(
+                    "$file.manifest",
+                    "<manifest xmlns='" . NS_MOVABLETYPE . "'><file type='backup' name='$file.xml' /></manifest>"); 
-                require Compress::Zlib;
-                my $dest = Compress::Zlib::memGzip($arc->write);
@@ -10915 +10925 @@
-            $printer = sub { $arc_buf .= $_[0]; };
-            $finisher = sub {
+                my ($asset_files) = @_;
-                my $arc = Archive::Zip->new;
-                $arc->addString($arc_buf, "$file.xml");
+                $arc->addString(
+                    "<manifest xmlns='" . NS_MOVABLETYPE . "'><file type='backup' name='$file.xml' /></manifest>", 
+                    "$file.manifest");
-                my $buf;
-                require IO::String;
@@ -10945 +10959 @@
-        };
-        $finisher = sub {
+            my ($asset_files) = @_;
-            close $fh;
-            my $filename = File::Spec->catfile($temp_dir, "$file.manifest");
@@ -10953 +10968 @@
-                my $name = $file->{filename};
-                print $fh "<file type='backup' name='$name' />\n";
+            }
+            for my $id (keys %$asset_files) {
+                print $fh "<file type='asset' name='$asset_files->{$id}->[2]' asset_id='" . $id . "' />\n";
+                push @files, {
+                    filename => $asset_files->{$id}->[2], 
+                    url=> $asset_files->{$id}->[0], 
+                    path => $asset_files->{$id}->[1],
+                    asset_id => $id,
+                };
-            }
-            print $fh "</manifest>\n";
@@ -10970 +10994 @@
-                my $arc = Archive::Tar->new;
-                for my $f (@files) {
-
+
+
+
+
+
+
+
+
+
-                }
-                require Compress::Zlib;
@@ -10985 +11017 @@
-                $app->send_http_header('application/zip');
-                for my $f (@files) {
-
+
+
+
+
+
+
-                }
-                my $buf;
@@ -10991 +11028 @@
-                my $ios = IO::String->new(\$buf);
-                $arc->writeToFileHandle($ios);
+                for my $f (@files) {
+                    unlink File::Spec->catfile($temp_dir, $f->{filename}) if !defined($f->{path});
+                }
-                $app->print($buf);
-            }
@@ -11010 +11050 @@
-    $printer->($header);
-
-
+
+
-
-    $printer->('</movabletype>');
-
+$files
-}
-
@@ -11032 +11073 @@
-
-    $app->errtrans("Not implemented yet");
-}
-
-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 $file = $app->param('file');
-    return $app->errtrans("Filename is needed to download.") if !defined($file) || !$file;
-    my $temp_dir = $app->config('TempDir');
-    my $filename = File::Spec->catfile($temp_dir, $file);
-
-    return $app->errtrans("[_1] is not found.", $file) if (!(-f $filename));
-        
-    my $enc = $app->config('PublishCharset') || 'utf-8';
-    $app->{no_print_body} = 1;
-    $app->set_header("Content-Disposition" => "attachment; filename=$file");
-    $app->send_http_header($enc ? "text/xml; charset=$enc"
-                                    : 'text/xml');
-    my $fh = gensym();
-    open $fh, "<$filename";
-    my $data;
-    binmode $fh;
-    while (read $fh, my($chunk), 8192) {
-        $data .= $chunk;
-    }
-    close $fh;
-    $app->print($data);
-    1;
-}
-
@@ -11134 +11144 @@
-                my $tar = Archive::Tar->new($ios);
-                for my $file ($tar->list_files) {
-
-
+
-                    $tar->extract_file($file, $f);
-                }
@@ -11286 +11295 @@
-}
-
+sub _restore_asset {
+    my $app = shift;
+    my ($tmp, $asset_element, $objects, $errors) = @_;
+
+    my $id = $asset_element->{asset_id};
+    next if !defined($id);
+    next if !(exists $objects->{"MT::Asset#$id"});
+    my $asset = $objects->{"MT::Asset#$id"};
+    my $path = $asset->file_path;
+    next if !defined($path);
+    my ($vol, $dir, $fn) = File::Spec->splitpath($path);
+    if (!-w "$vol$dir") {
+        $errors->{$id} = $app->translate('[_1] is not writable.', "$vol$dir");
+        next;
+    }
+    my $filename = "$id-" . $asset_element->{name};
+    $app->print($app->translate("Copying [_1] to [_2]...", $filename, $path));
+    my $file;
+    if (defined($tmp)) {
+        $file = File::Spec->catfile($tmp, $filename) if defined($tmp);
+    } else {
+        $file = $asset_element->{fh};
+    }
+    copy($file, $path)
+        or $errors->{$id} = $!;
+    $app->print(exists($errors->{$id}) ?
+        $app->translate("Failed: [_1]\n", $errors->{$id}) :
+        $app->translate("Done.\n")
+    );
+}
+
+sub _restore_assets {
+    my $app = shift;
+    my ($tmp, $backups, $objects) = @_;
+    my $assets = $backups->{assets};
+    my $errors = {};
+    return $errors if !defined($assets);
+    use File::Copy;
+    require File::Spec;
+    for my $asset_element (@$assets) {
+        $app->_restore_asset($tmp, $asset_element, $objects, $errors);
+    }
+    $errors;
+}
+
-sub restore_directory {
-    my $app = shift;
@@ -11348 +11402 @@
-        close $fh;
-    }
+    
+    my $error_assets = $app->_restore_assets($dir, $backups, \%objects) if defined($backups->{assets});
+
+    if (defined($error_assets) && scalar(keys %$error_assets)) {
+        my $data;
+        while (my ($key, $value) = each %$error_assets) {
+            $data .= $app->translate("Actual file for an asset (ID: [_1]) could not be restored: [_2]\n", $key, $value);
+        }
+        my $message = 'Some of the actual files for assets could not be restored.';
+        $app->log({
+            message => $message,
+            level => MT::Log::WARNING(),
+            class => 'system',
+            category => 'restore',
+            metadata => $data,
+        });
+        $$error .= $message;
+    }    
-
-    if (scalar(keys %deferred)) {
@@ -11363 +11435 @@
-        });
-        my $log_url = $app->uri(mode => 'view_log', args => {});
-
+.
-            . $app->translate('Detailed information is in the <a href="[_1]">activity log</a>.', $log_url);
-
-
+
+
+
-
-    $app->log({
@@ -11402 +11475 @@
-                    push @{$backups->{files}}, $node->getAttribute('name');
-                } elsif ('asset' eq $node->getAttribute('type')) {
-
+
+
+
+
-                }
-            }
@@ -11441 +11517 @@
-    my $assets = $backups->{assets};
-    my $file_next = shift @$files if defined($files) && scalar(@$files);
+    my $assets_json;
+    my $param = {};
-    if (!defined($file_next)) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $app->build_page('backup_restore.tmpl', $param);
-    #close $fh if !$no_upload;
@@ -11465 +11548 @@
-    my $last = $q->param('last');
-    my $files = $q->param('files');
-
+
+
-
-    my $objects = {};
@@ -11488 +11572 @@
-
-    my $param = {};
+    $param->{is_asset} = $is_asset;
-    $param->{name} = $current;
-    $param->{files} = $files;
-
-
+
-    $param->{last} = $last;
-    $param->{redirect} = 1;
@@ -11560 +11644 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    my @files = split(',', $files);
-    my @assets;
-    my $file_next = shift @files if scalar(@files);
-    if (!defined($file_next)) {
-
-
+
+
+
+
+
-    }
-
-    $param->{files} = join(',', @files);
-join(',', @assets
+MT::Util::encode_html(JSON::objToJson($assets)
-    $param->{name} = $file_next;
-scalar(@assets
+(scalar(@$assets) - 1
-    $param->{is_dirty} = scalar(keys %$deferred);
-    if ($last) {

branches/wheeljack/tmpl/cms/backup_files.tmpl

@@ -28 +28 @@
-<tr class="<TMPL_IF __ODD__>odd<TMPL_ELSE>even</TMPL_IF>">
-<td><TMPL_VAR NAME=FILENAME></td>
-a href="<TMPL_VAR NAME=SCRIPT_URL>?__mode=backup_download&amp;magic_token=<TMPL_VAR NAME=MAGIC_TOKEN>&amp;file=<TMPL_VAR NAME=FILENAME ESCAPE=URL>" target="<MT_TRANS phrase="_external_link_target">" title="<MT_TRANS phrase="Download This File">"><img src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" alt="<MT_TRANS phrase="Download This File">" width="13" height="9" /></a
+TMPL_IF NAME=URL><a href="<TMPL_VAR NAME=URL>" target="<MT_TRANS phrase="_external_link_target">" title="<MT_TRANS phrase="Download This File">"><img src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" alt="<MT_TRANS phrase="Download This File">" width="13" height="9" /></a><TMPL_ELSE>&nbsp;</TMPL_IF
-</tr>
-</TMPL_LOOP>

branches/wheeljack/tmpl/cms/dialog_restore_end.tmpl

@@ -38 +38 @@
-<input type="hidden" name="redirect" value="1" />
-<input type="hidden" name="is_dirty" value="<TMPL_VAR NAME=IS_DIRTY>" />
+<input type="hidden" name="is_asset" value="<TMPL_VAR NAME=IS_ASSET>" />
-<input type="hidden" name="objects_json" value="<TMPL_VAR NAME=OBJECTS_JSON ESCAPE=HTML>" />
-<input type="hidden" name="deferred_json" value="<TMPL_VAR NAME=DEFERRED_JSON ESCAPE=HTML>" />

branches/wheeljack/tmpl/cms/dialog_restore_upload.tmpl

@@ -57 +57 @@
-<input type="hidden" name="magic_token" value="<TMPL_VAR NAME=MAGIC_TOKEN>" />
-<input type="hidden" name="files" value="<TMPL_VAR NAME=FILES>" />
-
+ ESCAPE=HTML
-<input type="hidden" name="current_file" value="<TMPL_VAR NAME=NAME>" />
-<input type="hidden" name="last" value="<TMPL_VAR NAME=LAST>" />
-<input type="hidden" name="is_dirty" value="<TMPL_VAR NAME=IS_DIRTY>" />
+<input type="hidden" name="is_asset" value="<TMPL_VAR NAME=IS_ASSET>" />
-<input type="hidden" name="objects_json" value="<TMPL_VAR NAME=OBJECTS_JSON ESCAPE=HTML>" />
-<input type="hidden" name="deferred_json" value="<TMPL_VAR NAME=DEFERRED_JSON ESCAPE=HTML>" />