From 706bbac9f0a84e06102d31d9c176e24e0c22526d Mon Sep 17 00:00:00 2001 From: prash3r Date: Wed, 14 Sep 2022 19:04:58 +0200 Subject: [PATCH] keeps default dev config unchanged. this commit moves the default config into a seperate folder. And it adds a preLaunchTask which copies the default dev config to the used dev config. This is done with the cp option '-ru' so if the files in the target dir (current config) are newer they are not overwritten. --- .../actor.json | 0 .../chromium.desktop | 0 .../config.json | 0 .../config.yaml | 0 .../craftbeerpi.service | 0 .../dashboard/cbpi_dashboard_1.json | 0 .../dashboard/widgets/.gitkeep | 0 .../fermenter_data.json | 0 .../fermenterrecipes/.gitkeep | 0 .../kettle.json | 0 .../recipes/.gitkeep | 0 .../sensor.json | 0 .../step_data.json | 0 .../upload/.gitkeep | 0 .vscode/launch.json | 3 ++- .vscode/tasks.json | 20 +++++++++++++++++++ cbpi/configFolder.py | 3 ++- 17 files changed, 24 insertions(+), 2 deletions(-) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/actor.json (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/chromium.desktop (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/config.json (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/config.yaml (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/craftbeerpi.service (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/dashboard/cbpi_dashboard_1.json (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/dashboard/widgets/.gitkeep (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/fermenter_data.json (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/fermenterrecipes/.gitkeep (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/kettle.json (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/recipes/.gitkeep (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/sensor.json (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/step_data.json (100%) rename .devcontainer/{cbpi-dev-config => cbpi-default-dev-config}/upload/.gitkeep (100%) create mode 100644 .vscode/tasks.json diff --git a/.devcontainer/cbpi-dev-config/actor.json b/.devcontainer/cbpi-default-dev-config/actor.json similarity index 100% rename from .devcontainer/cbpi-dev-config/actor.json rename to .devcontainer/cbpi-default-dev-config/actor.json diff --git a/.devcontainer/cbpi-dev-config/chromium.desktop b/.devcontainer/cbpi-default-dev-config/chromium.desktop similarity index 100% rename from .devcontainer/cbpi-dev-config/chromium.desktop rename to .devcontainer/cbpi-default-dev-config/chromium.desktop diff --git a/.devcontainer/cbpi-dev-config/config.json b/.devcontainer/cbpi-default-dev-config/config.json similarity index 100% rename from .devcontainer/cbpi-dev-config/config.json rename to .devcontainer/cbpi-default-dev-config/config.json diff --git a/.devcontainer/cbpi-dev-config/config.yaml b/.devcontainer/cbpi-default-dev-config/config.yaml similarity index 100% rename from .devcontainer/cbpi-dev-config/config.yaml rename to .devcontainer/cbpi-default-dev-config/config.yaml diff --git a/.devcontainer/cbpi-dev-config/craftbeerpi.service b/.devcontainer/cbpi-default-dev-config/craftbeerpi.service similarity index 100% rename from .devcontainer/cbpi-dev-config/craftbeerpi.service rename to .devcontainer/cbpi-default-dev-config/craftbeerpi.service diff --git a/.devcontainer/cbpi-dev-config/dashboard/cbpi_dashboard_1.json b/.devcontainer/cbpi-default-dev-config/dashboard/cbpi_dashboard_1.json similarity index 100% rename from .devcontainer/cbpi-dev-config/dashboard/cbpi_dashboard_1.json rename to .devcontainer/cbpi-default-dev-config/dashboard/cbpi_dashboard_1.json diff --git a/.devcontainer/cbpi-dev-config/dashboard/widgets/.gitkeep b/.devcontainer/cbpi-default-dev-config/dashboard/widgets/.gitkeep similarity index 100% rename from .devcontainer/cbpi-dev-config/dashboard/widgets/.gitkeep rename to .devcontainer/cbpi-default-dev-config/dashboard/widgets/.gitkeep diff --git a/.devcontainer/cbpi-dev-config/fermenter_data.json b/.devcontainer/cbpi-default-dev-config/fermenter_data.json similarity index 100% rename from .devcontainer/cbpi-dev-config/fermenter_data.json rename to .devcontainer/cbpi-default-dev-config/fermenter_data.json diff --git a/.devcontainer/cbpi-dev-config/fermenterrecipes/.gitkeep b/.devcontainer/cbpi-default-dev-config/fermenterrecipes/.gitkeep similarity index 100% rename from .devcontainer/cbpi-dev-config/fermenterrecipes/.gitkeep rename to .devcontainer/cbpi-default-dev-config/fermenterrecipes/.gitkeep diff --git a/.devcontainer/cbpi-dev-config/kettle.json b/.devcontainer/cbpi-default-dev-config/kettle.json similarity index 100% rename from .devcontainer/cbpi-dev-config/kettle.json rename to .devcontainer/cbpi-default-dev-config/kettle.json diff --git a/.devcontainer/cbpi-dev-config/recipes/.gitkeep b/.devcontainer/cbpi-default-dev-config/recipes/.gitkeep similarity index 100% rename from .devcontainer/cbpi-dev-config/recipes/.gitkeep rename to .devcontainer/cbpi-default-dev-config/recipes/.gitkeep diff --git a/.devcontainer/cbpi-dev-config/sensor.json b/.devcontainer/cbpi-default-dev-config/sensor.json similarity index 100% rename from .devcontainer/cbpi-dev-config/sensor.json rename to .devcontainer/cbpi-default-dev-config/sensor.json diff --git a/.devcontainer/cbpi-dev-config/step_data.json b/.devcontainer/cbpi-default-dev-config/step_data.json similarity index 100% rename from .devcontainer/cbpi-dev-config/step_data.json rename to .devcontainer/cbpi-default-dev-config/step_data.json diff --git a/.devcontainer/cbpi-dev-config/upload/.gitkeep b/.devcontainer/cbpi-default-dev-config/upload/.gitkeep similarity index 100% rename from .devcontainer/cbpi-dev-config/upload/.gitkeep rename to .devcontainer/cbpi-default-dev-config/upload/.gitkeep diff --git a/.vscode/launch.json b/.vscode/launch.json index 73c363b..a3c07c1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,8 @@ "type": "python", "request": "launch", "module": "run", - "args": ["--config-folder-path=./.devcontainer/cbpi-dev-config", "start"] + "args": ["--config-folder-path=./.devcontainer/cbpi-dev-config", "start"], + "preLaunchTask": "copy default cbpi config files if dev config files dont exist" }, { diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..05db7ee --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,20 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "copy default cbpi config files if dev config files dont exist", + "type": "shell", + "command": "cp -ru ${workspaceFolder}/.devcontainer/cbpi-default-dev-config/. ${workspaceFolder}/.devcontainer/cbpi-dev-config", + "windows": { + "command": "echo 'this pre debug task should only be run inside the docker dev container - doing nothing instead'" + }, + "group": "build", + "presentation": { + "reveal": "silent", + "panel": "shared" + } + } + ] +} \ No newline at end of file diff --git a/cbpi/configFolder.py b/cbpi/configFolder.py index d3690cb..fc21aa5 100644 --- a/cbpi/configFolder.py +++ b/cbpi/configFolder.py @@ -14,7 +14,8 @@ class ConfigFolder: def __init__(self, configFolderPath, logsFolderPath): self.configFolderPath = configFolderPath self.logsFolderPath = logsFolderPath - self.logger.info("Config folder path : " + os.path.join(Path(self.cbpi.config_folder.configFolderPath).absolute())) + print("config folder path : " + configFolderPath) + print("logs folder path : " + logsFolderPath) def config_file_exists(self, path): return os.path.exists(self.get_file_path(path))