proxmox-mirrors/pve-http-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-http-server synced 2025-04-30 07:59:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

multipart upload: avoid some extra lines and general code style fixes

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-09-29 16:34:18 +02:00
parent dafe441609
commit aad755eb35
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/PVE/APIServer/AnyEvent.pm
View File

@ -1226,15 +1226,13 @@ sub file_upload_multipart {
//sxx
) {
assert_form_disposition($1);
die "wrong field `name` for file upload, expected `filename` - abort upload"
if $2 ne "filename";
die "wrong field name '$2' for file upload, expected 'filename'" if $2 ne "filename";
$rstate->{phase} = 2;
$rstate->{params}->{filename} = $trim->($3);
}
}
# Phase 2 - dump content into file
if ($rstate->{phase} == 2) {
if ($rstate->{phase} == 2) { # Phase 2 - dump content into file
my ($data, $write_length);
if ($hdl->{rbuf} =~ s/^(.*?)${newline_re}?+${close_delim_re}.*$//s) {
$data = $1;
@ -1252,28 +1250,21 @@ sub file_upload_multipart {
}
}
# Phase 100 - transfer finished
if ($rstate->{phase} == 100) {
if ($rstate->{phase} == 100) { # Phase 100 - transfer finished
$rstate->{md5sum} = $rstate->{ctx}->hexdigest;
my $elapsed = tv_interval($rstate->{starttime});
my $rate = int($rstate->{bytes} / ($elapsed * 1024 * 1024));
syslog('info',
"multipart upload complete (size: %d time: %ds rate: %.2fMiB/s md5sum: %s)",
$rstate->{bytes}, $elapsed, $rate, $rstate->{md5sum}
syslog('info', "multipart upload complete (size: %d time: %.1fs rate: %.2fMiB/s md5sum: %s)",
$rstate->{bytes}, $elapsed, $rstate->{bytes} / ($elapsed * 1024 * 1024), $rstate->{md5sum}
);
$self->handle_api2_request($reqstate, $auth, $method, $path, $rstate);
}
$rstate->{read} += $startlen - length($hdl->{rbuf});
if (
$rstate->{read} + length($hdl->{rbuf}) >= $rstate->{size}
&& $rstate->{phase} != 100
) {
if ($rstate->{read} + length($hdl->{rbuf}) >= $rstate->{size} && $rstate->{phase} != 100) {
die "upload failed";
}
};
if (my $err = $@) {
syslog('err', $err);