Move every image-related parser into a single file

2 files changed, 23 insertions, 27 deletions

diff --git a/src/images_pixbuf.py b/src/images.py
index 8eeffbe..560886a 100644
--- a/src/images_pixbuf.py
+++ b/src/images.py
@@ -2,12 +2,35 @@ import subprocess
 import json
 import os
 
+import cairo
+
 import gi
 gi.require_version('GdkPixbuf', '2.0')
 from gi.repository import GdkPixbuf
 
 from . import abstract
 
+class PNGParser(abstract.AbstractParser):
+    mimetypes = {'image/png', }
+    meta_whitelist = {'SourceFile', 'ExifToolVersion', 'FileName',
+            'Directory', 'FileSize', 'FileModifyDate', 'FileAccessDate',
+            "FileInodeChangeDate", 'FilePermissions', 'FileType',
+            'FileTypeExtension', 'MIMEType', 'ImageWidth', 'BitDepth', 'ColorType',
+            'Compression', 'Filter', 'Interlace', 'BackgroundColor', 'ImageSize',
+            'Megapixels', 'ImageHeight'}
+
+    def get_meta(self):
+        out = subprocess.check_output(['exiftool', '-json', self.filename])
+        meta = json.loads(out.decode('utf-8'))[0]
+        for key in self.meta_whitelist:
+            meta.pop(key, None)
+        return meta
+
+    def remove_all(self):
+        surface = cairo.ImageSurface.create_from_png(self.filename)
+        surface.write_to_png(self.output_filename)
+        return True
+
 class GdkPixbufAbstractParser(abstract.AbstractParser):
     def get_meta(self):
         out = subprocess.check_output(['exiftool', '-json', self.filename])
diff --git a/src/png.py b/src/png.py
deleted file mode 100644
index 377682e..0000000
--- a/src/png.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import subprocess
-import json
-
-import cairo
-
-from . import abstract
-
-class PNGParser(abstract.AbstractParser):
-    mimetypes = {'image/png', }
-    meta_whitelist = {'SourceFile', 'ExifToolVersion', 'FileName',
-            'Directory', 'FileSize', 'FileModifyDate', 'FileAccessDate',
-            "FileInodeChangeDate", 'FilePermissions', 'FileType',
-            'FileTypeExtension', 'MIMEType', 'ImageWidth', 'BitDepth', 'ColorType',
-            'Compression', 'Filter', 'Interlace', 'BackgroundColor', 'ImageSize',
-            'Megapixels', 'ImageHeight'}
-
-    def get_meta(self):
-        out = subprocess.check_output(['exiftool', '-json', self.filename])
-        meta = json.loads(out.decode('utf-8'))[0]
-        for key in self.meta_whitelist:
-            meta.pop(key, None)
-        return meta
-
-    def remove_all(self):
-        surface = cairo.ImageSurface.create_from_png(self.filename)
-        surface.write_to_png(self.output_filename)
-        return True