oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use SafeRe to match file patterns in dbschema.json

Browse source
This commit is contained in:
shortcutme 2017-07-14 10:34:57 +02:00
parent c069d4f67c
commit 74763465a8
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Db/Db.py
View file

@ -8,6 +8,7 @@ import gevent
from DbCursor import DbCursor from DbCursor import DbCursor
from Config import config from Config import config
from util import SafeRe
opened_dbs = [] opened_dbs = []
@ -230,8 +231,11 @@ class Db(object):
# Check if filename matches any of mappings in schema # Check if filename matches any of mappings in schema
matched_maps = [] matched_maps = []
for match, map_settings in self.schema["maps"].items(): for match, map_settings in self.schema["maps"].items():
if re.match(match, relative_path): try:
if SafeRe.match(match, relative_path):
matched_maps.append(map_settings) matched_maps.append(map_settings)
except SafeRe.UnsafePatternError as err:
self.log.error(err)
# No match found for the file # No match found for the file
if not matched_maps: if not matched_maps: