From 5628ec9b1a2dc329c4d144c694f379ef5c055531 Mon Sep 17 00:00:00 2001 From: yo mama Date: Sun, 13 Sep 2015 23:42:58 -0700 Subject: ok cleaning up the last few modules --- Pb/Generate/__init__.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'Pb/Generate') diff --git a/Pb/Generate/__init__.py b/Pb/Generate/__init__.py index 76082aa..0062652 100755 --- a/Pb/Generate/__init__.py +++ b/Pb/Generate/__init__.py @@ -14,7 +14,7 @@ _compose_params = [ "Over", "ATop", "Dst_Over", "Dst_In", "Dst_Out", "Multiply", _dispose_params = ["None","Previous","Background"] _dispose_default = "None" -class Im(Pb): +class PbGenerate(Pb): example_params = { #{{{ example params 'nearest': 'true', @@ -76,12 +76,13 @@ class Im(Pb): format=DEFAULT_FINALFORMAT, dispose="None", #STRINGS - username=None, + name=None, callback=None, ): + super(PbGenerate,self).__init__(); #IMAGES - self.params.set_val("url", url, value_type="image_url") - self.params.set_val("background", background, value_type="image_url") + self.params.set_val("url", url, value_type="img_url") + self.params.set_val("background", background, value_type="img_url") #BOOLS self.params.set_val("coalesce", coalesce, value_type="bool") @@ -98,14 +99,14 @@ class Im(Pb): self.params.set_val("subtract", subtract, value_type="color") #INTS - self.params.set_val("fuzz", fuzz, value_type="int") - self.params.set_val("width", width, value_type="int") - self.params.set_val("height", height, value_type="int") - self.params.set_val("brightness", brightness, value_type="int") - self.params.set_val("contrast", contrast, value_type="int") - self.params.set_val("saturation", saturation, value_type="int") - self.params.set_val("rotate", rotate, value_type="int") - self.params.set_val("hue", hue, value_type="int") + self.params.set_val("fuzz", fuzz or 0, value_type="int") + self.params.set_val("width", width or 0, value_type="int") + self.params.set_val("height", height or 0, value_type="int") + self.params.set_val("brightness", brightness or 0, value_type="int") + self.params.set_val("contrast", contrast or 0, value_type="int") + self.params.set_val("saturation", saturation or 0, value_type="int") + self.params.set_val("rotate", rotate or 0, value_type="int") + self.params.set_val("hue", hue or 0, value_type="int") #ENUMS self.params.set_val("compose", compose, value_type="enum", enum_values=_compose_params) @@ -114,13 +115,15 @@ class Im(Pb): self.params.set_val("format", format, value_type="enum", enum_values=OUTPUT_IMAGE_TYPES) #STRINGS - self.params.set_val("username", username, value_type="string") + self.params.set_val("username", name, value_type="string") self.params.set_val("callback", callback, value_type="string") self.tag = _default_tag if self.params.background: self.tag = self.params.compose if self.params.transparent: self.tag = self.params.transparent + self.filename, self.filepath = self._filename_filepath_create(url=self.params.url['url'], extension=self.params.format) + def _composite (self): cmd = [ BIN_CONVERT, self.params.background['path'], -- cgit v1.2.3-70-g09d2