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

osTicket integration complete for ddrescue TUI

Browse source
This commit is contained in:
2Shirt 2020-01-11 16:46:06 -07:00
parent 177a7fbec2
commit 28c1d61d20
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -702,6 +702,8 @@ class State():
self.mode, self.mode,
self.destination, self.destination,
force_local=docopt_args['--force-local-map'], force_local=docopt_args['--force-local-map'],
ticket_id=self.ost.ticket_id,
ticket_name=self.ost.ticket_name,
) )
# Start fresh if requested # Start fresh if requested
@ -1619,9 +1621,9 @@ def get_table_type(disk):
return table_type return table_type
def get_working_dir(mode, destination, force_local=False): def get_working_dir(
mode, destination, force_local=False, ticket_id=None, ticket_name=None):
"""Get working directory using mode and destination, returns path.""" """Get working directory using mode and destination, returns path."""
ticket_id = None
working_dir = None working_dir = None
# Set ticket ID # Set ticket ID
@ -1662,6 +1664,12 @@ def get_working_dir(mode, destination, force_local=False):
if mode == 'Clone': if mode == 'Clone':
working_dir = working_dir.joinpath(ticket_id) working_dir = working_dir.joinpath(ticket_id)
# Append ticket name if set
if ticket_name:
working_dir = working_dir.with_name(
f'{ticket_id}_{ticket_name.replace(" ", "-")}',
)
# Create directory # Create directory
working_dir.mkdir(parents=True, exist_ok=True) working_dir.mkdir(parents=True, exist_ok=True)
os.chdir(working_dir) os.chdir(working_dir)
@ -1686,6 +1694,8 @@ def main():
main_menu = build_main_menu() main_menu = build_main_menu()
settings_menu = build_settings_menu() settings_menu = build_settings_menu()
state = State() state = State()
if not args['--force-local-map']:
state.ost.select_ticket()
try: try:
state.init_recovery(args) state.init_recovery(args)
except std.GenericAbort: except std.GenericAbort: