From 1bd902d955004ea0cafcd82b9580a73428a9d16f Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Mon, 14 Dec 2020 03:25:36 +0100 Subject: [PATCH] btrbk: collapse host columns for most formats --- btrbk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/btrbk b/btrbk index 7cfc0bd..6c8b022 100755 --- a/btrbk +++ b/btrbk @@ -199,29 +199,29 @@ my %table_formats = ( raw => [ qw( target_url target_host target_port target_path target_rsh ) ], }, list => { table => [ qw( -source_host -source_port source_subvolume snapshot_path snapshot_name -target_host -target_port target_path ) ], - long => [ qw( source_host -source_port source_subvolume snapshot_path snapshot_name target_host -target_port target_path snapshot_preserve target_preserve ) ], + long => [ qw( -source_host -source_port source_subvolume snapshot_path snapshot_name -target_host -target_port target_path snapshot_preserve target_preserve ) ], raw => [ qw( source_url source_host source_port source_subvolume snapshot_path snapshot_name target_url target_host target_port target_path snapshot_preserve target_preserve source_rsh target_rsh ) ], }, - resolved => { table => [ qw( -source_host -source_port source_subvolume snapshot_subvolume status -target_host -target_port target_subvolume ) ], - long => [ qw( type source_host -source_port source_subvolume snapshot_subvolume status target_host -target_port target_subvolume target_type ) ], + resolved => { table => [ qw( -source_host -source_port source_subvolume snapshot_subvolume status -target_host -target_port target_subvolume ) ], + long => [ qw( -source_host -source_port source_subvolume snapshot_subvolume status -target_host -target_port target_subvolume target_type ) ], raw => [ qw( type source_url source_host source_port source_path snapshot_path snapshot_name status target_url target_host target_port target_path target_type source_rsh target_rsh ) ], # NOTE: snapshot_path is ambigous and does NOT print SUBVOL_PATH here (should be snapshot_subvolume, left as-is for compatibility) }, stats => { table => [ qw( -source_host -source_port source_subvolume snapshot_subvolume -target_host -target_port -target_subvolume snapshots -backups ) ], - long => [ qw( source_host -source_port source_subvolume snapshot_subvolume target_host -target_port -target_subvolume snapshot_status backup_status snapshots -backups -correlated -orphaned -incomplete ) ], + long => [ qw( -source_host -source_port source_subvolume snapshot_subvolume -target_host -target_port -target_subvolume snapshot_status backup_status snapshots -backups -correlated -orphaned -incomplete ) ], raw => [ qw( source_url source_host source_port source_subvolume snapshot_subvolume snapshot_name target_url target_host target_port target_subvolume snapshot_status backup_status snapshots backups correlated orphaned incomplete ) ], RALIGN => { snapshots=>1, backups=>1, correlated=>1, orphaned=>1, incomplete=>1 }, }, schedule => { table => [ qw( action -host -port subvolume scheme reason ) ], - long => [ qw( action host -port root_path subvolume_path scheme reason ) ], + long => [ qw( action -host -port root_path subvolume_path scheme reason ) ], raw => [ qw( topic action url host port path hod dow min h d w m y) ], }, - usage => { table => [ qw( -host -port path size used free ) ], - long => [ qw( type host -port path size used device_size device_allocated device_unallocated device_missing device_used free free_min data_ratio metadata_ratio global_reserve global_reserve_used ) ], + usage => { table => [ qw( -host -port path size used free ) ], + long => [ qw( type -host -port path size used device_size device_allocated device_unallocated device_missing device_used free free_min data_ratio metadata_ratio global_reserve global_reserve_used ) ], raw => [ qw( type host port path size used device_size device_allocated device_unallocated device_missing device_used free free_min data_ratio metadata_ratio global_reserve global_reserve_used ) ], RALIGN => { size=>1, used=>1, device_size=>1, device_allocated=>1, device_unallocated=>1, device_missing=>1, device_used=>1, free=>1, free_min=>1, data_ratio=>1, metadata_ratio=>1, global_reserve=>1, global_reserve_used=>1 }, },