move config to mqtt client
This commit is contained in:
parent
ad276591fc
commit
7ee01c0e4a
18
buttons.py
18
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)
|
||||
|
||||
|
21
lib/mqtt.py
21
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
|
||||
"""
|
||||
|
17
main.py
17
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)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user