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

Add new_photo_kwargs param to digest_directory.

Browse source
This commit is contained in:
voussoir 2017-06-16 02:23:48 -07:00
parent 56655d2cd0
commit fcd507e337
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
etiquette/photodb.py
View file

@ -1174,6 +1174,7 @@ class PhotoDB(PDBAlbumMixin, PDBBookmarkMixin, PDBPhotoMixin, PDBTagMixin, PDBUs
exclude_directories=None, exclude_directories=None,
exclude_filenames=None, exclude_filenames=None,
make_albums=True, make_albums=True,
new_photo_kwargs={},
recurse=True, recurse=True,
commit=True, commit=True,
): ):
@ -1192,6 +1193,11 @@ class PhotoDB(PDBAlbumMixin, PDBBookmarkMixin, PDBPhotoMixin, PDBTagMixin, PDBUs
if exclude_filenames is None: if exclude_filenames is None:
exclude_filenames = self.config['digest_exclude_files'] exclude_filenames = self.config['digest_exclude_files']
if 'commit' in new_photo_kwargs:
new_photo_kwargs.pop('commit')
if 'filepath' in new_photo_kwargs:
new_photo_kwargs.pop('filepath')
directory.correct_case() directory.correct_case()
generator = spinal.walk_generator( generator = spinal.walk_generator(
directory, directory,
@ -1219,7 +1225,7 @@ class PhotoDB(PDBAlbumMixin, PDBBookmarkMixin, PDBPhotoMixin, PDBTagMixin, PDBUs
try: try:
photo = self.get_photo_by_path(filepath) photo = self.get_photo_by_path(filepath)
except exceptions.NoSuchPhoto: except exceptions.NoSuchPhoto:
photo = self.new_photo(filepath.absolute_path, commit=False) photo = self.new_photo(filepath.absolute_path, commit=False, **new_photo_kwargs)
new_photos.append(photo) new_photos.append(photo)
if not make_albums: if not make_albums: