From 85b14a73ed821619fc45cf08199c64ca4017caa0 Mon Sep 17 00:00:00 2001 From: Thomas Klaehn 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..d7011a8 100644 --- a/greenhouse/app.py +++ b/greenhouse/app.py @@ -1,3 +1,5 @@ +import os +import site import json import datetime import logging @@ -18,7 +20,8 @@ heat_pin = 26 heat_state = False -CONFIG_FILE = "/etc/greenhouse/greenhouse.json" +PACKAGE_PATH = site.getsitepackages()[0] +CONFIG_FILE = os.path.join(PACKAGE_PATH, "greenhouse/config/greenhouse.json") GPIO.setwarnings(False) GPIO.setmode(GPIO.BCM) 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