diff options
| -rw-r--r-- | photoblaster/config.py | 2 | ||||
| -rwxr-xr-x | photoblaster/modules/pbgenerate/__init__.py | 6 | ||||
| -rw-r--r-- | photoblaster/param/img_url.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/photoblaster/config.py b/photoblaster/config.py index 8712910..8a1f1a8 100644 --- a/photoblaster/config.py +++ b/photoblaster/config.py @@ -70,7 +70,7 @@ AWS_ACCESS_KEY_ID = 'AKIAIR53VPBXKJMXZIBA' AWS_SECRET_ACCESS_KEY = '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' BUCKET_NAME = 'i.asdf.us' SPECIAL_DOWNLOADERS = ["ryz pepper RICHARD_GIOVANNI dmgk"] -SPECIAL_DOWNLOADERS_MAX_SIZE = 100000 +SPECIAL_DOWNLOADERS_MAX_SIZE = 1024 * 1024 * 10 # database diff --git a/photoblaster/modules/pbgenerate/__init__.py b/photoblaster/modules/pbgenerate/__init__.py index cf9b330..16f0118 100755 --- a/photoblaster/modules/pbgenerate/__init__.py +++ b/photoblaster/modules/pbgenerate/__init__.py @@ -129,6 +129,12 @@ class PbGenerate(ModuleBase): elif self.params.transparent: self.tag = "%s:%s" % (self.tag, "transparent") + if self.params.username: + if self.params.background: + self.params.background.username = self.params.username + if self.params.url: + self.params.url.username = self.params.username + self.set_output_file( File.from_url( self.params.url['url'], diff --git a/photoblaster/param/img_url.py b/photoblaster/param/img_url.py index 73a349e..6c1da2b 100644 --- a/photoblaster/param/img_url.py +++ b/photoblaster/param/img_url.py @@ -87,7 +87,7 @@ class Img_url(Param): if len(rawimg) > max_size: raise FileTooBigError( "file too big: max size {} KB / {} is {} KB".format( - str(MAX_SIZE/1024), + str(max_size/1024), url, str(len(rawimg)/1024) ) |