btrbk: use less confusing *_subvol instead of *_path for table output headings; cleanup table formats

pull/57/head
Axel Burri 2015-10-14 17:18:21 +02:00
parent 4a1b6545f4
commit fd985d0245
1 changed files with 14 additions and 14 deletions

28
btrbk
View File

@ -120,35 +120,35 @@ my %config_options = (
my @config_target_types = qw(send-receive raw); my @config_target_types = qw(send-receive raw);
my %table_formats = ( my %table_formats = (
list_volume => { table => [ qw( volume ) ], list_volume => { table => [ qw( volume_host volume_subvol ) ],
long => [ qw( volume_host volume_path ) ], long => [ qw( volume_host volume_subvol ) ],
raw => [ qw( volume_url volume_host volume_path volume_rsh ) ], raw => [ qw( volume_url volume_host volume_path volume_rsh ) ],
}, },
list_source => { table => [ qw( source_host source_path snapshot_path snapshot_name ) ], list_source => { table => [ qw( source_host source_subvol snapshot_path snapshot_name ) ],
long => [ qw( source_host source_path snapshot_path snapshot_name ) ], long => [ qw( source_host source_subvol snapshot_path snapshot_name ) ],
raw => [ qw( source_url source_host source_path snapshot_path snapshot_name source_rsh ) ], raw => [ qw( source_url source_host source_path snapshot_path snapshot_name source_rsh ) ],
}, },
list_target => { table => [ qw( target ) ], list_target => { table => [ qw( target_host target_subvol ) ],
long => [ qw( target_host target_path ) ], long => [ qw( target_host target_subvol ) ],
raw => [ qw( target_url target_host target_path target_rsh ) ], raw => [ qw( target_url target_host target_path target_rsh ) ],
}, },
list => { table => [ qw( source snapshot_path snapshot_name target ) ], list => { table => [ qw( source_host source_subvol snapshot_path snapshot_name target_host target_subvol ) ],
long => [ qw( source_host source_path snapshot_path snapshot_name snapshot_preserve target_host target_path target_preserve ) ], long => [ qw( source_host source_subvol snapshot_path snapshot_name snapshot_preserve target_host target_subvol target_preserve ) ],
raw => [ qw( source_url source_host source_path snapshot_path snapshot_name snapshot_preserve target_url target_host target_path target_preserve source_rsh target_rsh ) ], raw => [ qw( source_url source_host source_subvol snapshot_path snapshot_name snapshot_preserve target_url target_host target_subvol target_preserve source_rsh target_rsh ) ],
}, },
resolved => { table => [ qw( source snapshot status target ) ], resolved => { table => [ qw( source_host source_subvol snapshot_subvol status target_host target_subvol ) ],
long => [ qw( type source_host source_subvol snapshot_subvol status target_host target_subvol ) ], long => [ qw( type source_host source_subvol snapshot_subvol status target_host target_subvol ) ],
raw => [ qw( type source_host source_path snapshot_path snapshot_name status target_host target_path source_rsh ) ], raw => [ qw( type source_host source_path snapshot_path snapshot_name status target_host target_path source_rsh ) ],
}, },
schedule => { table => [ qw( action target scheme reason ) ], schedule => { table => [ qw( action target_host target_subvol scheme reason ) ],
long => [ qw( action host root_path name scheme reason ) ], long => [ qw( action host root_path name scheme reason ) ],
raw => [ qw( topic action url host path dow d m w) ], raw => [ qw( topic action url host path dow d m w) ],
}, },
action_log => { table => [ qw( type status target source parent ) ], action_log => { table => [ qw( type status target_host target_subvol source_host source_subvol parent_subvol ) ],
long => [ qw( localtime type status duration target_host target_path source_host source_path parent_path message ) ], long => [ qw( localtime type status duration target_host target_subvol source_host source_subvol parent_subvol message ) ],
raw => [ qw( time localtime type status duration target_url source_url parent_url message ) ], raw => [ qw( time localtime type status duration target_url source_url parent_url message ) ],
tlog => [ qw( localtime type status duration target_url source_url parent_url message ) ], tlog => [ qw( localtime type status duration target_url source_url parent_url message ) ],
}, },
@ -3360,7 +3360,7 @@ MAIN:
else else
{ {
# print action log # print action log
print_formatted("action_log", \@action_log, title => "BACKUP SUMMARY"); print_formatted("action_log", \@action_log, title => "TRANSACTION LOG");
} }
} }