From 7ee01c0e4a1bcd152091cd98ccb0371902cf90af Mon Sep 17 00:00:00 2001
From: Karl Hudgell <karl.hudgell@bjss.com>
Date: Fri, 20 Sep 2024 17:44:22 +0100
Subject: [PATCH] move config to mqtt client

---
 buttons.py  | 18 ++----------------
 lib/mqtt.py | 21 +++++++++++++--------
 main.py     | 17 +----------------
 3 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/buttons.py b/buttons.py
index e6154d0..c07fc8a 100644
--- a/buttons.py
+++ b/buttons.py
@@ -1,22 +1,8 @@
-import os
 import RPi.GPIO as GPIO
 import time
-from dotenv import load_dotenv
-from lib.mqtt import create_client, update_disc, control_player, create_config, check_current_disc
+from lib.mqtt import create_client, control_player, create_config
 
-# Load the .env file
-load_dotenv()
-
-# Define the MQTT server details
-broker = os.environ.get("broker")
-port = int(os.environ.get("port"))
-# MQTT username and password
-username = os.environ.get("username")
-password = os.environ.get("password")
-
-#print(f"Broker: {broker}, Port: {port}, Username: {username}")
-
-client = create_client(broker, port, username, password)
+client = create_client()
 
 create_config(client)
 
diff --git a/lib/mqtt.py b/lib/mqtt.py
index 54eda42..5f0adc3 100644
--- a/lib/mqtt.py
+++ b/lib/mqtt.py
@@ -1,17 +1,22 @@
+import os
 import paho.mqtt.client as mqtt
-import paho.mqtt.subscribe as subscribe
 import json
+from dotenv import load_dotenv
+
+# Load the .env file
+load_dotenv()
+
+# Define the MQTT server details
+broker = os.environ.get("broker")
+port = int(os.environ.get("port"))
+# MQTT username and password
+username = os.environ.get("username")
+password = os.environ.get("password")
 
 
-def create_client(broker: str, port: int, username: str, password: str) -> mqtt.Client:
+def create_client() -> mqtt.Client:
     """Create an MQTT client and connect it to the broker
 
-    Args:
-        broker (str): MQTT broker address
-        port (int): MQTT broker port
-        username (str): Username for MQTT broker
-        password (str): Password for MQTT broker
-
     Returns:
         mqtt.Client: Connected MQTT client instance
     """
diff --git a/main.py b/main.py
index 0871103..f7156af 100644
--- a/main.py
+++ b/main.py
@@ -1,22 +1,7 @@
-import os
 import sys
-import time
-from dotenv import load_dotenv
 from lib.mqtt import create_client, update_disc, control_player, create_config, check_current_disc
 
-# Load the .env file
-load_dotenv()
-
-# Define the MQTT server details
-broker = os.environ.get("broker")
-port = int(os.environ.get("port"))
-# MQTT username and password
-username = os.environ.get("username")
-password = os.environ.get("password")
-
-#print(f"Broker: {broker}, Port: {port}, Username: {username}")
-
-client = create_client(broker, port, username, password)
+client = create_client()
 
 create_config(client)