Merge pull request #12 from djotaku/devel

Adding Config for MQTT

README.md

@@ -10,3 +10,24 @@ On that model, if you connect it with the red wire, it goes high (1) if the gara
 As of v0.3.0 it now works with MQTT and is useful for using with Home Assistant:
 
 ![mqtt animated gif](https://raw.githubusercontent.com/djotaku/raspi_garage_alert/master/screenshots/mqtt.gif)
+
+You should have the following config files in $HOME/.config/raspigaragealert/: mqtt.conf and matrix.conf
+
+*mqtt.conf*
+```json
+{
+"channel":"something/somethingelse",
+"server":"mqtt server url or ip address",
+"client_id":"client_if for raspberry pi"
+}
+```
+
+*matrix.conf*
+```json
+{
+"server":"url or IP address of server",
+"room":"room ID will look like !randomletters:server.com"
+"username":"name of user for posting",
+"password":"password for that user"
+}
+```

raspigaragealert/alert.py

@@ -8,7 +8,7 @@
 def main():
     xdg = xdgenvpy.XDGPedanticPackage('raspigaragealert')
     my_door = door.door(7)
-    mqtt_service = mqtt.Publisher("garage/door1", "tanukimario.mushroomkingdom")  # testing values - will need to make user configurable
+    mqtt_service = mqtt.Publisher(xdg)  # testing values - will need to make user configurable
     my_matrix_bot = matrix.MatrixBot(xdg)
     loop = True
     success = False

raspigaragealert/services/matrix.py

@@ -11,7 +11,7 @@ def __init__(self, xdg):
         try:
             with open(f'{self.xdg.XDG_CONFIG_HOME}/matrix.conf') as file:
                 self.config = json.load(file)
-                print("Config loaded.")
+                print("Matrix Config loaded.")
                 file.close()
         except FileNotFoundError:
             print(f"Settings not found at {self.xdg.XDG_CONFIG_HOME}")

raspigaragealert/services/mqtt.py

@@ -1,5 +1,6 @@
 """Publish state via MQTT."""
 
+import json
 import paho.mqtt.publish as publish
 
 
@@ -9,10 +10,13 @@ class Publisher():
     :param channel: The channel that the messages will be published on.
     :param server: The MQTT server messages will be sent to.
     """
-    def __init__(self, channel, server):
-        self.channel = channel
-        self.server = server
-        self.client_id = "garage_pi"
+    def __init__(self, xdg):
+        with open(f'{xdg.XDG_CONFIG_HOME}/mqtt.conf') as file:
+            config = json.load(file)
+            print("mqtt config laoded")
+        self.channel = config.get("channel")
+        self.server = config.get("server")
+        self.client_id = config.get("client_id")
 
     def publish(self, message) -> bool:
         """Publish message to MQTT server.