tza/pyren
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

9q fix#10 convert_db

Browse Source
This commit is contained in:
shrlnm 2019-10-24 23:29:20 +03:00
parent d5cbb6aa8a
commit 98bc05ee65
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pyren/convert_db.py
View File

@ -8,8 +8,6 @@ import zipfile
from StringIO import StringIO from StringIO import StringIO
import mod_db_manager import mod_db_manager
mod_db_manager.find_DBs()
from mod_optfile import * from mod_optfile import *
if __name__ == "__main__": if __name__ == "__main__":
@ -22,6 +20,8 @@ if __name__ == "__main__":
if not os.path.exists('./cache'): if not os.path.exists('./cache'):
os.makedirs('./cache') os.makedirs('./cache')
mod_db_manager.find_DBs()
inputpath = sys.argv[1] inputpath = sys.argv[1]
ecudir = os.path.join (inputpath, "EcuRenault") ecudir = os.path.join (inputpath, "EcuRenault")
vehicledir = os.path.join (inputpath, "Vehicles") vehicledir = os.path.join (inputpath, "Vehicles")

4
pyren/mod_db_manager.py
View File

@ -183,6 +183,10 @@ def file_in_ddt( pattern ):
file_list = glob.glob(os.path.join(mod_globals.ddtroot, pattern)) file_list = glob.glob(os.path.join(mod_globals.ddtroot, pattern))
else: else:
file_list = mod_globals.ddt_arc.namelist() file_list = mod_globals.ddt_arc.namelist()
if '(' in pattern:
pattern = pattern.replace('(','\(')
if ')' in pattern:
pattern = pattern.replace(')', '\)')
regex = re.compile(pattern) regex = re.compile(pattern)
li = list(filter(regex.search, file_list)) li = list(filter(regex.search, file_list))
return len(li) return len(li)