9q fix#2

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"
   

pyren/doc_maker.py

@@ -87,22 +87,8 @@ td.row_d {
 mod_globals.os = os.name
  
 if mod_globals.os == 'nt':
-  import pip
+  import serial
-  
+  import colorama
-  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()
   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"
   

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=='':
+    if filename.lower().endswith('bqm') or '/sg' in filename.lower():
-        return open(os.path.join(mod_globals.cliproot, filename), 'r')
+        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=='':

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

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"

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
+    len = len * 2
-    while j<len:
+    while j < len:
-      x = struct.unpack('<H', bytes[j:j+2])[0]
+      x = struct.unpack('<H', bytes[j:j + 2])[0]
-      if self.obf: x=x^(i&0xFFFF)^0x5555
+      if self.obf: x = x ^ (i & 0xFFFF) ^ 0x5555
       j += 2
       i += 2
       st += unichr(x)
-    
+
     return st
-    
+
   def get_2_bytes(self,lf):
 
     i = lf.tell()
@@ -101,9 +102,9 @@ class optfile:
       strl = self.get_4_bytes(lf)
       keyl = self.get_4_bytes(lf)
       n = n + 1
-      
+
       key = self.get_string(lf,keyl)
-      
+
       lf.seek(addr)
       line = self.get_string(lf,strl)
       line = line.strip()

pyren/mod_scan_ecus.py

@@ -74,7 +74,7 @@ class ScanEcus:
     ####### Get list car models from vehicles directory #######
     self.vhcls  = []
 
-    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[-7:-4])
@@ -976,7 +976,7 @@ def findTCOM( addr, cmd, rsp ):
   ecuvhc = {}
   vehicle = ''
   print 'Read models'
-  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:
     vehicle = ''
     DOMTree = xml.dom.minidom.parse(mod_db_manager.get_file_from_clip(file))

pyren/pyren.py

@@ -12,7 +12,7 @@ import pickle
 
 if mod_globals.os == 'nt':
   import pip
-  
+
   try:
     import serial
   except ImportError: