mirror
/
micropython-WiFiManager
kopia lustrzana https://github.com/tayfunulu/WiFiManager
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

cleanup response assembly

pull/3/head
Thomas Waldmann 2017-12-11 21:13:01 +01:00
rodzic e20694340f
commit cbf3c8f57b
1 zmienionych plików z 12 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

25
networkconfig.py
Wyświetl plik

@ -48,7 +48,8 @@ def handle_root(client):
wlan_sta.active(True) wlan_sta.active(True)
ssids = sorted(ssid.decode('utf-8') for ssid, *_ in wlan_sta.scan()) ssids = sorted(ssid.decode('utf-8') for ssid, *_ in wlan_sta.scan())
response_header = """\ response = []
response.append("""\
<html> <html>
<h1 style="color: #5e9ca0; text-align: center;"> <h1 style="color: #5e9ca0; text-align: center;">
<span style="color: #ff0000;"> <span style="color: #ff0000;">
@ -58,20 +59,18 @@ def handle_root(client):
<form action="configure" method="post"> <form action="configure" method="post">
<table style="margin-left: auto; margin-right: auto;"> <table style="margin-left: auto; margin-right: auto;">
<tbody> <tbody>
""" """)
response_variable = []
for ssid in ssids: for ssid in ssids:
response_variable.append("""\ response.append("""\
<tr> <tr>
<td colspan="2"> <td colspan="2">
<input type="radio" name="ssid" value="{0}" />{0} <input type="radio" name="ssid" value="{0}" />{0}
</td> </td>
</tr> </tr>
""".format(ssid)) """.format(ssid))
response_variable = "\n".join(response_variable)
response_footer = """\ response.append("""\
<tr> <tr>
<td>Password:</td> <td>Password:</td>
<td><input name="password" type="password" /></td> <td><input name="password" type="password" /></td>
@ -106,8 +105,8 @@ def handle_root(client):
</li> </li>
</ul> </ul>
</html> </html>
""" """)
send_response(client, response_header + response_variable + response_footer) send_response(client, "\n".join(response))
def handle_configure(client, request): def handle_configure(client, request):
@ -129,7 +128,7 @@ def handle_configure(client, request):
return False return False
if do_connect(ssid, password): if do_connect(ssid, password):
response_footer = """\ response = """\
<html> <html>
<center> <center>
<br><br> <br><br>
@ -142,7 +141,7 @@ def handle_configure(client, request):
</center> </center>
</html> </html>
""" % dict(ssid=ssid) """ % dict(ssid=ssid)
send_response(client, response_footer) send_response(client, response)
try: try:
with open("passwd.dat", "r") as f: with open("passwd.dat", "r") as f:
ex_data = f.read() ex_data = f.read()
@ -153,7 +152,7 @@ def handle_configure(client, request):
f.write(ex_data) f.write(ex_data)
return True return True
else: else:
response_footer = """\ response = """\
<html> <html>
<center> <center>
<h1 style="color: #5e9ca0; text-align: center;"> <h1 style="color: #5e9ca0; text-align: center;">
@ -167,8 +166,8 @@ def handle_configure(client, request):
</form> </form>
</center> </center>
</html> </html>
""" % dict(ssid=ssid) """ % dict(ssid=ssid)
send_response(client, response_footer) send_response(client, response)
return False return False