diff --git a/pyren/cmdr_example.py b/pyren/cmdr_example.py index 40eace0..822969f 100755 --- a/pyren/cmdr_example.py +++ b/pyren/cmdr_example.py @@ -67,7 +67,7 @@ def prepareECU(): print "Loading language " sys.stdout.flush() #loading language data - lang = optfile("../Location/DiagOnCAN_"+mod_globals.opt_lang+".bqm",True) + lang = optfile("Location/DiagOnCAN_"+mod_globals.opt_lang+".bqm",True) mod_globals.language_dict = lang.dict print "Done" diff --git a/pyren/doc_maker.py b/pyren/doc_maker.py index 12d2bd3..a3e2432 100755 --- a/pyren/doc_maker.py +++ b/pyren/doc_maker.py @@ -87,22 +87,8 @@ td.row_d { mod_globals.os = os.name if mod_globals.os == 'nt': - import pip - - try: - import serial - except ImportError: - pip.main(['install','pyserial']) - - try: - import colorama - except ImportError: - pip.main(['install','colorama']) - try: - import colorama - except ImportError: - print "\n\n\n\t\t\tGive me access to the Internet for download modules\n\n\n" - sys.exit() + import serial + import colorama colorama.init() else: # let's try android @@ -771,7 +757,7 @@ def main(): sys.stdout.flush() #loading language data - lang = optfile("../Location/DiagOnCan_"+mod_globals.opt_lang+".bqm",True) + lang = optfile("Location/DiagOnCan_"+mod_globals.opt_lang+".bqm",True) mod_globals.language_dict = lang.dict print "Done" diff --git a/pyren/mod_db_manager.py b/pyren/mod_db_manager.py index 4b99a02..c7e11db 100644 --- a/pyren/mod_db_manager.py +++ b/pyren/mod_db_manager.py @@ -122,15 +122,22 @@ def get_file_list_from_clip( pattern ): if mod_globals.clip_arc=='': return glob.glob(os.path.join(mod_globals.cliproot, pattern)) else: + if '*' in pattern: + pattern = pattern.replace('*', '\d{3}') file_list = mod_globals.clip_arc.namelist() regex = re.compile(pattern) return list(filter(regex.search, file_list)) def get_file_from_clip( filename ): - if mod_globals.clip_arc=='': - return open(os.path.join(mod_globals.cliproot, filename), 'r') + if filename.lower().endswith('bqm') or '/sg' in filename.lower(): + mode = 'rb' else: - return mod_globals.clip_arc.open(filename, 'r') + mode = 'r' + + if mod_globals.clip_arc=='': + return open(os.path.join(mod_globals.cliproot, filename), mode) + else: + return mod_globals.clip_arc.open(filename, mode) def file_in_clip( pattern ): if mod_globals.clip_arc=='': diff --git a/pyren/mod_dfg.py b/pyren/mod_dfg.py index 6079a84..df89c64 100755 --- a/pyren/mod_dfg.py +++ b/pyren/mod_dfg.py @@ -53,7 +53,7 @@ class class_dfg: #find TCOM by platform if platform!='': - file_list = mod_db_manager.get_file_list_from_clip('Vehicles/TCOM_\d{3}.[Xx]ml') + file_list = mod_db_manager.get_file_list_from_clip('Vehicles/TCOM_*.[Xx]ml') for file in file_list: try: model_n = int(file[17:20]) @@ -71,7 +71,7 @@ class class_dfg: self.dfgFile = 'Vehicles/DFG/DFG_'+self.tcom+'.xml' else: vhcls = [] - file_list = mod_db_manager.get_file_list_from_clip('Vehicles/DFG/DFG_\d{3}.[Xx]ml') + file_list = mod_db_manager.get_file_list_from_clip('Vehicles/DFG/DFG_*.[Xx]ml') for file in file_list: DOMTree = xml.dom.minidom.parse(mod_db_manager.get_file_from_clip(file)) vh = DOMTree.documentElement diff --git a/pyren/mod_ecu.py b/pyren/mod_ecu.py index 866f594..070c648 100755 --- a/pyren/mod_ecu.py +++ b/pyren/mod_ecu.py @@ -972,8 +972,9 @@ def main(): print "Loading optimyzer" sys.stdout.flush() - opt_file = optfile(mod_db_manager.get_file_from_clip(sgfile)) - + #opt_file = optfile(mod_db_manager.get_file_from_clip(sgfile)) + opt_file = optfile(sgfile) + print "Loading defaults" df_class = ecu_defaults ( Defaults, mdoc, opt_file.dict, lang.dict ) print "Loading parameters" diff --git a/pyren/mod_optfile.py b/pyren/mod_optfile.py index d478747..e250d26 100755 --- a/pyren/mod_optfile.py +++ b/pyren/mod_optfile.py @@ -35,28 +35,29 @@ class optfile: return lf = mod_db_manager.get_file_from_clip( filename ) + if lf: self.get_dict( lf, progress ) if cache: pickle.dump( self.dict, open( cachename, "wb" ) ) - - def get_string(self,lf,len): + + def get_string(self, lf, len): i = lf.tell() - bytes = lf.read(2*len) - + bytes = lf.read(2 * len) + st = '' j = 0 - len = len*2 - while j