From 247393466dd37e9eaf1d789dd4bada589aacecf0 Mon Sep 17 00:00:00 2001
From: Karmanyaah Malhotra <karmanyaahm@gmail.com>
Date: Fri, 6 Nov 2020 03:29:54 -0500
Subject: [PATCH] config file

Improve config management.
Modify service file to support install

Fix config directory creation
---
 .gitignore           |  1 +
 gotify-dunst.conf    |  3 +++
 gotify-dunst.service |  7 +++----
 main.py              | 24 ++++++++++++++++++++++--
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 gotify-dunst.conf

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4c49bd7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.env
diff --git a/gotify-dunst.conf b/gotify-dunst.conf
new file mode 100644
index 0000000..c9e1373
--- /dev/null
+++ b/gotify-dunst.conf
@@ -0,0 +1,3 @@
+[server]
+domain=push.example.com
+token=C2Un.92TZBzsukg
diff --git a/gotify-dunst.service b/gotify-dunst.service
index 058bbd6..ab511c6 100644
--- a/gotify-dunst.service
+++ b/gotify-dunst.service
@@ -3,10 +3,9 @@ Description=Gotify-Dunst
 After=network.target
 
 [Service]
-User=<user>
-WorkingDirectory=<your-path>/gotify-dunst/
-ExecStart=<your-path>/gotify-dunst/.env/bin/python main.py
+WorkingDirectory=/usr/lib/gotify-dunst/
+ExecStart=/usr/bin/env python3 main.py
 Restart=always
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target
diff --git a/main.py b/main.py
index ae71b0e..5ae793f 100644
--- a/main.py
+++ b/main.py
@@ -3,11 +3,31 @@ from urllib.request import urlopen
 import json
 import subprocess
 import os.path
+import configparser
+
 
-domain = "push.example.com"
-token = "z2Uny92TZBzsukg"
 
 home = os.path.expanduser('~')
+configpath = home+'/.config/gotify-dunst/gotify-dunst.conf'
+
+if not os.path.isfile(configpath):
+    from shutil import copyfile
+    from os import makedirs
+    makedirs(home+'/.config/gotify-dunst/',exist_ok=True)
+    copyfile('gotify-dunst.conf',configpath)
+
+config = configparser.ConfigParser()
+config.read(configpath)
+
+domain = config.get('server','domain',fallback=None)
+
+if domain in [ "push.example.com", None]:
+    print("Confiuration error. Make sure you have properly modified the configuration")
+    exit()
+
+token = config.get('server','token')
+
+
 path = "{}/.cache/gotify-dunst".format(home)
 if not os.path.isdir(path):
     os.mkdir(path)