summaryrefslogtreecommitdiff
path: root/ricky/imbreak
diff options
context:
space:
mode:
Diffstat (limited to 'ricky/imbreak')
-rw-r--r--ricky/imbreak/__init__.py13
-rw-r--r--ricky/imbreak/imbreak.py12
-rw-r--r--ricky/imbreak/params.py88
-rw-r--r--ricky/imbreak/probability.json35
4 files changed, 91 insertions, 57 deletions
diff --git a/ricky/imbreak/__init__.py b/ricky/imbreak/__init__.py
index 752d977..c2a5a61 100644
--- a/ricky/imbreak/__init__.py
+++ b/ricky/imbreak/__init__.py
@@ -1 +1,12 @@
-from ricky.imbreak.imbreak import ImBreak
+from ricky.im import Im
+from ricky.imbreak.params import ImBreakParams
+from ricky.config import IMBREAK_URL
+
+class ImBreak(Im):
+ def __init__(self):
+ self.url = IMBREAK_URL
+ def params_init(self):
+ new_params = ImBreakParams()
+ #new_params = self.get_from_server()
+ new_params.api = self
+ return new_params
diff --git a/ricky/imbreak/imbreak.py b/ricky/imbreak/imbreak.py
deleted file mode 100644
index c2a5a61..0000000
--- a/ricky/imbreak/imbreak.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from ricky.im import Im
-from ricky.imbreak.params import ImBreakParams
-from ricky.config import IMBREAK_URL
-
-class ImBreak(Im):
- def __init__(self):
- self.url = IMBREAK_URL
- def params_init(self):
- new_params = ImBreakParams()
- #new_params = self.get_from_server()
- new_params.api = self
- return new_params
diff --git a/ricky/imbreak/params.py b/ricky/imbreak/params.py
index 0c437d6..4cf3af9 100644
--- a/ricky/imbreak/params.py
+++ b/ricky/imbreak/params.py
@@ -1,57 +1,57 @@
-import re, random
from ricky.params import Params
-from ricky.param.selection import Selection
-from ricky.param.selections import Selections
from ricky.param.username import Username
from ricky.param.imageurl import ImageUrl
from ricky.param.multiselect import MultiSelect
-from ricky.param.numberrange import NumberRange
-from ricky.param.color import Color
-from ricky.config import PATTERN_BASE_URL
+from ricky.param.constrainednumber import ConstrainedNumber
+from ricky.param.bool import Bool
-breaktype_selections = Selections.from_dict(
- {"value":"CLASSIC", "weight": 1},
- {"value":"REDUX", "weight": 1},
- {"value":"BLURRY_BREAK", "weight": 1},
- {"value":"BLURRY_BREAK_2", "weight": 1},
- {"value":"SWIPE", "weight": 1},
- {"value":"RGB_WASH", "weight": 1},
- {"value":"RGB_WASH_2", "weight": 1},
- {"value":"NOISY_BREAK", "weight": 1},
- {"value":"BROKEN_VIGNETTE", "weight": 1},
- {"value":"FAX_MACHINE", "weight": 1},
- {"value":"STRIPES", "weight": 1},
- {"value":"PHOTOCOPY", "weight": 1},
-)
-breakmode_selections = Selections.from_dict(
- {"value":"extreme", "weight": 1},
- {"value":"subtle", "weight": 1},
-)
-finalformat_selections = Selections.from_dict(
- {"value":"png", "weight": 5},
- {"value":"jpg", "weight": 2},
- {"value":"gif", "weight": 2},
-)
-breakangle_selections = Selections.from_dict(
- {"value":0, "weight": 9},
- {"value":90, "weight": 2},
- {"value":-180, "weight": 2},
- {"value":180, "weight": 2},
-)
-expanded_selections = Selections.from_dict(
- {"value": "" , "weight": 11 },
- {"value": 1, "weight": 2}
-)
+breaktype_options = [
+ "CLASSIC",
+ "REDUX",
+ "BLURRY_BREAK",
+ "BLURRY_BREAK_2",
+ "SWIPE",
+ "RGB_WASH",
+ "RGB_WASH_2",
+ "NOISY_BREAK",
+ "BROKEN_VIGNETTE",
+ "FAX_MACHINE",
+ "STRIPES",
+ "PHOTOCOPY"
+]
+breakmode_options = [
+ "extreme",
+ "subtle",
+]
+finalformat_options = [
+ "png",
+ "jpg",
+ "gif",
+]
+
class ImBreakParams(Params):
def __init__(self):
self._params = [
Username(name="username", required=0),
ImageUrl(name="url", required=1),
- MultiSelect(name="finalformat", required=0, selections=finalformat_selections),
- MultiSelect(name="breaktype", required=1, selections=breaktype_selections),
- NumberRange(name="breakangle", required=0, selections=breakangle_selections, min=-180, max=180),
- MultiSelect(name="breakmode", required=1, selections=breakmode_selections),
- MultiSelect(name="expanded", required=0, selections=expanded_selections),
+ MultiSelect(
+ name="finalformat",
+ required=0,
+ options=finalformat_options),
+ MultiSelect(
+ name="breaktype",
+ required=1,
+ options=breaktype_options),
+ ConstrainedNumber(
+ name="breakangle",
+ required=0,
+ min=-180,
+ max=180),
+ MultiSelect(
+ name="breakmode",
+ required=1,
+ options=breakmode_options),
+ Bool(name="expanded", required=0)
]
diff --git a/ricky/imbreak/probability.json b/ricky/imbreak/probability.json
new file mode 100644
index 0000000..9c28e6d
--- /dev/null
+++ b/ricky/imbreak/probability.json
@@ -0,0 +1,35 @@
+{
+ "breaktype" :[
+ {"value": "CLASSIC", "weight": 1},
+ {"value": "REDUX", "weight": 1},
+ {"value": "BLURRY_BREAK", "weight": 1},
+ {"value": "BLURRY_BREAK_2", "weight": 1},
+ {"value": "SWIPE", "weight": 1},
+ {"value": "RGB_WASH", "weight": 1},
+ {"value": "RGB_WASH_2", "weight": 1},
+ {"value": "NOISY_BREAK", "weight": 1},
+ {"value": "BROKEN_VIGNETTE", "weight": 1},
+ {"value": "FAX_MACHINE", "weight": 1},
+ {"value": "STRIPES", "weight": 1},
+ {"value": "PHOTOCOPY", "weight": 1}
+ ],
+ "breakmode" :[
+ {"value": "extreme", "weight": 1},
+ {"value": "subtle", "weight": 1}
+ ],
+ "finalformat" :[
+ {"value": "png", "weight": 5},
+ {"value": "jpg", "weight": 2},
+ {"value": "gif", "weight": 2}
+ ],
+ "breakangle" :[
+ {"value": 0, "weight": 9},
+ {"value": 90, "weight": 2},
+ {"value": -180, "weight": 2},
+ {"value": 180, "weight": 2}
+ ],
+ "expanded" :[
+ {"value": "", "weight": 11},
+ {"value": 1, "weight": 2}
+ ]
+}