From e38ad3418c3f3289609620ff5d2952381347062c Mon Sep 17 00:00:00 2001 From: shrlnm Date: Tue, 22 Oct 2019 10:32:43 +0300 Subject: [PATCH] 9q fix#6 --- pyren/convert_db.py | 3 +++ pyren/mod_db_manager.py | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pyren/convert_db.py b/pyren/convert_db.py index 93a3fb4..6504955 100755 --- a/pyren/convert_db.py +++ b/pyren/convert_db.py @@ -6,6 +6,9 @@ import pickle import sys import zipfile from StringIO import StringIO +import mod_db_manager + +mod_db_manager.find_DBs() from mod_optfile import * diff --git a/pyren/mod_db_manager.py b/pyren/mod_db_manager.py index 263fdaf..9e57f7c 100644 --- a/pyren/mod_db_manager.py +++ b/pyren/mod_db_manager.py @@ -180,10 +180,12 @@ def get_file_list_from_ddt( pattern ): def file_in_ddt( pattern ): 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: 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 ): if mod_globals.ddt_arc=='':