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

Post report to osTicket

Browse source 
* Addresses issue #62
This commit is contained in:
2Shirt 2019-05-17 15:07:33 -06:00
parent 7b3fd34e63
commit d06f505a84
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.bin/Scripts/functions/ddrescue.py
View file

@ -273,6 +273,8 @@ class RecoveryState():
self.resumed = False self.resumed = False
self.started = False self.started = False
self.status = 'Inactive' self.status = 'Inactive'
self.ticket_id = None
self.ticket_name = None
self.timezone = pytz.timezone(LINUX_TIME_ZONE) self.timezone = pytz.timezone(LINUX_TIME_ZONE)
self.total_size = 0 self.total_size = 0
if mode not in ('clone', 'image'): if mode not in ('clone', 'image'):
@ -577,8 +579,6 @@ class RecoveryState():
map_dir = '{}/{}'.format(MAP_DIR, global_vars['Date-Time']) map_dir = '{}/{}'.format(MAP_DIR, global_vars['Date-Time'])
# Get Ticket ID # Get Ticket ID
self.ticket_id = None
self.ticket_name = None
if not self.ost.disabled: if not self.ost.disabled:
try: try:
self.ticket_id, self.ticket_name = self.ost.get_ticket_details() self.ticket_id, self.ticket_name = self.ost.get_ticket_details()
@ -861,6 +861,7 @@ def is_writable_filesystem(dir_obj):
def menu_ddrescue(source_path, dest_path, run_mode): def menu_ddrescue(source_path, dest_path, run_mode):
# pylint: disable=too-many-branches
"""ddrescue menu.""" """ddrescue menu."""
source = None source = None
dest = None dest = None
@ -910,9 +911,19 @@ def menu_ddrescue(source_path, dest_path, run_mode):
# Post results # Post results
if ask('Post results to osTicket?'): if ask('Post results to osTicket?'):
# TODO if not state.ticket_id:
# (Re)enable osTicket
state.ost.disabled = False
try:
state.ticket_id, state.ticket_name = state.ost.get_ticket_details()
except TypeError:
# Happens if connection fails and retry is not attempted
pass pass
# Post
if state.ticket_id:
state.ost.post_response(state.generate_report(), state.ticket_id)
# Done # Done
run_program(['tmux', 'kill-window']) run_program(['tmux', 'kill-window'])
exit_script() exit_script()