From 3b3f7bd108bbca847bfd901558701036d8c02fc7 Mon Sep 17 00:00:00 2001 From: Christopher LILJENSTOLPE Date: Wed, 6 Apr 2022 10:40:13 -0700 Subject: [PATCH 1/2] added support for XDG for config location --- devdeck/main.py | 9 ++++++--- requirements.txt | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/devdeck/main.py b/devdeck/main.py index 1747404..19792c4 100644 --- a/devdeck/main.py +++ b/devdeck/main.py @@ -5,6 +5,8 @@ from logging.handlers import RotatingFileHandler from pathlib import Path +from xdg.BaseDirectory import * + from StreamDeck.DeviceManager import DeviceManager from devdeck.deck_manager import DeckManager @@ -14,7 +16,8 @@ def main(): - os.makedirs(os.path.join(str(Path.home()), '.devdeck'), exist_ok=True) + config_dir = os.path.join(str(xdg_config_dirs[0]), 'devdeck') + os.makedirs(config_dir, exist_ok=True) root = logging.getLogger('devdeck') root.setLevel(logging.DEBUG) @@ -32,14 +35,14 @@ def main(): error_handler.setFormatter(formatter) root.addHandler(error_handler) - fileHandler = RotatingFileHandler(os.path.join(str(Path.home()), '.devdeck', 'devdeck.log'), maxBytes=100000, + fileHandler = RotatingFileHandler(os.path.join(str(config_dir), 'devdeck.log'), maxBytes=100000, backupCount=5) fileHandler.setFormatter(formatter) root.addHandler(fileHandler) streamdecks = DeviceManager().enumerate() - settings_filename = os.path.join(str(Path.home()), '.devdeck', 'settings.yml') + settings_filename = os.path.join(str(config_dir), 'settings.yml') if not os.path.exists(settings_filename): root.warning("No settings file detected!") diff --git a/requirements.txt b/requirements.txt index ec2d440..54c7b24 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,3 +9,4 @@ pytest pyyaml requests streamdeck +pyxdg From accfe990d53612c1a50a5feafdeaf0d8f3553a0d Mon Sep 17 00:00:00 2001 From: Christopher LILJENSTOLPE Date: Tue, 12 Apr 2022 16:36:02 -0700 Subject: [PATCH 2/2] changed the config dir source --- devdeck/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devdeck/main.py b/devdeck/main.py index 19792c4..dd27171 100644 --- a/devdeck/main.py +++ b/devdeck/main.py @@ -16,9 +16,10 @@ def main(): - config_dir = os.path.join(str(xdg_config_dirs[0]), 'devdeck') + config_dir = os.path.join(str(xdg_config_home), 'devdeck') + assets_dir = os.path.join(str(config_dir), 'assets') os.makedirs(config_dir, exist_ok=True) - + os.makedirs(assets_dir, exist_ok=True) root = logging.getLogger('devdeck') root.setLevel(logging.DEBUG)