Add support for .tiff files

1 files changed, 30 insertions, 11 deletions

diff --git a/src/jpg.py b/src/images_pixbuf.py
index 34fc04c..8eeffbe 100644
--- a/src/jpg.py
+++ b/src/images_pixbuf.py
@@ -1,5 +1,6 @@
 import subprocess
 import json
+import os
 
 import gi
 gi.require_version('GdkPixbuf', '2.0')
@@ -7,16 +8,7 @@ from gi.repository import GdkPixbuf
 
 from . import abstract
 
-class JPGParser(abstract.AbstractParser):
-    mimetypes = {'image/jpg', }
-    meta_whitelist = {'SourceFile', 'ExifToolVersion', 'FileName',
-            'Directory', 'FileSize', 'FileModifyDate', 'FileAccessDate',
-            "FileInodeChangeDate", 'FilePermissions', 'FileType',
-            'FileTypeExtension', 'MIMEType', 'ImageWidth',
-            'ImageSize', 'BitsPerSample', 'ColorComponents', 'EncodingProcess',
-            'JFIFVersion', 'ResolutionUnit', 'XResolution', 'YCbCrSubSampling',
-            'YResolution', 'Megapixels', 'ImageHeight'}
-
+class GdkPixbufAbstractParser(abstract.AbstractParser):
     def get_meta(self):
         out = subprocess.check_output(['exiftool', '-json', self.filename])
         meta = json.loads(out.decode('utf-8'))[0]
@@ -25,6 +17,33 @@ class JPGParser(abstract.AbstractParser):
         return meta
 
     def remove_all(self):
+        _, extension = os.path.splitext(self.filename)
         pixbuf = GdkPixbuf.Pixbuf.new_from_file(self.filename)
-        pixbuf.savev(self.output_filename, "jpeg", ["quality"], ["100"])
+        if extension == '.jpg':
+            extension = '.jpeg'
+        pixbuf.savev(self.output_filename, extension[1:], ["quality"], ["100"])
         return True
+
+
+class JPGParser(GdkPixbufAbstractParser):
+    mimetypes = {'image/jpg'}
+    meta_whitelist = {'SourceFile', 'ExifToolVersion', 'FileName',
+            'Directory', 'FileSize', 'FileModifyDate', 'FileAccessDate',
+            "FileInodeChangeDate", 'FilePermissions', 'FileType',
+            'FileTypeExtension', 'MIMEType', 'ImageWidth',
+            'ImageSize', 'BitsPerSample', 'ColorComponents', 'EncodingProcess',
+            'JFIFVersion', 'ResolutionUnit', 'XResolution', 'YCbCrSubSampling',
+            'YResolution', 'Megapixels', 'ImageHeight'}
+
+
+class TiffParser(GdkPixbufAbstractParser):
+    mimetypes = {'image/tiff'}
+    meta_whitelist = {'Compression', 'ExifByteOrder', 'ExtraSamples',
+            'FillOrder', 'PhotometricInterpretation', 'PlanarConfiguration',
+            'RowsPerStrip', 'SamplesPerPixel', 'StripByteCounts',
+            'StripOffsets', 'BitsPerSample', 'Directory', 'ExifToolVersion',
+            'FileAccessDate', 'FileInodeChangeDate', 'FileModifyDate',
+            'FileName', 'FilePermissions', 'FileSize', 'FileType',
+            'FileTypeExtension', 'ImageHeight', 'ImageSize', 'ImageWidth',
+            'MIMEType', 'Megapixels', 'SourceFile'}
+