From eab8f20a318bc493e0b40cf0cea59a1d9b148f7d Mon Sep 17 00:00:00 2001
From: Ethan Robert <ethan.rbrt90@gmail.com>
Date: Wed, 26 Feb 2025 16:09:53 +0100
Subject: [PATCH] Changed teacher version in order to adapt to the API
---
Teacher/main.py | 46 +++++++++++++++++++++++++---------------------
1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/Teacher/main.py b/Teacher/main.py
index 6a70e7c..8f45e47 100644
--- a/Teacher/main.py
+++ b/Teacher/main.py
@@ -1,4 +1,4 @@
-import socket
+import requests
from time import sleep
MASK = 22
@@ -14,22 +14,10 @@ RANGES = {
('HEVÉA', '4A20'): ['172.18.49.80', '172.18.49.107'],
('IF', '4A39-4A41'): ['172.18.49.109', '172.18.49.123'],
('SEQUOÏA', '4A43'): ['172.18.49.125', '172.18.49.132'],
- ('SAULE', '4A24'): ['172.18.49.133', '172.18.49.159']
+ ('SAULE', '4A24'): ['172.18.49.133', '172.18.49.159'],
+ ('DEBUG'): ['127.0.0.1', '127.0.0.1']
}
-class Socket:
-
- def __init__(self, address):
- self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- self.address = address
-
-
- def update(self):
-
- self.socket.connect((address, 25566))
- message = self.socket.recvfrom(1024).decode("UTF-8")
- return message
-
class ConnectionHandler:
def __init__(self, room):
@@ -44,19 +32,35 @@ class ConnectionHandler:
self.addresses = [row[0][0:10] + str(k) for k in numbers]
print(self.addresses)
- # Create sockets for all of these addresses
- self.sockets = [Socket(a) for a in self.addresses]
+ # Hold a message list
+ self.messages {}
+
+ for a in self.addresses:
+ self.messages[a] = ""
def update(self):
- for s in self.sockets:
- print(s.update())
+ changes = {}
+ for a in self.addresses:
+ response = requests.get("http://" + a + ":45566")
+ message = response.content.decode("utf-8")
-connections = ConnectionHandler(("SEQUOÏA", "4A43"))
+ if message != self.messages[a]:
+ changes[a] = messages
+
+ return changes
+
+connections = ConnectionHandler(("DEBUG"))
while True:
- connections.update()
+ changes = connections.update()
+
+ for c in changes:
+ print(changes[c])
+
time.sleep(30)
+ print("----------------------------------------------------")
+
--
GitLab