digest_directory excludes extend defaults instead of overriding them.

With this change, there is currently no way to specify that I actually
want to include thumbs.db etc, but I think the likelikhood of wanting
to extend the defaults greatly exceeds wanting to overrid them.
This commit is contained in:
voussoir 2020-02-27 14:17:30 -08:00
parent 30a0715980
commit 961ece0081

View file

@ -1133,13 +1133,13 @@ class PDBUtilMixin:
return directory return directory
def _normalize_exclude_directories(exclude_directories): def _normalize_exclude_directories(exclude_directories):
if exclude_directories is None: exclude_directories = exclude_directories or []
exclude_directories = self.config['digest_exclude_dirs'] exclude_directories.extend(self.config['digest_exclude_dirs'])
return exclude_directories return exclude_directories
def _normalize_exclude_filenames(exclude_filenames): def _normalize_exclude_filenames(exclude_filenames):
if exclude_filenames is None: exclude_filenames = exclude_filenames or []
exclude_filenames = self.config['digest_exclude_files'] exclude_filenames.extend(self.config['digest_exclude_files'])
return exclude_filenames return exclude_filenames
def _normalize_new_photo_kwargs(new_photo_kwargs): def _normalize_new_photo_kwargs(new_photo_kwargs):