From 98bc05ee65718f69513f65f505a0846638141cc8 Mon Sep 17 00:00:00 2001 From: shrlnm Date: Thu, 24 Oct 2019 23:29:20 +0300 Subject: [PATCH] 9q fix#10 convert_db --- pyren/convert_db.py | 4 ++-- pyren/mod_db_manager.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pyren/convert_db.py b/pyren/convert_db.py index dec482e..f86f38d 100755 --- a/pyren/convert_db.py +++ b/pyren/convert_db.py @@ -8,8 +8,6 @@ import zipfile from StringIO import StringIO import mod_db_manager -mod_db_manager.find_DBs() - from mod_optfile import * if __name__ == "__main__": @@ -22,6 +20,8 @@ if __name__ == "__main__": if not os.path.exists('./cache'): os.makedirs('./cache') + mod_db_manager.find_DBs() + inputpath = sys.argv[1] ecudir = os.path.join (inputpath, "EcuRenault") vehicledir = os.path.join (inputpath, "Vehicles") diff --git a/pyren/mod_db_manager.py b/pyren/mod_db_manager.py index 9e57f7c..d788b87 100644 --- a/pyren/mod_db_manager.py +++ b/pyren/mod_db_manager.py @@ -183,6 +183,10 @@ def file_in_ddt( pattern ): file_list = glob.glob(os.path.join(mod_globals.ddtroot, pattern)) else: file_list = mod_globals.ddt_arc.namelist() + if '(' in pattern: + pattern = pattern.replace('(','\(') + if ')' in pattern: + pattern = pattern.replace(')', '\)') regex = re.compile(pattern) li = list(filter(regex.search, file_list)) return len(li)