From a178480912567e15f0ac300e013538437edc8d10 Mon Sep 17 00:00:00 2001 From: drdolgovvv Date: Wed, 17 Jun 2026 16:54:58 +0300 Subject: [PATCH] refactor: moving config files to separate folder --- .Rprofile | 5 +++-- .gitignore | 2 +- R/modules/global_options.R | 2 +- R/utils/init_login_db.r | 2 +- config_example.yml => config/config_example.yml | 6 +++--- descr.yml => config/descr.yml | 0 6 files changed, 9 insertions(+), 8 deletions(-) rename config_example.yml => config/config_example.yml (54%) rename descr.yml => config/descr.yml (100%) diff --git a/.Rprofile b/.Rprofile index c867cf1..f1c39cd 100644 --- a/.Rprofile +++ b/.Rprofile @@ -28,6 +28,7 @@ source("renv/activate.R") cli::cli_code(paste0("R_CONFIG_ACTIVE", "=")) } + Sys.setenv(R_CONFIG_FILE = "config/config.yml") })() @@ -35,8 +36,8 @@ source("renv/activate.R") # при первом запуске скопировать пример конфига (function() { - if (!file.exists("config.yml")) { - file.copy("config_example.yml", "config.yml") + if (!file.exists("config/config.yml")) { + file.copy("config/config_example.yml", "config/config.yml") } })() diff --git a/.gitignore b/.gitignore index 0d7f99a..ab8065f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ /_devel /all_bases -config.yml +config/config.yml .Renviron .DS_Store diff --git a/R/modules/global_options.R b/R/modules/global_options.R index e887233..cf18b86 100644 --- a/R/modules/global_options.R +++ b/R/modules/global_options.R @@ -64,7 +64,7 @@ check_and_init_scheme = function() { # список файлов, изменение которых, приведут к переинициализиации схемы files_to_watch <- c( - "config.yml", + "config/config.yml", "R/modules/scheme_generator.R", "R/modules/utils.R" ) diff --git a/R/utils/init_login_db.r b/R/utils/init_login_db.r index d91040b..3a29e33 100644 --- a/R/utils/init_login_db.r +++ b/R/utils/init_login_db.r @@ -14,7 +14,7 @@ credentials <- data.frame( # Init the database shinymanager::create_db( credentials_data = credentials, - sqlite_path = "auth.sqlite", # will be created + sqlite_path = "config/auth.sqlite", # will be created passphrase = Sys.getenv("AUTH_DB_KEY") # passphrase = "passphrase_wihtout_keyring" ) diff --git a/config_example.yml b/config/config_example.yml similarity index 54% rename from config_example.yml rename to config/config_example.yml index dc2cee3..5f445c4 100644 --- a/config_example.yml +++ b/config/config_example.yml @@ -1,7 +1,7 @@ default: - form_app_version: !expr config::get("form_app_version", file = "descr.yml") - form_id: !expr config::get("form_id", file = "descr.yml") - form_name: !expr config::get("form_name", file = "descr.yml") + form_app_version: !expr config::get("form_app_version", file = "config/descr.yml") + form_id: !expr config::get("form_id", file = "config/descr.yml") + form_name: !expr config::get("form_name", file = "config/descr.yml") prod: form_app_configure_path: "example_scheme" diff --git a/descr.yml b/config/descr.yml similarity index 100% rename from descr.yml rename to config/descr.yml