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

Adjusted clone settings filename

Browse source 
* Use source path if the model wasn't detected
  * Avoids names like "Clone_.json"
This commit is contained in:
2Shirt 2020-01-13 21:59:40 -07:00
parent f91df9f4e7
commit e9b1fe7819
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -305,6 +305,13 @@ class State():
working_dir=self.working_dir,
))
def _get_clone_settings_path(self):
"""get Clone settings file path, returns pathlib.Path obj."""
description = self.source.details['model']
if not description:
description = self.source.path.name
return pathlib.Path(f'{self.working_dir}/Clone_{description}.json')
def _fix_tmux_layout(self, forced=True):
"""Fix tmux layout based on cfg.ddrescue.TMUX_LAYOUT."""
layout = cfg.ddrescue.TMUX_LAYOUT
@ -373,9 +380,7 @@ class State():
def _load_settings(self, discard_unused_settings=False):
"""Load settings from previous run, returns dict."""
settings = {}
settings_file = pathlib.Path(
f'{self.working_dir}/Clone_{self.source.details["model"]}.json',
)
settings_file = self._get_clone_settings_path()
# Try loading JSON data
if settings_file.exists():
@ -423,9 +428,7 @@ class State():
def _save_settings(self, settings):
"""Save settings for future runs."""
settings_file = pathlib.Path(
f'{self.working_dir}/Clone_{self.source.details["model"]}.json',
)
settings_file = self._get_clone_settings_path()
# Try saving JSON data
try: