voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove a lot of the commented code from earlier search.

Browse source
This commit is contained in:
voussoir 2018-02-04 15:11:46 -08:00
parent 6f4530c88c
commit bc4e228a25
1 changed files with 0 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
etiquette/photodb.py
View file

@ -596,7 +596,6 @@ class PDBPhotoMixin:
tag_forbids, tag_forbids,
frozen_children, frozen_children,
) )
#print('mmf accept:', mmf_results)
else: else:
mmf_results = None mmf_results = None
@ -628,7 +627,6 @@ class PDBPhotoMixin:
) )
) )
if not ext_okay: if not ext_okay:
#print('Failed extension')
continue continue
ext_fail = ( ext_fail = (
@ -639,46 +637,21 @@ class PDBPhotoMixin:
) )
) )
if ext_fail: if ext_fail:
#print('Failed extension_not')
continue continue
if mimetype and photo.simple_mimetype not in mimetype: if mimetype and photo.simple_mimetype not in mimetype:
#print('Failed mimetype')
continue continue
# if authors and photo.author_id not in authors:
# #print('Failed author')
# continue
if filename_tree and not filename_tree.evaluate(photo.basename.lower()): if filename_tree and not filename_tree.evaluate(photo.basename.lower()):
#print('Failed filename')
continue continue
# if any(
# fetch[constants.SQL_PHOTO[key]] is None or
# fetch[constants.SQL_PHOTO[key]] > value
# for (key, value) in maximums.items()
# ):
# #print('Failed maximums')
# continue
# if any(
# fetch[constants.SQL_PHOTO[key]] is None or
# fetch[constants.SQL_PHOTO[key]] < value
# for (key, value) in minimums.items()
# ):
# #print('Failed minimums')
# continue
if (has_tags is not None) or is_tagsearch: if (has_tags is not None) or is_tagsearch:
photo_tags = set(photo.tags()) photo_tags = set(photo.tags())
if has_tags is False and len(photo_tags) > 0: if has_tags is False and len(photo_tags) > 0:
#print('Failed has_tags=False')
continue continue
if has_tags is True and len(photo_tags) == 0: if has_tags is True and len(photo_tags) == 0:
#print('Failed has_tags=True')
continue continue
if tag_expression: if tag_expression:
@ -687,24 +660,8 @@ class PDBPhotoMixin:
match_function=tag_match_function, match_function=tag_match_function,
) )
if not success: if not success:
#print('Failed tag expression')
continue continue
# elif is_must_may_forbid:
# if photo.id not in mmf_results:
# #print('Failed tag mmf')
# continue
# success = searchfilter_must_may_forbid(
# photo_tags=photo_tags,
# tag_musts=tag_musts,
# tag_mays=tag_mays,
# tag_forbids=tag_forbids,
# frozen_children=frozen_children,
# )
# if not success:
# #print('Failed tag mmf')
# continue
if offset > 0: if offset > 0:
offset -= 1 offset -= 1
continue continue