clean utils a little

This commit is contained in:
oleting
2021-02-09 16:54:51 +01:00
parent 45ee7012f3
commit 6d8c468b4e

View File

@@ -16,19 +16,11 @@ import logging
#types=types, remove_tages=modifier, comments=comments
def nassi(input_path: str, output_path: str, outputname: str, types, remove_tags, comments, gui, behaviour: Overwrite_behaviour, font_filepath: Optional[str]=None):
NSD = NassiShneidermanDiagram(gui.debug_mode)
output_directory = output_path + '/' + outputname
output_directory = check_and_create_output_directory(output_path + '/' + outputname)
if font_filepath != None:
NSD.set_font(font_filepath)
try:
if not os.path.exists(output_directory):
os.makedirs(output_directory)
except OSError:
logging.error('Error: Creating directory. ' + output_directory)
except:
raise
custom_tags = {"comments" : comments, "ignore" : remove_tags, "types" : types}
is_empty = NSD.load_from_file(input_path, custom_tags)
@@ -37,11 +29,20 @@ def nassi(input_path: str, output_path: str, outputname: str, types, remove_tags
cancel = one_line_progress_meter('Progress', scopes_index, len(NSD.function_scopes), '-PROGRESSBAR-')
if not cancel:
break
break
return output_directory, is_empty
def check_and_create_output_directory(output_directory):
try:
if not os.path.exists(output_directory):
os.makedirs(output_directory)
except Exception as e:
logging.error(e+ ': ' + output_directory)
raise
return output_directory
def output(output_path, output_name=None):