switched config to ini. removed pyinstyller workflows

Author: Der-Henning

.github/workflows/pyinstaller-linux.yml

@@ -2,4 +2,4 @@ __pycache__
 build
 dist
 
-docker-compose.dev.yml
+.env

.github/workflows/pyinstaller-windows.yml

@@ -21,7 +21,7 @@ If someone wants to make a detailed guide, feel free to contribute to the projec
 
 1. Download Release from https://github.com/Der-Henning/tgtg/releases
 2. Unzip Archiv
-3. Edit ```.env``` as described in the file
+3. Create ```config.ini``` as described in the file ```config.template.ini```
 4. Run scanner
 
 ### Install from source
@@ -30,7 +30,7 @@ If someone wants to make a detailed guide, feel free to contribute to the projec
 
 1. Install python3
 2. Run ```pip3 install -r requirements.txt```
-3. Edit ```/src/.env``` as described in the file
+3. Create ```/src/config.ini``` as described in the file ```config.template.ini```
 4. Register ```python {install directory}/src/scanner.py``` as a service or just run it manually
 
 #### With Docker

.gitignore

@@ -0,0 +1,8 @@
+version: "3.3"
+services:
+  app:
+    build: .
+    environment: 
+      - DEBUG=true
+    env_file: 
+      - .env

README.md

@@ -1,7 +1,6 @@
 certifi==2021.5.30
 chardet==4.0.0
 idna==2.10
-python-dotenv==0.19.0
 python-pushsafer==0.4
 requests==2.25.1
 tgtg==0.5.0

docker-compose.dev.yml

@@ -7,8 +7,8 @@ block_cipher = None
 a = Analysis(['src/scanner.py'],
              pathex=['/home/app'],
              binaries=[],
-             datas=[('src/models', 'models'),('src/notifiers', 'notifiers'),('src/.env', '.')],
-             hiddenimports=['pushsafer', 'requests', 'smtplib', 'email.mime.multipart', 'email.mime.text'],
+             datas=[],
+             hiddenimports=[],
              hookspath=[],
              hooksconfig={},
              runtime_hooks=[],
@@ -21,24 +21,20 @@ pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)
 
 exe = EXE(pyz,
-          a.scripts, 
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,  
           [],
-          exclude_binaries=True,
           name='scanner',
           debug=False,
           bootloader_ignore_signals=False,
           strip=False,
           upx=True,
+          upx_exclude=[],
+          runtime_tmpdir=None,
           console=True,
           disable_windowed_traceback=False,
           target_arch=None,
           codesign_identity=None,
-          entitlements_file=None )
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas, 
-               strip=False,
-               upx=True,
-               upx_exclude=[],
-               name='scanner')
+          entitlements_file=None , icon='icon.ico')

icon.ico

@@ -0,0 +1,36 @@
+[MAIN]
+## true for debug log messages
+Debug = false
+## Time to wait till next scan in seconds - default 20 seconds
+SleepTime = 20
+;ItemIDs = 
+
+[TGTG]
+## TGTG Username and Password / Login EMail
+Username = 
+Password = 
+
+#### Notifiers
+## To enable notifier fill in the needed settings
+## and set enabled to true
+
+[SMTP]
+## SMTP Settings / Example for gmail
+enabled = true
+Host = smtp.gmail.com
+Port = 465
+Username = max.mustermann@gmail.com
+Password = 
+TLS = true 
+Sender = max.mustermann@gmail.com
+Recipient = max.mustermann@gmail.com
+
+[PUSHSAFER]
+enabled = false
+Key = 
+DeviceID = 
+
+[IFTTT]
+enabled = false
+Event = 
+Key = 

requirements.txt

@@ -1,8 +1,55 @@
 from os import environ
+import configparser
 
 
 class Config():
-    def __init__(self):
+    def __init__(self, file=None):
+        self.item_ids = []
+        self.sleep_time = 20
+        self.debug = False
+        self.tgtg = {}
+        self.pushSafer = {}
+        self.smtp = {}
+        self.ifttt = {}
+        self.webhook = {}
+        if file:
+            self._ini_reader(file)
+        else:
+            self._env_reader()
+
+    def _ini_reader(self, file):
+        config = configparser.ConfigParser()
+        config.read(file)
+        self.debug = config["MAIN"]["Debug"].lower() in ('true', '1', 't')
+        self.item_ids = config["MAIN"]["ItemIDs"].split(
+            ',') if "ItemIDs" in config["MAIN"] else []
+        self.sleep_time = int(config["MAIN"]["SleepTime"])
+        self.tgtg = {
+            "username": config["TGTG"]["Username"],
+            "password": config["TGTG"]["Password"]
+        }
+        self.pushSafer = {
+            "enabled": config["PUSHSAFER"]["enabled"].lower() in ('true', '1', 't'),
+            "key": config["PUSHSAFER"]["Key"],
+            "deviceId": config["PUSHSAFER"]["DeviceID"]
+        }
+        self.smtp = {
+            "enabled": config["SMTP"]["enabled"].lower() in ('true', '1', 't'),
+            "host": config["SMTP"]["Host"],
+            "port": config["SMTP"]["Port"],
+            "tls": config["SMTP"]["TLS"].lower() in ('true', '1', 't'),
+            "username": config["SMTP"]["Username"],
+            "password": config["SMTP"]["Password"],
+            "sender": config["SMTP"]["Sender"],
+            "recipient": config["SMTP"]["Recipient"]
+        }
+        self.ifttt = {
+            "enabled": config["IFTTT"]["enabled"].lower() in ('true', '1', 't'),
+            "event": config["IFTTT"]["Event"],
+            "key": config["IFTTT"]["Key"]
+        }
+
+    def _env_reader(self):
         self.item_ids = environ.get("ITEM_IDS").split(
             ",") if environ.get("ITEM_IDS") else []
         self.sleep_time = int(environ.get("SLEEP_TIME", 20))
@@ -33,7 +80,7 @@ def __init__(self):
             "key": environ.get("IFTTT_KEY")
         }
 
-        ## ToDo: create notifier for any WebHook
+        # ToDo: create notifier for any WebHook
         self.webhook = {
             "enabled": False
         }

scanner.spec

@@ -1,4 +1,3 @@
-from dotenv import load_dotenv
 from tgtg import TgtgClient
 from time import sleep
 import sys
@@ -8,13 +7,13 @@
 from notifiers import Notifier
 from models import Item, Config
 
-basedir = path.abspath(path.dirname(__file__))
-load_dotenv(path.join(basedir, '.env'))
-
 
 class Scanner():
     def __init__(self):
-        self.config = Config()
+        config_file = path.join(path.dirname(sys.executable), 'config.ini') if getattr(
+            sys, '_MEIPASS', False) else path.join(path.dirname(path.abspath(__file__)), 'config.ini')
+        print(config_file)
+        self.config = Config() if not path.isfile(config_file) else Config(config_file)
         log.basicConfig(level=log.DEBUG if self.config.debug else log.INFO)
         self.item_ids = self.config.item_ids
         self.amounts = {}