diff --git a/src/images_pixbuf.py b/src/images.py
similarity index 68%
rename from src/images_pixbuf.py
rename to src/images.py
index 8eeffbec46edfee04aed2e81c44325e4e596138b..560886ac3580f7cca294942946c7559586be3d70 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 377682eb706ba03fb75bf9d75a0c09e7a5fe75bb..0000000000000000000000000000000000000000
--- 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
diff --git a/tests/test_libmat2.py b/tests/test_libmat2.py
index 5b7dfb1e8ad30bb8da9aa43b836d7e1dccd43c19..8aa91f01a23381f589dbbc1c874b355938977230 100644
--- a/tests/test_libmat2.py
+++ b/tests/test_libmat2.py
@@ -6,7 +6,7 @@ import os
import zipfile
import tempfile
-from src import pdf, png, images_pixbuf, audio, office, parser_factory
+from src import pdf, images, audio, office, parser_factory
class TestGetMeta(unittest.TestCase):
def test_pdf(self):
@@ -16,18 +16,18 @@ class TestGetMeta(unittest.TestCase):
self.assertEqual(meta['creator'], "'Certified by IEEE PDFeXpress at 03/19/2016 2:56:07 AM'")
def test_png(self):
- p = png.PNGParser('./tests/data/dirty.png')
+ p = images.PNGParser('./tests/data/dirty.png')
meta = p.get_meta()
self.assertEqual(meta['Comment'], 'This is a comment, be careful!')
self.assertEqual(meta['ModifyDate'], "2018:03:20 21:59:25")
def test_jpg(self):
- p = images_pixbuf.JPGParser('./tests/data/dirty.jpg')
+ p = images.JPGParser('./tests/data/dirty.jpg')
meta = p.get_meta()
self.assertEqual(meta['Comment'], 'Created with GIMP')
def test_tiff(self):
- p = images_pixbuf.JPGParser('./tests/data/dirty.tiff')
+ p = images.JPGParser('./tests/data/dirty.tiff')
meta = p.get_meta()
self.assertEqual(meta['Make'], 'OLYMPUS IMAGING CORP.')
self.assertEqual(meta['Model'], 'C7070WZ')
@@ -144,7 +144,7 @@ class TestCleaning(unittest.TestCase):
def test_png(self):
shutil.copy('./tests/data/dirty.png', './tests/data/clean.png')
- p = png.PNGParser('./tests/data/clean.png')
+ p = images.PNGParser('./tests/data/clean.png')
meta = p.get_meta()
self.assertEqual(meta['Comment'], 'This is a comment, be careful!')
@@ -152,14 +152,14 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all()
self.assertTrue(ret)
- p = png.PNGParser('./tests/data/clean.png.cleaned')
+ p = images.PNGParser('./tests/data/clean.png.cleaned')
self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.png')
def test_jpg(self):
shutil.copy('./tests/data/dirty.jpg', './tests/data/clean.jpg')
- p = images_pixbuf.JPGParser('./tests/data/clean.jpg')
+ p = images.JPGParser('./tests/data/clean.jpg')
meta = p.get_meta()
self.assertEqual(meta['Comment'], 'Created with GIMP')
@@ -167,7 +167,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all()
self.assertTrue(ret)
- p = images_pixbuf.JPGParser('./tests/data/clean.jpg.cleaned')
+ p = images.JPGParser('./tests/data/clean.jpg.cleaned')
self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.jpg')
@@ -250,7 +250,7 @@ class TestCleaning(unittest.TestCase):
def test_tiff(self):
shutil.copy('./tests/data/dirty.tiff', './tests/data/clean.tiff')
- p = images_pixbuf.TiffParser('./tests/data/clean.tiff')
+ p = images.TiffParser('./tests/data/clean.tiff')
meta = p.get_meta()
self.assertEqual(meta['Model'], 'C7070WZ')
@@ -258,7 +258,7 @@ class TestCleaning(unittest.TestCase):
ret = p.remove_all()
self.assertTrue(ret)
- p = images_pixbuf.TiffParser('./tests/data/clean.tiff.cleaned')
+ p = images.TiffParser('./tests/data/clean.tiff.cleaned')
self.assertEqual(p.get_meta(), {})
os.remove('./tests/data/clean.tiff')