From 791172e0730d320fd0618080e557ff87bc43f0d1 Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Thu, 23 Mar 2017 15:49:55 -0700 Subject: [PATCH] Support extension=* search, to filter extensionless files --- etiquette/photodb.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/etiquette/photodb.py b/etiquette/photodb.py index a64bebb..8731806 100644 --- a/etiquette/photodb.py +++ b/etiquette/photodb.py @@ -797,7 +797,14 @@ class PDBPhotoMixin: for fetch in generator: photo = objects.Photo(self, fetch) - if extension and photo.extension not in extension: + ext_okay = ( + not extension or + ( + ('*' in extension and photo.extension) or + photo.extension in extension + ) + ) + if not ext_okay: #print('Failed extension') continue @@ -805,7 +812,7 @@ class PDBPhotoMixin: extension_not and ( ('*' in extension_not and photo.extension) or - (photo.extension in extension_not) + photo.extension in extension_not ) ) if ext_fail: