Fixed Liquid for conditions

This commit is contained in:
frikky
2021-09-08 01:36:51 +02:00
parent e028e9af99
commit b06baaf878
2 changed files with 13 additions and 9 deletions
+12 -8
View File
@@ -1201,7 +1201,12 @@ class AppBase:
# = # =
# Authorization=Bearer authkey # Authorization=Bearer authkey
# ^ Double space. # ^ Double space.
def parse_wrapper_start(data): def parse_wrapper_start(data, self):
try:
data = parse_liquid(data, self)
except:
pass
if "(" not in data or ")" not in data: if "(" not in data or ")" not in data:
return data return data
@@ -1917,19 +1922,18 @@ class AppBase:
sourcevalue = condition["source"]["value"] sourcevalue = condition["source"]["value"]
check, sourcevalue, is_loop = parse_params(action, fullexecution, condition["source"], self) check, sourcevalue, is_loop = parse_params(action, fullexecution, condition["source"], self)
if check: if check:
return False, {"success": False, "reason": "Failed condition: %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)} return False, {"success": False, "reason": "Failed condition (1): %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)}
#sourcevalue = sourcevalue.encode("utf-8") #sourcevalue = sourcevalue.encode("utf-8")
sourcevalue = parse_wrapper_start(sourcevalue) sourcevalue = parse_wrapper_start(sourcevalue, self)
destinationvalue = condition["destination"]["value"] destinationvalue = condition["destination"]["value"]
check, destinationvalue, is_loop = parse_params(action, fullexecution, condition["destination"], self) check, destinationvalue, is_loop = parse_params(action, fullexecution, condition["destination"], self)
if check: if check:
return False, {"success": False, "reason": "Failed condition: %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)} return False, {"success": False, "reason": "Failed condition (2): %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)}
#destinationvalue = destinationvalue.encode("utf-8") #destinationvalue = destinationvalue.encode("utf-8")
destinationvalue = parse_wrapper_start(destinationvalue) destinationvalue = parse_wrapper_start(destinationvalue, self)
available_checks = [ available_checks = [
"=", "=",
"equals", "equals",
@@ -1966,7 +1970,7 @@ class AppBase:
if not validation: if not validation:
self.logger.info("Failed condition check for %s %s %s." % (sourcevalue, condition["condition"]["value"], destinationvalue)) self.logger.info("Failed condition check for %s %s %s." % (sourcevalue, condition["condition"]["value"], destinationvalue))
return False, {"success": False, "reason": "Failed condition: %s %s %s" % (sourcevalue, condition["condition"]["value"], destinationvalue)} return False, {"success": False, "reason": "Failed condition (3): %s %s %s" % (sourcevalue, condition["condition"]["value"], destinationvalue)}
# Make a general parser here, at least to get param["name"] = param["value"] in maparameter[string]string # Make a general parser here, at least to get param["name"] = param["value"] in maparameter[string]string
@@ -2431,7 +2435,7 @@ class AppBase:
# This part has fucked over so many random JSON usages because of weird paranthesis parsing # This part has fucked over so many random JSON usages because of weird paranthesis parsing
value = parse_wrapper_start(value) value = parse_wrapper_start(value, self)
print("Post return: %s" % value) print("Post return: %s" % value)
#if parameter["id"] == "body_replacement": #if parameter["id"] == "body_replacement":
+1 -1
View File
@@ -3,7 +3,7 @@
### DEFAULT ### DEFAULT
NAME=shuffle-app_sdk NAME=shuffle-app_sdk
VERSION=0.9.15 VERSION=0.9.16
docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION