From 5d3aaa0edef2902629d931495350fdc228a231ad Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <se23m504@technikum-wien.at>
Date: Wed, 30 Oct 2024 21:47:45 +0100
Subject: [PATCH] Add config and update scripts

---
 .pre-commit-config.yaml    | 38 ++++++++++++++++++++++++++++++++++++++
 broadcast.py               | 22 ----------------------
 src/broadcast.py           | 24 ++++++++++++++++++++++++
 client.py => src/client.py | 11 +++++------
 src/config.py              |  8 ++++++++
 src/setup.cfg              |  2 ++
 6 files changed, 77 insertions(+), 28 deletions(-)
 create mode 100644 .pre-commit-config.yaml
 delete mode 100644 broadcast.py
 create mode 100644 src/broadcast.py
 rename client.py => src/client.py (55%)
 create mode 100644 src/config.py
 create mode 100644 src/setup.cfg

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..e8fcea1
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,38 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+      - id: check-symlinks
+      - id: check-yaml
+        exclude: (observability|testing/tavern)
+      - id: debug-statements
+        exclude: tests/
+      - id: destroyed-symlinks
+      - id: end-of-file-fixer
+        files: \.(py|sh|rst|yml|yaml)$
+      - id: mixed-line-ending
+      - id: trailing-whitespace
+        files: \.(py|sh|rst|yml|yaml)$
+  - repo: https://github.com/ambv/black
+    rev: 23.10.0
+    hooks:
+      - id: black
+  - repo: https://github.com/pycqa/flake8
+    rev: 6.0.0
+    hooks:
+      - id: flake8
+        args: [--config, src/setup.cfg]
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+        args: [
+          '--profile',
+          'black',
+          '--src-path',
+          'src',
+        ]
diff --git a/broadcast.py b/broadcast.py
deleted file mode 100644
index 276eadb..0000000
--- a/broadcast.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import socket
-import struct
-import time
-
-service_name = "windows.local"
-ip_address = "192.168.137.1"
-port = 5000
-message = f"{service_name}:{ip_address}:{port}"
-
-multicast_group = "224.0.0.251"
-multicast_port = 5353
-
-sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
-sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 2)
-
-try:
-    while True:
-        sock.sendto(message.encode("utf-8"), (multicast_group, multicast_port))
-        print(f"Broadcasting service info: {message}")
-        time.sleep(2)
-finally:
-    sock.close()
\ No newline at end of file
diff --git a/src/broadcast.py b/src/broadcast.py
new file mode 100644
index 0000000..ee20650
--- /dev/null
+++ b/src/broadcast.py
@@ -0,0 +1,24 @@
+import socket
+import time
+
+from config import (
+    BROADCAST_INTERVAL,
+    MULTICAST_IP,
+    MULTICAST_PORT,
+    SERVICE_IP,
+    SERVICE_NAME,
+    SERVICE_PORT,
+)
+
+message = f"{SERVICE_NAME}:{SERVICE_IP}:{SERVICE_PORT}"
+
+sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
+sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 2)
+
+try:
+    while True:
+        sock.sendto(message.encode("utf-8"), (MULTICAST_IP, MULTICAST_PORT))
+        print(f"Broadcasting service info: {message}")
+        time.sleep(BROADCAST_INTERVAL)
+finally:
+    sock.close()
diff --git a/client.py b/src/client.py
similarity index 55%
rename from client.py
rename to src/client.py
index aa74280..aeda160 100644
--- a/client.py
+++ b/src/client.py
@@ -1,18 +1,17 @@
 import socket
 import struct
 
-multicast_address = '224.0.0.251'
-multicast_port = 5353
+from config import MULTICAST_IP, MULTICAST_PORT
 
 sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-sock.bind(('', multicast_port))
+sock.bind(("", MULTICAST_PORT))
 
-group = socket.inet_aton(multicast_address)
-mreq = struct.pack('4sL', group, socket.INADDR_ANY)
+group = socket.inet_aton(MULTICAST_IP)
+mreq = struct.pack("4sL", group, socket.INADDR_ANY)
 sock.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, mreq)
 
-print(f"Listening for messages on {multicast_address}:{multicast_port}")
+print(f"Listening for messages on {MULTICAST_IP}:{MULTICAST_PORT}")
 
 while True:
     data, addr = sock.recvfrom(1024)
diff --git a/src/config.py b/src/config.py
new file mode 100644
index 0000000..3224e0b
--- /dev/null
+++ b/src/config.py
@@ -0,0 +1,8 @@
+MULTICAST_IP = "224.0.0.1"
+MULTICAST_PORT = 5353
+
+BROADCAST_INTERVAL = 5
+
+SERVICE_NAME = "windows.local"
+SERVICE_IP = "192.168.137.1"
+SERVICE_PORT = 5000
diff --git a/src/setup.cfg b/src/setup.cfg
new file mode 100644
index 0000000..fedd799
--- /dev/null
+++ b/src/setup.cfg
@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 110
\ No newline at end of file