Condense PIL

Author: kg583

tivars/PIL/TI8caPlugin.py

@@ -1,4 +1,3 @@
-from PIL import Image
 from tivars import TIImage
 from .common import *
 
@@ -10,24 +9,8 @@ class TI8caImageFile(TIImageFile):
     format_description = "TI (e)Z80 Image Format"
 
 
-class TI8caEncoder(ImageFile.PyEncoder):
-    _pushes_fd = True
-
-    def encode(self, bufsize):
-        img = TIImage()
-        img.load_array(np.asarray(self.im).reshape((img.height, img.width)).tolist())
-        data = img.export().bytes()
-
-        return len(data), 0, data
-
-
-def save(im, fp, *args, **kwargs):
-    ImageFile._save(im, fp, [(TI8caImageFile.format, (0, 0) + im.size, 0, im.mode)])
-
+class TI8caEncoder(TIEncoder):
+    _T = TIImage
 
-Image.register_open(TI8caImageFile.format, TI8caImageFile, accept)
-Image.register_extension(TI8caImageFile.format, "." + TI8caImageFile.format)
-Image.register_decoder(TI8caImageFile.format, TIDecoder)
 
-Image.register_save(TI8caImageFile.format, save)
-Image.register_encoder(TI8caImageFile.format, TI8caEncoder)
+register(TI8caImageFile, TI8caEncoder)

tivars/PIL/TI8ciPlugin.py

@@ -1,4 +1,3 @@
-from PIL import Image
 from tivars import TIPicture
 from .common import *
 
@@ -10,24 +9,8 @@ class TI8ciImageFile(TIImageFile):
     format_description = "TI (e)Z80 Color Picture Format"
 
 
-class TI8ciEncoder(ImageFile.PyEncoder):
-    _pushes_fd = True
-
-    def encode(self, bufsize):
-        img = TIPicture()
-        img.load_array(np.asarray(self.im).reshape((img.height, img.width)).tolist())
-        data = img.export().bytes()
-
-        return len(data), 0, data
-
-
-def save(im, fp, *args, **kwargs):
-    ImageFile._save(im, fp, [(TI8ciImageFile.format, (0, 0) + im.size, 0, im.mode)])
-
+class TI8ciEncoder(TIEncoder):
+    _T = TIPicture
 
-Image.register_open(TI8ciImageFile.format, TI8ciImageFile, accept)
-Image.register_extension(TI8ciImageFile.format, "." + TI8ciImageFile.format)
-Image.register_decoder(TI8ciImageFile.format, TIDecoder)
 
-Image.register_save(TI8ciImageFile.format, save)
-Image.register_encoder(TI8ciImageFile.format, TI8ciEncoder)
+register(TI8ciImageFile, TI8ciEncoder)

tivars/PIL/TI8xiPlugin.py

@@ -1,4 +1,3 @@
-from PIL import Image
 from tivars import TIMonoPicture
 from .common import *
 
@@ -10,24 +9,8 @@ class TI8xiImageFile(TIImageFile):
     format_description = "TI (e)Z80 Monochrome Picture Format"
 
 
-class TI8xiEncoder(ImageFile.PyEncoder):
-    _pushes_fd = True
-
-    def encode(self, bufsize):
-        img = TIMonoPicture()
-        img.load_array(np.asarray(self.im).reshape((img.height, img.width)).tolist())
-        data = img.export().bytes()
-
-        return len(data), 0, data
-
-
-def save(im, fp, *args, **kwargs):
-    ImageFile._save(im, fp, [(TI8xiImageFile.format, (0, 0) + im.size, 0, im.mode)])
-
+class TI8xiEncoder(TIEncoder):
+    _T = TIMonoPicture
 
-Image.register_open(TI8xiImageFile.format, TI8xiImageFile, accept)
-Image.register_extension(TI8xiImageFile.format, "." + TI8xiImageFile.format)
-Image.register_decoder(TI8xiImageFile.format, TIDecoder)
 
-Image.register_save(TI8xiImageFile.format, save)
-Image.register_encoder(TI8xiImageFile.format, TI8xiEncoder)
+register(TI8xiImageFile, TI8xiEncoder)

tivars/PIL/common.py

@@ -1,7 +1,7 @@
 import numpy as np
 import warnings
 
-from PIL import ImageFile
+from PIL import Image, ImageFile
 from tivars import TIVar
 from tivars.types.picture import PictureEntry
 
@@ -10,6 +10,15 @@ def accept(prefix):
     return prefix[:8] in (b"**TI82**", b"**TI83**", b"**TI83F*")
 
 
+def register(file, encoder):
+    Image.register_open(file.format, file, accept)
+    Image.register_extension(file.format, "." + file.format)
+    Image.register_decoder(file.format, TIDecoder)
+
+    Image.register_save(file.format, file._save)
+    Image.register_encoder(file.format, encoder)
+
+
 class TIImageFile(ImageFile.ImageFile):
     _T = PictureEntry
 
@@ -31,6 +40,10 @@ def _open(self):
 
             self.tile = [(self.format, (0, 0) + self.size, 0, None)]
 
+    @classmethod
+    def _save(cls, im, fp, format=None, **params):
+        ImageFile._save(im, fp, format, [(cls.format, (0, 0) + im.size, 0, im.mode)])
+
 
 class TIDecoder(ImageFile.PyDecoder):
     def decode(self, buffer):
@@ -39,3 +52,16 @@ def decode(self, buffer):
         self.set_as_raw(np.asarray(var.entries[0].array(), dtype=np.uint8))
 
         return -1, 0
+
+
+class TIEncoder(ImageFile.PyEncoder):
+    _pushes_fd = True
+
+    _T = PictureEntry
+
+    def encode(self, bufsize):
+        img = self._T()
+        img.load_array(np.asarray(self.im).reshape((img.height, img.width)).tolist())
+        data = img.export().bytes()
+
+        return len(data), 0, data