Profouzors
/
boxespy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use URL params as defaults for rendering the the input mask 

when the render=1 param is omitted
This commit is contained in:
Florian Festi 2018-08-13 16:19:06 +02:00
parent f83ca31a0a
commit b31faefe26
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/boxesserver
View File

@ -98,7 +98,7 @@ class BServer:
self.staticdir = os.path.join(os.path.dirname(__file__), '../static/') self.staticdir = os.path.join(os.path.dirname(__file__), '../static/')
def arg2html(self, a, prefix): def arg2html(self, a, prefix, defaults={}):
name = a.option_strings[0].replace("-", "") name = a.option_strings[0].replace("-", "")
if isinstance(a, argparse._HelpAction): if isinstance(a, argparse._HelpAction):
return "" return ""
@ -106,24 +106,26 @@ class BServer:
if prefix and name.startswith(prefix + '_'): if prefix and name.startswith(prefix + '_'):
viewname = name[len(prefix)+1:] viewname = name[len(prefix)+1:]
default = defaults.get(name, None)
row = """<tr><td>%s</td><td>%%s</td><td>%s</td></tr>\n""" % \ row = """<tr><td>%s</td><td>%%s</td><td>%s</td></tr>\n""" % \
(viewname, a.help or "") (viewname, a.help or "")
if (isinstance(a, argparse._StoreAction) and if (isinstance(a, argparse._StoreAction) and
hasattr(a.type, "html")): hasattr(a.type, "html")):
input = a.type.html(name, a.default) input = a.type.html(name, default or a.default)
elif a.dest == "layout": elif a.dest == "layout":
val = a.default.split("\n") val = a.default.split("\n")
input = """<textarea name="%s" cols="%s" rows="%s">%s</textarea>""" % \ input = """<textarea name="%s" cols="%s" rows="%s">%s</textarea>""" % \
(name, max((len(l) for l in val))+10, len(val)+1, a.default) (name, max((len(l) for l in val))+10, len(val)+1, default or a.default)
elif a.choices: elif a.choices:
options = "\n".join( options = "\n".join(
("""<option value="%s"%s>%s</option>""" % ("""<option value="%s"%s>%s</option>""" %
(e, ' selected="selected"' if e == a.default else "", (e, ' selected="selected"' if e == (default or a.default) else "",
e) for e in a.choices)) e) for e in a.choices))
input = """<select name="%s" size="1">\n%s</select>\n""" % (name, options) input = """<select name="%s" size="1">\n%s</select>\n""" % (name, options)
else: else:
input = """<input name="%s" type="text" value="%s">""" % \ input = """<input name="%s" type="text" value="%s">""" % \
(name, a.default) (name, default or a.default)
return row % input return row % input
@ -148,7 +150,7 @@ class BServer:
</script> </script>
""" """
def args2html(self, name, box, action=""): def args2html(self, name, box, action="", defaults={}):
result = ["""<!DOCTYPE html> result = ["""<!DOCTYPE html>
<html> <html>
<head> <head>
@ -183,7 +185,7 @@ class BServer:
for a in group._group_actions: for a in group._group_actions:
if a.dest in ("input", "output"): if a.dest in ("input", "output"):
continue continue
result.append(self.arg2html(a, prefix)) result.append(self.arg2html(a, prefix, defaults))
result.append("</table>") result.append("</table>")
groupid += 1 groupid += 1
result.append(""" result.append("""
@ -349,13 +351,20 @@ Create boxes and more with a laser cutter!
start_response(status, headers) start_response(status, headers)
return self.menu() return self.menu()
args = [unquote_plus(arg) for arg in
environ['QUERY_STRING'].split("&")]
args = ["--"+unquote_plus(arg) for arg in environ['QUERY_STRING'].split("&")] if "render=1" not in args:
if "--render=1" not in args: defaults = { }
for a in args:
kv = a.split('=')
if len(kv) == 2:
k, v = kv
defaults[k] = cgi.escape(v, True)
start_response(status, headers) start_response(status, headers)
return self.args2html(name, box, "./" + name) return self.args2html(name, box, "./" + name, defaults=defaults)
else: else:
args = [a for a in args if a != "--render=1"] args = ["--"+ arg for arg in args if arg != "render=1"]
try: try:
box.parseArgs(args) box.parseArgs(args)
except (ArgumentParserError) as e: except (ArgumentParserError) as e: