From 472ade196e97e13dd105df2695b39d58db189702 Mon Sep 17 00:00:00 2001
From: Pepper <pepper@scannerjammer.com>
Date: Wed, 11 Mar 2015 06:04:54 -0400
Subject: simple fixes

---
 imgrid.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'imgrid.py')

diff --git a/imgrid.py b/imgrid.py
index 2dfe5bb..c00d9d0 100755
--- a/imgrid.py
+++ b/imgrid.py
@@ -35,6 +35,7 @@ def is_color(s):
   if re.match('(rgba?\([0-9]+,[0-9]+,[0-9]+\))|([a-zA-Z]+)|(\#[A-Ha-h0-9]+)', s):
     return s
   else:
+    sys.stderr.write("Not a color: {}\n".format(s))
     raise ValueError
 def bool_correct(s):
     if re.match(r'^false$', s, re.IGNORECASE):
@@ -58,6 +59,7 @@ def get_mimetype(f):
         ).communicate()[0].split(" ")[1].lower()
         return mimetype
     except Exception as e:
+        sys.stderr.write("IMGRID couldn't determine mimetype")
         sys.stderr.write(str(e))
         raise;
 
@@ -104,6 +106,7 @@ def file_size (filepath):
     try:
         return os.stat(file)[6]
     except Exception as e:
+        sys.stderr.write("IMGRID couldn't determine file size")
         sys.stderr.write(str(e))
         raise;
 
@@ -116,6 +119,7 @@ def gif_frames(filepath):
         ))
         return frames
     except Exception as e:
+        sys.stderr.write("IMGRID couldn't get gif frames")
         sys.stderr.write(str(e))
         raise;
 #}}}
@@ -172,10 +176,16 @@ class Imgrid():
                             
 
                     except Exception as e:
+                        sys.stderr.write("BAD PARAMS\n")
                         sys.stderr.write(str(e))
                         raise;
-                elif k in [ 'bgcolor', 'planebgcolor','linecolor' ]:
-                    self.params[k] = is_color(params[k])
+                elif k in [ 'skycolor', 'bgcolor', 'planebgcolor','linecolor' ]:
+                    try:
+                      self.params[k] = is_color(params[k])
+                    except Exception as e:
+                      sys.stderr.write("Unable to process color for:\n")
+                      sys.stderr.write(k)
+                      raise e
                 elif k == 'opacity':
                     self.params[k] = str(float(params[k]))
                 elif k == 'zoom':
@@ -207,6 +217,8 @@ class Imgrid():
             call(cmd)
             self.commands.append(" ".join(cmd)); 
         except Exception as e:
+            sys.stderr.write("IT HIT AN ERROR")
+            sys.stderr.write(str(cmd))
             if error:
                 sys.stderr.write(error)
             else:
-- 
cgit v1.2.3-70-g09d2