Merge pull request #7 from electrocoder/test

Test

Author: electrocoder

.idea/MQTTClient.iml

@@ -4,7 +4,7 @@
 
 Source Code: https://github.com/electrocoder/MQTTClient
 
-MQTT Examples: https://github.com/mesebilisim/mqtt-examples
+MQTT Examples: https://github.com/meseiot/iot-examples
 
 Date: 12.11.2022
 
@@ -251,17 +251,7 @@ def subscribe_list(self, name):
                 self.entry_subscribe_topic_text.set(choice)
 
     def button_disconnect(self):
-        print("button_disconnect")
-        if self.subscriber.connect_stop():
-            self.connect_status_text.set("Disconnect")
-            self.button_connect["state"] = tk.NORMAL
-            self.button_connect["text"] = "Connect"
-            self.button_disconnect["state"] = tk.DISABLED
-            self.button_subscribe_topic[
-                "state"] = tk.DISABLED
-            self.button_publish_topic[
-                "state"] = tk.DISABLED
-            self.button_add_subscribe_topic["state"] = tk.DISABLED
+        self.subscriber.mqtt_disconnect()
 
     def button_subscribe(self):
         print("button_subscribe")

.idea/misc.xml

@@ -4,7 +4,7 @@
 
 Source Code: https://github.com/electrocoder/MQTTClient
 
-MQTT Examples: https://github.com/mesebilisim/mqtt-examples
+MQTT Examples: https://github.com/meseiot/iot-examples
 
 Date: 12.11.2022
 

MQTTClient.py

@@ -1,3 +1,10 @@
+[iothook]
+broker = iothook.com
+port = 1883
+username = iothookpublic
+password = iothookpublic
+topics = #,timestamp,test,testtopic,aaa,$SYS,
+
 [hivemq]
 broker = broker.hivemq.com
 port = 1883
@@ -31,7 +38,7 @@ broker = test.mosquitto.org
 port = 1883
 username = 
 password = 
-topics = #,timestamp,
+topics = #,timestamp,test,
 
 [flespi]
 broker = mqtt.flespi.io
@@ -54,13 +61,6 @@ username =
 password = 
 topics = #,timestamp,
 
-[iothook]
-broker = iothook.com
-port = 1883
-username = iothookpublic
-password = iothookpublic
-topics = #,timestamp,test,testtopic,aaa,$SYS,
-
 [ele]
 broker = iothook.com
 port = 1883

about.py

@@ -4,7 +4,7 @@
 
 Source Code: https://github.com/electrocoder/MQTTClient
 
-MQTT Examples: https://github.com/mesebilisim/mqtt-examples
+MQTT Examples: https://github.com/meseiot/iot-examples
 
 Date: 12.11.2022
 

config_file.ini

@@ -4,7 +4,7 @@
 
 Source Code: https://github.com/electrocoder/MQTTClient
 
-MQTT Examples: https://github.com/mesebilisim/mqtt-examples
+MQTT Examples: https://github.com/meseiot/iot-examples
 
 Date: 12.11.2022
 
@@ -22,46 +22,43 @@ def __init__(self, main_window, font_size):
 
         self.main_window = main_window
         self.title("MQTT Client New Connect")
-        self.geometry("300x300")
+        self.geometry("300x350")
 
-        ipadding = {'ipadx': 10, 'ipady': 10}
+        ipadding = {'ipadx': 5, 'ipady': 5}
 
         frame = Frame(self, padx=5, pady=5)
         frame.grid(row=0, column=1)
 
