From a43c556341a59683d777791556a27c4bfa82be29 Mon Sep 17 00:00:00 2001
From: Thomas Klaehn <thomas.klaehn@perinet.io>
Date: Tue, 6 Apr 2021 07:50:18 +0200
Subject: [PATCH] config: Move config file

---
 greenhouse/app.py                                   |  5 ++++-
 .../config/greenhouse.json                          |  0
 setup.py                                            | 13 +------------
 3 files changed, 5 insertions(+), 13 deletions(-)
 rename greenhouse.json => greenhouse/config/greenhouse.json (100%)

diff --git a/greenhouse/app.py b/greenhouse/app.py
index 91dafd0..6cf12f4 100644
--- a/greenhouse/app.py
+++ b/greenhouse/app.py
@@ -1,3 +1,4 @@
+import os
 import json
 import datetime
 import logging
@@ -18,7 +19,7 @@ heat_pin = 26
 
 heat_state = False
 
-CONFIG_FILE = "/etc/greenhouse/greenhouse.json"
+CONFIG_FILE = "greenhouse/config/greenhouse.json"
 
 GPIO.setwarnings(False)
 GPIO.setmode(GPIO.BCM)
@@ -94,6 +95,8 @@ class GreenControl(Thread):
         while self.__run_condition:
             if self.__trigger_read_config:
                 self.__trigger_read_config = False
+                log.info(os.getcwd())
+                sleep(5)
                 with open(self.cfg_file, "r") as f:
                     self.config = json.load(f)
             now = datetime.datetime.now()
diff --git a/greenhouse.json b/greenhouse/config/greenhouse.json
similarity index 100%
rename from greenhouse.json
rename to greenhouse/config/greenhouse.json
diff --git a/setup.py b/setup.py
index b9fe8b9..de6ce47 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,3 @@
-import shutil
-import sys
-import os
 from setuptools import setup
 
 NAME = 'Greenhouse'
@@ -11,16 +8,8 @@ PACKAGES = ['greenhouse']
 REQUIRES = ['Flask', 'w1thermsensor', 'RPi.GPIO']
 CONFIG_FOLDER = '/etc/greenhouse'
 CONFIG_FILE = 'greenhouse.json'
-PACKAGE_DATA = {'greenhouse': ['templates/*', 'static/css/*', 'static/scripts/*']}
+PACKAGE_DATA = {'greenhouse': ['templates/*', 'static/css/*', 'static/scripts/*', 'config/*']}
 
 setup(name=NAME, version=VERSION, long_description=__doc__, author=AUTHOR, author_email=EMAIL,
       packages=PACKAGES, include_package_data=True, package_data=PACKAGE_DATA, zip_safe=False,
       install_requires=REQUIRES)
-
-if sys.argv[1] == 'install':
-    try:
-        os.makedirs(CONFIG_FOLDER)
-        shutil.copyfile(CONFIG_FILE, os.path.join(CONFIG_FOLDER, CONFIG_FILE))
-    except FileExistsError:
-          #FIXME: handle overwriting the config file
-          pass