From d86d7f1ffbebbc48e42b1afb82fe9b1bc31117c9 Mon Sep 17 00:00:00 2001 From: dekerr Date: Tue, 12 Jun 2018 23:51:46 -0400 Subject: [PATCH] Update generator.py --- generator/generator.py | 61 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/generator/generator.py b/generator/generator.py index 85c273c..f9efc29 100755 --- a/generator/generator.py +++ b/generator/generator.py @@ -3,25 +3,10 @@ import os import re def read_dbc(filename): - with open(os.path.join(dir_name, filename), 'r') as file_in: - return file_in.read() - -cur_path = os.path.dirname(os.path.realpath(__file__)) -generator_path = os.path.join(cur_path, '../') - -include_pattern = re.compile(r'CM_ "IMPORT (.*?)"') - -for dir_name, _, filenames in os.walk(cur_path): - if dir_name == cur_path: - continue - - print dir_name - - for filename in filenames: - if filename.startswith('_'): - continue - - print filename + with open(os.path.join(dir_name, filename), 'r') as file_in: + return file_in.read() + +def create_dbc(filename): dbc_file_in = read_dbc(filename) includes = include_pattern.findall(dbc_file_in) @@ -30,20 +15,38 @@ for dir_name, _, filenames in os.walk(cur_path): output_file_location = os.path.join(generator_path, output_filename) if os.isfile(output_file_location): - os.remove(output_file_location) + os.remove(output_file_location) with open(output_file_location, 'a') as dbc_file_out: - dbc_file_out.write('CM_ "AUTOGENERATED FILE, DO NOT EDIT"\n') + dbc_file_out.write('CM_ "AUTOGENERATED FILE, DO NOT EDIT"\n') - for include_filename in reversed(includes): + for include_filename in reversed(includes): - include_file_header = '\n\nCM_ "Imported file %s starts here"\n' % include_filename - dbc_file_out.write(include_file_header) + include_file_header = '\n\nCM_ "Imported file %s starts here"\n' % include_filename + dbc_file_out.write(include_file_header) - include_file = read_dbc(include_filename) - dbc_file_out.write(include_file) + include_file = read_dbc(include_filename) + dbc_file_out.write(include_file) - dbc_file_out.write('\nCM_ "%s starts here"\n' % filename) + dbc_file_out.write('\nCM_ "%s starts here"\n' % filename) - core_dbc = include_pattern.sub('', dbc_file_in) - dbc_file_out.write(core_dbc) + core_dbc = include_pattern.sub('', dbc_file_in) + dbc_file_out.write(core_dbc) + +cur_path = os.path.dirname(os.path.realpath(__file__)) +generator_path = os.path.join(cur_path, '../') + +include_pattern = re.compile(r'CM_ "IMPORT (.*?)"') + +for dir_name, _, filenames in os.walk(cur_path): + if dir_name == cur_path: + continue + + print dir_name + + for filename in filenames: + if filename.startswith('_'): + continue + + print filename + create_dbc(filename)