2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Added --force-local-map option

Browse source
This commit is contained in:
2Shirt 2020-01-01 15:02:11 -07:00
parent df6f3ba8e1
commit f45a10395f
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/wk/hw/ddrescue.py
View file

@ -33,6 +33,8 @@ Usage:
Options: Options:
-h --help Show this page -h --help Show this page
-s --dry-run Print commands to be used instead of running them
--force-local-map Skip mounting shares and save map to current dir
--start-fresh Ignore previous runs and start new recovery --start-fresh Ignore previous runs and start new recovery
''' '''
CLONE_SETTINGS = { CLONE_SETTINGS = {
@ -482,7 +484,9 @@ class State():
self.update_progress_pane('Idle') self.update_progress_pane('Idle')
# Set working dir # Set working dir
working_dir = get_working_dir(mode, self.destination) working_dir = get_working_dir(
mode, self.destination, force_local=docopt_args['--force-local-map'],
)
# Start fresh if requested # Start fresh if requested
if docopt_args['--start-fresh']: if docopt_args['--start-fresh']:
@ -1223,7 +1227,7 @@ def get_percent_color(percent):
return color return color
def get_working_dir(mode, destination): def get_working_dir(mode, destination, force_local=False):
"""Get working directory using mode and destination, returns path.""" """Get working directory using mode and destination, returns path."""
ticket_id = None ticket_id = None
working_dir = None working_dir = None
@ -1239,7 +1243,11 @@ def get_working_dir(mode, destination):
ticket_id = None ticket_id = None
# Use preferred path if possible # Use preferred path if possible
if mode == 'Clone': if mode == 'Image':
path = pathlib.Path(destination).resolve()
if path.exists() and fstype_is_ok(path, map_dir=False):
working_dir = path
elif mode == 'Clone' and not force_local:
std.print_info('Mounting backup shares...') std.print_info('Mounting backup shares...')
net.mount_backup_shares(read_write=True) net.mount_backup_shares(read_write=True)
for server in cfg.net.BACKUP_SERVERS: for server in cfg.net.BACKUP_SERVERS:
@ -1248,10 +1256,6 @@ def get_working_dir(mode, destination):
# Acceptable path found # Acceptable path found
working_dir = path working_dir = path
break break
else:
path = pathlib.Path(destination).resolve()
if path.exists() and fstype_is_ok(path, map_dir=False):
working_dir = path
# Default to current dir if necessary # Default to current dir if necessary
if not working_dir: if not working_dir:
@ -1274,9 +1278,10 @@ def get_working_dir(mode, destination):
def main(): def main():
"""Main function for ddrescue TUI.""" """Main function for ddrescue TUI."""
args = docopt(DOCSTRING) args = docopt(DOCSTRING)
args['--dry-run'] = True # TODO: Remove dry-run safety net
log.update_log_path(dest_name='ddrescue-TUI', timestamp=True) log.update_log_path(dest_name='ddrescue-TUI', timestamp=True)
# Safety check # Check if running inside tmux
if 'TMUX' not in os.environ: if 'TMUX' not in os.environ:
LOG.error('tmux session not found') LOG.error('tmux session not found')
raise RuntimeError('tmux session not found') raise RuntimeError('tmux session not found')