ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: simplify action "diff"

pull/358/head
Axel Burri 2020-12-21 00:20:02 +01:00
parent d0c5205fcb
commit c7dd838a81
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
btrbk
View File

@ -1307,29 +1307,19 @@ sub btrfs_subvolume_find_new($$;$)
$files{$name}->{len} += $len; $files{$name}->{len} += $len;
$files{$name}->{new} = 1 if($file_offset == 0); $files{$name}->{new} = 1 if($file_offset == 0);
$files{$name}->{gen}->{$gen} = 1; # count the generations $files{$name}->{gen}->{$gen} = 1; # count the generations
if($flags eq "COMPRESS") { if($flags ne "NONE") {
$files{$name}->{flags}->{compress} = 1; $files{$name}->{flags}{$_} = 1 foreach split(/\|/, $flags);
}
elsif($flags eq "COMPRESS|INLINE") {
$files{$name}->{flags}->{compress} = 1;
$files{$name}->{flags}->{inline} = 1;
}
elsif($flags eq "INLINE") {
$files{$name}->{flags}->{inline} = 1;
}
elsif($flags eq "NONE") {
}
else {
WARN "unparsed flags: $flags";
} }
} }
elsif(/^transid marker was (\S+)$/) { elsif(/^transid marker was (\S+)$/) {
$transid_marker = $1; $transid_marker = $1;
} }
else { else {
ERROR "Failed to parse output from `btrfs subvolume find-new`:", $_;
$parse_errors++; $parse_errors++;
} }
} }
ERROR "Failed to parse $parse_errors lines from `btrfs subvolume find-new`" if($parse_errors);
return { files => \%files, return { files => \%files,
transid_marker => $transid_marker, transid_marker => $transid_marker,
@ -5005,6 +4995,7 @@ sub print_header(@)
print "\n"; print "\n";
} }
print "--------------------------------------------------------------------------------\n"; print "--------------------------------------------------------------------------------\n";
print "\n" if($args{paragraph});
} }
@ -5696,8 +5687,8 @@ MAIN:
$total_len += $finfo->{len}; $total_len += $finfo->{len};
push @data, { push @data, {
flags => ($finfo->{new} ? '+' : '.') . flags => ($finfo->{new} ? '+' : '.') .
($finfo->{flags}->{compress} ? 'c' : '.') . ($finfo->{flags}->{COMPRESS} ? 'c' : '.') .
($finfo->{flags}->{inline} ? 'i' : '.'), ($finfo->{flags}->{INLINE} ? 'i' : '.'),
count => scalar(keys(%{$finfo->{gen}})), count => scalar(keys(%{$finfo->{gen}})),
size => print_size($finfo->{len}), size => print_size($finfo->{len}),
file => $name, file => $name,
@ -5725,10 +5716,11 @@ MAIN:
"..i flags INLINE or COMPRESS|INLINE set (at least once)", "..i flags INLINE or COMPRESS|INLINE set (at least once)",
"<count> file was modified in <count> generations", "<count> file was modified in <count> generations",
"<size> file was modified for a total of <size> bytes", "<size> file was modified for a total of <size> bytes",
] ],
) unless($quiet || $raw); paragraph => 1,
print_formatted("diff", \@data, no_header => !$output_pretty); ) if($output_pretty && !$raw);
print "\nTotal size: " . print_size($total_len) . "\n" unless($raw); print_formatted("diff", \@data, paragraph => 1);
print "Total size: " . print_size($total_len) . "\n" unless($raw);
exit 0; exit 0;
} }