minor fixes

1 files changed, 25 insertions, 58 deletions

diff --git a/imgrid.py b/imgrid.py
index a751b6b..5a893f7 100755
--- a/imgrid.py
+++ b/imgrid.py
@@ -121,7 +121,7 @@ class Imgrid():
         self.now = now()
         self.files_created = []
         self.commands = [];
-        self.required_keys = [
+        self._required_keys = [
 #{{{ required_keys
             "width",
             "height",
@@ -148,7 +148,7 @@ class Imgrid():
             "username"
 #}}}
         ]
-        for k in self.required_keys:
+        for k in self._required_keys:
             if k in params:
                 if k in [ 'bgimage', 'planebgimage', 'imageinstead' ] and bool_correct(params[k]):
                     self.params[k] = {}
@@ -168,6 +168,8 @@ class Imgrid():
                     except Exception as e:
                         sys.stderr.write(str(e))
                         raise;
+                elif k in [ 'bgcolor', 'planebgcolor' ]:
+                    self.params[k] = params[k]
                 else:
                     self.params[k] = bool_correct(sanitize(params[k]))
             else:
@@ -190,6 +192,16 @@ class Imgrid():
             self.params.username or ""
         );
 
+    def _call_cmd(self, cmd, error=""):
+        try:
+            call(cmd)
+            self.commands.append(" ".join(cmd)); 
+        except Exception as e:
+            if error:
+                sys.stderr.write(error)
+            else:
+                sys.stderr.write(str(e))
+
     #makes a canvas file...step 1 (if not bgimage)
     def _make_canvas(self):
         dimensions = "{}x{}".format(
@@ -200,12 +212,7 @@ class Imgrid():
             return 
         bgcolor = "xc:{}".format(self.params.bgcolor or 'transparent')
         cmd = [ BIN_CONVERT, "-size", dimensions, bgcolor, self.filepath ]
-        try:
-            call(cmd)            
-            self.commands.append(" ".join(cmd))
-        except Exception as e:
-            sys.stderr.write(str(e))
-            raise;
+        self._call_cmd(cmd)
 
     #2nd step-- run grid
     def _grid_command(self):
@@ -223,12 +230,7 @@ class Imgrid():
         if self.params.linethickness: cmd += ['-t',self.params.linethickness]
         if self.params.opacity: cmd += ['-o',self.params.opacity]
         cmd += [ self.filepath, self.filepath ]
-        try:
-            call(cmd)
-            self.commands.append(" ".join(cmd))
-        except Exception as e:
-            sys.stderr.write(str(e))
-            raise; 
+        self._call_cmd(cmd)
     
     def _shadow_cmd(self):
     #convert 1.png \( +clone -background black -shadow 110x1+9+9 \) +swap -background none -layers merge +repage 2.png
@@ -239,12 +241,7 @@ class Imgrid():
             "+swap","-background","none","-layers","merge","+repage" ,
             self.filepath
         ]
-        try:
-            call(cmd)
-            self.commands.append(" ".join(cmd))
-        except Exception as e:
-            sys.stderr.write(str(e))
-            raise; 
+        self._call_cmd(cmd)
             
     
     def _threed_rotate_cmd (self):
@@ -263,40 +260,20 @@ class Imgrid():
         cmd += ["skycolor={}".format(self.params.skycolor or 'none')]
         if self.params.transition: cmd += ["vp={}",self.params.transition]
         cmd += [ self.filepath, self.filepath ]
-        try:
-            call(cmd)
-            self.commands.append(" ".join(cmd))
-        except Exception as e:
-            sys.stderr.write(str(e))
-            raise
+        self._call_cmd(cmd)
+
 
     def _trim_cmd (self):
-        if self.params.trim:
-            cmd = [BIN_CONVERT, self.filepath, "-trim", "+repage", self.filepath]
-        try:
-            call(cmd)
-            self.commands.append(" ".join(cmd))
-        except Exception as e:
-            sys.stderr.write(str(e))
-            raise
+        cmd = [BIN_CONVERT, self.filepath, "-trim", "+repage", self.filepath]
+        self._call_cmd(cmd)
     
     def _prepare_gridimage(self, image):
         if image['mimetype'] != 'png':
             cmd = [BIN_CONVERT, image['path'], self.filepath]
-            try:
-                call(cmd)
-                self.commands.append(" ".join(cmd))
-            except Exception as e:
-                sys.stderr.write(str(e))
-                raise
         else:
             cmd = ['cp', image['path'], self.filepath]
-            try:
-                call(cmd)
-                self.commands.append(" ".join(cmd))
-            except Exception as e:
-                sys.stderr.write(str(e))
-                raise
+        self._call_cmd(cmd)
+
     
     def _overlay_planebgimage(self):
         cmd = [ 
@@ -306,23 +283,13 @@ class Imgrid():
             self.filepath,
             self.filepath
         ]
-        try:
-            call(cmd)
-            self.commands.append(" ".join(cmd))
-        except Exception as e:
-            sys.stderr.write(str(e))
-            raise
+        self._call_cmd(cmd)
              
     def _cleanup(self):
         if not len(self.files_created):
             pass
         cmd = ["rm", "-f"] + self.files_created
-        try:
-            call(cmd)
-            self.commands.append(" ".join(cmd))
-        except Exception as e:
-            sys.stderr.write(str(e))
-            raise
+        self._call_cmd(cmd)
         
     def create(self):
         if self.params.bgimage: