Added piexif dependency, imported it, config option for EXIF scrubbing

getnikola · Apr 24, 2016 · 40a2e70 · 40a2e70
1 parent 947b745
commit 40a2e70
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,8 @@ Features
 --------
 
 * Template-based shortcodes now receive positional arguments too (Issue #2319)
+* Selective EXIF scrubbing (Issue #2323)
+* New EXIF_SCRUB_FIELDS option (Issue #2323)
 
 Bugfixes
 --------

diff --git a/nikola/conf.py.in b/nikola/conf.py.in
@@ -573,6 +573,10 @@ GITHUB_COMMIT_SOURCE = True
 # resized.
 # PRESERVE_EXIF_DATA = False
 
+# List of EXIF field names to scrub from images. Only useful when PRESERVE_EXIF_DATA
+# is True.
+# EXIF_SCRUB_FIELDS = []
+
 #
 # Folders containing images to be used in normal posts or pages. Images will be
 # scaled down according to IMAGE_THUMBNAIL_SIZE and MAX_IMAGE_SIZE options, but

diff --git a/nikola/image_processing.py b/nikola/image_processing.py
@@ -45,6 +45,10 @@
         Image = _Image
     except ImportError:
         pass
+try:
+    import piexif
+except ImportError:
+    piexif = None
 
 
 class ImageProcessor(object):

diff --git a/requirements-extras.txt b/requirements-extras.txt
@@ -12,3 +12,4 @@ ipykernel>=4.0.0
 ghp-import2>=1.0.0
 ws4py==0.3.4
 watchdog==0.8.3
+piexif==1.0.3