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

9q fix#6

Browse Source
This commit is contained in:
shrlnm 2019-10-22 10:32:43 +03:00
parent 447d267918
commit e38ad3418c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pyren/convert_db.py
View File

@ -6,6 +6,9 @@ import pickle
import sys import sys
import zipfile import zipfile
from StringIO import StringIO from StringIO import StringIO
import mod_db_manager
mod_db_manager.find_DBs()
from mod_optfile import * from mod_optfile import *

6
pyren/mod_db_manager.py
View File

@ -180,10 +180,12 @@ def get_file_list_from_ddt( pattern ):
def file_in_ddt( pattern ): def file_in_ddt( pattern ):
if mod_globals.ddt_arc=='': if mod_globals.ddt_arc=='':
return pattern in 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()
return pattern in file_list regex = re.compile(pattern)
li = list(filter(regex.search, file_list))
return len(li)
def path_in_ddt( pattern ): def path_in_ddt( pattern ):
if mod_globals.ddt_arc=='': if mod_globals.ddt_arc=='':