summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpepperpepperpepper <pepper@scannerjammer.com>2015-12-07 17:53:14 -0800
committerpepperpepperpepper <pepper@scannerjammer.com>2015-12-07 17:53:14 -0800
commitb6b36cc8edaf78d0f4a66404d0b803348aa93a40 (patch)
tree27ebd70bf6dceecf32126e062a7c70b6faa97acb
parent14ef118d2c5508d69c015f699cde5783175d8e18 (diff)
now works locally and remotely, both photoblaster and ricky, just need to fix paths
-rwxr-xr-xexample.py2
-rw-r--r--ricky/pb.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/example.py b/example.py
index 5a781df..6d8b199 100755
--- a/example.py
+++ b/example.py
@@ -8,7 +8,7 @@ from ricky.pbpattern import PbPattern
api = PbBreaker()
params = api.params_init()
print params
-params.randomize(probabilities_local=True)
+params.randomize()
print params
print params.execute()
#print params['color1']
diff --git a/ricky/pb.py b/ricky/pb.py
index d600708..2b07737 100644
--- a/ricky/pb.py
+++ b/ricky/pb.py
@@ -42,11 +42,14 @@ class Pb(object):
if self._offline:
sys.path.append("./photoblaster")
from photoblaster.modules import Pb
+ from photoblaster.config import LOCAL as PBLOCAL
for pbcls in Pb.__subclasses__():
if pbcls.__name__ == self.__class__.__name__:
params_dict = params.as_dict()
instance = pbcls(**params_dict)
instance.create()
+ if not PBLOCAL:
+ instance.file_s3move()
return instance.file_dict()
return json.loads(
self.post_request(self.url, params.as_dict())