Skip to content

Commit 4fa33c7

Browse files
v0.5.6
Fix various bugs Show scores
1 parent a94e884 commit 4fa33c7

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

lelonmo/persist_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
save_file = input("Please enter the location of your save file : ")
1717

1818
default_data = dict(
19-
version="00.5.3",
19+
version="00.5.6",
2020
update_url='https://github.com/claj-ndc/LeLonMo/releases/latest',
2121
online=dict(
2222
uuid=str(uuid.uuid4()),

lelonmo/socket_client.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -274,22 +274,24 @@ def main(host="localhost"):
274274
wb.update(updatable_2='Your word is not valid', invert=True)
275275
playerboard.enable = False
276276
wb.clear()
277-
wb.update("Waiting for other players to finish")
277+
wb.update("Waiting for other players to finish", status=yellow("Waiting ..."))
278278
playerboard = PlayerUpdate(wb, host)
279279
playerboard.start()
280280
_wait_for_status("results", host)
281-
wait(0.25) # Avoid replay spam for the last player if it has low ping
282281
playerboard.enable = False
283282
wb.updatable = ""
284283

285284
result_data = json.loads(_status(host)[7:])
286285
wb.clear()
286+
end_message = "Winner(s) :\n"
287+
for i in result_data["best"]:
288+
end_message += f" * {i[0]} : {i[1]}\n"
289+
end_message += "Scores :\n"
290+
for i in result_data["players"]:
291+
end_message += f" {i['total_points']}\t{i['name']} : {i['word']} (+{i['points']})\n"
292+
287293
wb.update(
288-
add="Winner(s):\n * " + "\n * ".join([i[0] +
289-
" : " + i[1] for i in result_data["best"]]) +
290-
"\n\n Scores :\n * " + "\n * ".join([i["name"] +
291-
" : " +
292-
i["word"]for i in result_data["players"]]),
294+
add=end_message,
293295
status=bold("Finished")
294296
)
295297

server/persist_data.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
save_file = home + ".lelonmo_server_save.json"
88

99
default_data = dict(
10-
version="0.5.3",
11-
client_version="0053",
10+
version="0.5.6",
11+
client_version="0056",
1212
online=dict(
1313
uuid=str(uuid.uuid4()),
1414
name="",

server/socket_server.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,21 +311,24 @@ def _parse_request(self, data):
311311
data = data.split(" ")
312312
method = data[0]
313313
filename = data[1][1:]
314+
if filename == '':
315+
filename = "default.html"
314316
return method, filename
315317

316318
def web_handle(self, data, csock, ip, port):
317319
print(f"Web Mode connexion from {ip}")
318320
method, filename = self._parse_request(data)
319-
if not filename.startswith("%game%"):
321+
if not filename.startswith("game"):
320322
if os.path.exists(self.web_dir+filename):
321323
csock.send(self._generate_headers(200))
322324
try:
323325
f = open(self.web_dir+filename, "rb")
324-
csock.send(f.read())
326+
filecontent = f.read()
327+
csock.send(filecontent)
325328
f.close()
326329
csock.close()
327330
except Exception as e:
328-
print("Error", e)
331+
print("Error", str(e))
329332
csock.close()
330333
else:
331334
print(self.web_dir+filename)

0 commit comments

Comments
 (0)