Skip to content

Commit c2936b7

Browse files
committed
Close debug window, refactoring, more debug info
1 parent 2e47fd8 commit c2936b7

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

Modules/download_element.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def __init__(self, working_dir: str, program_path: str, commands: list, info='',
4545
self.potential_error_log = ''
4646
# Raw logs from program. TODO: Maybe add some info here when initializing, plus return code perhaps?
4747
self.debug_log = []
48+
self.debug_log.append(' '.join(commands) + '\n')
4849
self.done = False
4950

5051
self.program_log = deque(maxlen=3)
@@ -67,6 +68,7 @@ def program_state_changed(self, new_state):
6768
else:
6869
self.status = 'Finished'
6970
self.progress = '100%'
71+
7072
self.eta = ''
7173
self.filesize = ''
7274
self.speed = ''

core.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -839,10 +839,7 @@ def queue_download(self):
839839

840840
else:
841841
if options['state']:
842-
if self.settings.get_active_setting(parameter):
843-
option = self.settings.get_active_setting(parameter)
844-
else:
845-
option = ''
842+
option = self.settings.get_active_setting(parameter)
846843
add = format_in_list(options['command'], option)
847844
command += add
848845

@@ -985,6 +982,10 @@ def do_proper_shutdown():
985982
"""Ensures that the settings are saved properly before exiting!"""
986983

987984
nonlocal self
985+
for item in self.tab1.process_list.iter_items():
986+
if item._open_window is not None:
987+
item._open_window.close()
988+
988989
self.hide()
989990
self.file_handler.force_save = True
990991
self.file_handler.save_settings(self.settings.settings_data)
@@ -1041,7 +1042,7 @@ def do_proper_shutdown():
10411042

10421043
warning = QMessageBox.warning(None,
10431044
f'Corruption of {file}!',
1044-
''.join([str(e), '\nRestore to defaults?']),
1045+
f'{e}\nRestore to defaults?',
10451046
buttons=QMessageBox.Yes | QMessageBox.No)
10461047

10471048
if warning == QMessageBox.Yes:

utils/utilities.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ def get_active_setting(self, parameter):
232232
if '{}' in param['command']:
233233
active = param['active option']
234234
return param['options'][active]
235+
else:
236+
return ''
235237

236238
@property
237239
def parameters(self) -> dict:

0 commit comments

Comments
 (0)