-        Label(frame, text='Name', padx=5, pady=5).pack()
-        Label(frame, text='Broker', padx=5, pady=5).pack()
-        Label(frame, text='Port', padx=5, pady=5).pack()
-        Label(frame, text='Username', padx=5, pady=5).pack()
-        Label(frame, text='Password', padx=5, pady=5).pack()
+        Label(frame, text='Name').pack(**ipadding)
+        Label(frame, text='Broker').pack(**ipadding)
+        Label(frame, text='Port').pack(**ipadding)
+        Label(frame, text='Username').pack(**ipadding)
+        Label(frame, text='Password').pack(**ipadding)
 
         frame2 = Frame(self, padx=5, pady=5)
         frame2.grid(row=0, column=2)
 
         self.entry_name_text = StringVar(self)
         self.entry_name = Entry(frame2, font=font_size,
-                                textvariable=self.entry_name_text).pack(padx=5,
-                                                                        pady=5)
+                                textvariable=self.entry_name_text).pack(**ipadding)
 
         self.entry_broker_text = StringVar(self)
         self.entry_broker = Entry(frame2, font=font_size,
-                                  textvariable=self.entry_broker_text).pack(
-            padx=5, pady=5)
+                                  textvariable=self.entry_broker_text).pack(**ipadding)
 
         self.entry_port_text = StringVar(self)
         self.entry_port = Entry(frame2, font=font_size,
-                                textvariable=self.entry_port_text).pack(padx=5,
-                                                                        pady=5)
+                                textvariable=self.entry_port_text).pack(**ipadding)
 
         self.entry_username_text = StringVar(self)
         self.entry_username = Entry(frame2, font=font_size,
                                     textvariable=self.entry_username_text).pack(
-            padx=5, pady=5)
+            **ipadding)
 
         self.entry_password_text = StringVar(self)
         self.entry_password = Entry(frame2, font=font_size,
                                     textvariable=self.entry_password_text).pack(
-            padx=5, pady=5)
+            **ipadding)
 
         self.button_cancel = Button(self, text="Cancel",
                                     font=font_size,

config_file.py

@@ -4,7 +4,7 @@
 
 Source Code: https://github.com/electrocoder/MQTTClient
 
-MQTT Examples: https://github.com/mesebilisim/mqtt-examples
+MQTT Examples: https://github.com/meseiot/iot-examples
 
 Date: 26.11.2022
 

new_connect.py

@@ -4,15 +4,17 @@
 
 Source Code: https://github.com/electrocoder/MQTTClient
 
-MQTT Examples: https://github.com/mesebilisim/mqtt-examples
+MQTT Examples: https://github.com/meseiot/iot-examples
 
 Date: 12.11.2022
 
 File: This script is MQTT Subscriber Client
 """
-
+import secrets
 import tkinter as tk
 from datetime import datetime
+from random import randint
+
 import paho.mqtt.client as mqtt
 
 
@@ -33,6 +35,7 @@ def on_connect(self, client, userdata, flags, rc):
                 self.on_message_count, self.publish_message_count))
 
     def on_disconnect(self, client, userdata, rc):
+        print("on_disconnect")
         self.main_window.connect_status_text.set(
             "Disconnect | Message: %s | Publish: %s" % (
                 self.on_message_count, self.publish_message_count))
@@ -69,7 +72,7 @@ def on_message(self, client, userdata, msg):
                 self.on_message_count, self.publish_message_count))
 
     def connect_start(self, name, broker, port, username, password):
-        self.client = mqtt.Client()
+        self.client = mqtt.Client("iothook_%s" % secrets.token_hex(11))
         self.client.on_disconnect = self.on_disconnect
         self.client.on_message = self.on_message
         self.client.on_connect = self.on_connect
@@ -89,3 +92,16 @@ def subscribe_start(self, topic):
     def publish_start(self, topic, msg):
         self.client.publish(topic, msg)
         self.publish_message_count += 1
+
+    def mqtt_disconnect(self):
+        if self.connect_stop():
+            self.main_window.connect_status_text.set("Disconnect")
+            self.main_window.button_connect["state"] = tk.NORMAL
+            self.main_window.button_connect["text"] = "Connect"
+            self.main_window.button_disconnect["state"] = tk.DISABLED
+            self.main_window.button_subscribe_topic[
+                "state"] = tk.DISABLED
+            self.main_window.button_publish_topic[
+                "state"] = tk.DISABLED
+            self.main_window.button_add_subscribe_topic["state"] = tk.DISABLED
+