From e774c283bb394c2e9fe5f8061b28dd081cb3b40a Mon Sep 17 00:00:00 2001
From: Ethan Robert <ethan.rbrt90@gmail.com>
Date: Wed, 26 Feb 2025 16:23:20 +0100
Subject: [PATCH] Finished the project
---
Student/API/__pycache__/main.cpython-313.pyc | Bin 572 -> 0 bytes
Student/API/main.py | 5 ++++
Teacher/main.py | 30 ++++++++++++-------
3 files changed, 24 insertions(+), 11 deletions(-)
delete mode 100644 Student/API/__pycache__/main.cpython-313.pyc
diff --git a/Student/API/__pycache__/main.cpython-313.pyc b/Student/API/__pycache__/main.cpython-313.pyc
deleted file mode 100644
index 74eef918869a75368f29e0c77be4ea528b66ec41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 572
zcmey&%ge>Uz`$@qdw=?51_p-5APx*OLm8ia7#J9)G6XXOGkP<4F%~f@FvKt_F_=Q7
zi<n}Vg4m%PBr2H6lo7%WW|l&zW=Ut!WPJ&e&}6*D?v_|w;uzq0i%~xrBm~233=9k)
z>pvHOt&WBo#J~{D7|dkK1X0GskjD_p5Cl>O5rC60rxh~=gPhF()1kni!l1~Y!=M3G
znZn4xkjA9IAkUz{pumvMV9PAekjALV>{rE|n_66)n4YRvQc-e?u}G8Y7E69XYThlD
zqSV9`O~zX+X_+~x#UN)X+_KgWElw>e)=w?TNX*lB$xklLP0cGQ)(<Gk&q_@$Db{yQ
zEUt9U&(#kuDNRYuE75lh@YK&u%*@j(sJz7qGBCa<Kfk1in}LCWm4ShwSeb!=p@HEE
zCvQjYjNmJriVH$+@C)}>c2;&*e`jXkQo7Emc%4)6S1|_z14FNXI`eWaQ+7X1)?4gp
ziNz&}1(`*lAi2eySWs|_IXx9(@JfcyAWs*8qWczyO>TZlX-=wLkst#D1IQP}nhXpK
wAD9^#8SgSkKV;)=&TL?Qz{t`r-YDK7+${5viHTAAGcyAdADC4nz`(!&0O)&i-T(jq
diff --git a/Student/API/main.py b/Student/API/main.py
index dce85ec..94bad59 100644
--- a/Student/API/main.py
+++ b/Student/API/main.py
@@ -3,6 +3,11 @@ from os import getlogin
def getName():
login = getlogin()
+
+ # Check for debug mode
+ if len(login.split(".")) != 3:
+ login = "john.doe.etu"
+
name = login.split(".")[0][0].upper() + login.split(".")[0][1:] + " " + login.split(".")[1][0].upper() + login.split(".")[1][1:]
return name
diff --git a/Teacher/main.py b/Teacher/main.py
index 8f45e47..e8cc013 100644
--- a/Teacher/main.py
+++ b/Teacher/main.py
@@ -22,18 +22,23 @@ class ConnectionHandler:
def __init__(self, room):
- # Make a list of the available addresses
- row = RANGES[room]
+ if room == ("DEBUG"):
+ self.addresses = ['127.0.0.1']
- start = int(row[0].split(".")[3])
- offset = int(row[1].split(".")[3])
- numbers = [k for k in range(start, offset)]
+ else:
- self.addresses = [row[0][0:10] + str(k) for k in numbers]
- print(self.addresses)
+ # Make a list of the available addresses
+ row = RANGES[room]
+
+ start = int(row[0].split(".")[3])
+ offset = int(row[1].split(".")[3])
+ numbers = [k for k in range(start, offset)]
+
+ self.addresses = [row[0][0:10] + str(k) for k in numbers]
+ print(self.addresses)
# Hold a message list
- self.messages {}
+ self.messages = {}
for a in self.addresses:
self.messages[a] = ""
@@ -46,7 +51,9 @@ class ConnectionHandler:
message = response.content.decode("utf-8")
if message != self.messages[a]:
- changes[a] = messages
+ changes[a] = message
+
+ self.messages[a] = message
return changes
@@ -59,8 +66,9 @@ while True:
for c in changes:
print(changes[c])
- time.sleep(30)
+ if len(changes) > 0:
+ print("----------------------------------------------------")
- print("----------------------------------------------------")
+ sleep(2)
--
GitLab