ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

properly define regex strings

Browse Source
This commit is contained in:
Damien De Paoli
2024-03-10 23:52:24 +11:00
parent 063c75809a
commit 2665ab086e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pa_job_manager.py
View File

@@ -2296,7 +2296,7 @@ def ReloadMetadata(job):
fnames = glob.glob( f'{mpath}/no_match_overrides/*' ) fnames = glob.glob( f'{mpath}/no_match_overrides/*' )
for fname in fnames: for fname in fnames:
# type derived from fname (e.g. 0_Too Young_md5*, 1_Too Young, 2_Ingore Face, etc.) # type derived from fname (e.g. 0_Too Young_md5*, 1_Too Young, 2_Ingore Face, etc.)
match=re.search( '(\d+)_([^_\.]+)', fname ) match=re.search( r'(\d+)_([^_\.]+)', fname )
face_id=match.group(1) face_id=match.group(1)
type_name=match.group(2) type_name=match.group(2)
otype = session.query(FaceOverrideType).filter(FaceOverrideType.name==type_name).one() otype = session.query(FaceOverrideType).filter(FaceOverrideType.name==type_name).one()
@@ -2321,7 +2321,7 @@ def ReloadMetadata(job):
fnames = glob.glob( f'{mpath}force_match_overrides/*' ) fnames = glob.glob( f'{mpath}force_match_overrides/*' )
for fname in fnames: for fname in fnames:
# person derived from fname (e.g. 0_ddp_md5*, 1_ddp, 2_mich, etc.) # person derived from fname (e.g. 0_ddp_md5*, 1_ddp, 2_mich, etc.)
match=re.search( '(\d+)_([^_]+)', fname ) match=re.search( r'(\d+)_([^_]+)', fname )
face_id=match.group(1) face_id=match.group(1)
person_tag=match.group(2) person_tag=match.group(2)
p = session.query(Person).filter(Person.tag==person_tag).first() p = session.query(Person).filter(Person.tag==person_tag).first()