diff options
| -rwxr-xr-x | lib/pb/generate.py | 6 | ||||
| -rw-r--r-- | lib/server.py | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/pb/generate.py b/lib/pb/generate.py index 6bf99c3..a97970c 100755 --- a/lib/pb/generate.py +++ b/lib/pb/generate.py @@ -12,7 +12,7 @@ _COMPOSE_PARAMS = [ "Over", "ATop", "Dst_Over", "Dst_In", "Dst_Out", "Multiply", "Screen", "Divide", "Plus", "Difference", "Exclusion", "Pin_Light", "Lighten", "Darken", "Overlay", "Hard_Light", "Soft_Light", - "Linear_Dodge", "Linear_Burn", "Color_Dodge", "Color_Burn" + "Linear_Dodge", "Linear_Burn", "Color_Dodge", "Color_Burn", "Pegtop_Light" ] _DISPOSE_PARAMS = ["None", "Previous", "Background"] _DISPOSE_DEFAULT = "None" @@ -34,8 +34,8 @@ class PbGenerate(Pb): 'saturation': '100', 'merge_early': 'true', 'format': 'gif', - 'background': 'bob', - #'background': 'http://i.asdf.us/im/bc/new_1430440747.gif', +# 'background': 'bob', + 'background': 'http://i.asdf.us/im/bc/new_1430440747.gif', 'subtract': '#EE7AE9', 'transparent': 'true', 'name': 'yo', diff --git a/lib/server.py b/lib/server.py index cfc7e98..9261730 100644 --- a/lib/server.py +++ b/lib/server.py @@ -39,14 +39,11 @@ class Server(object): return "HELLO WORLD!" @self.app.route('/im/api/<pb_classname>', methods=['POST']) def pb(pb_classname): - if request.headers.getlist("X-Forwarded-For"): - ip = request.headers.getlist("X-Forwarded-For")[0] - else: - ip = request.remote_addr + ip = '127.0.0.1' #fixme return self._response_post( pb_classname, request.form.to_dict(), - remote_addr=remote_addr + remote_addr=ip ) @self.app.errorhandler(InvalidUsage) |