diff --git a/.gitignore b/.gitignore index a3de219..0d7f99a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ /_devel /all_bases -scheme.rds config.yml .Renviron diff --git a/app.R b/app.R index 0334fca..b59fc9c 100644 --- a/app.R +++ b/app.R @@ -39,7 +39,7 @@ enabled_schemes <- unlist(config::get()$form_schemes) enabled_schemes <- setNames(names(enabled_schemes), enabled_schemes) # load schemes object: -schms <- readRDS("scheme.rds") +schms <- readRDS("temp/scheme.rds") # CHECK FOR PANDOC ---------- # rmarkdown::find_pandoc(dir = "/opt/homebrew/bin/") diff --git a/modules/global_options.R b/modules/global_options.R index dc94b7c..68ec8fd 100644 --- a/modules/global_options.R +++ b/modules/global_options.R @@ -75,7 +75,7 @@ check_and_init_scheme = function() { exist_hash <- tools::md5sum(c(scheme_file, files_to_watch)) # если первый запуск (нет файла с кешем) инициализация схемы - if (!file.exists(hash_file) | !file.exists("scheme.rds") | !all(file.exists(db_files))) { + if (!file.exists(hash_file) | !file.exists("temp/scheme.rds") | !all(file.exists(db_files))) { init_scheme(scheme_file) @@ -155,5 +155,5 @@ init_scheme = function(scheme_file) { cli::cli_abort(c("В одной или нескольких схемах наименования вложенных форм совпадают:", paste("-", names(tab)[tab > 1]))) } - saveRDS(schms, "scheme.rds") + saveRDS(schms, "temp/scheme.rds") } diff --git a/renv.lock b/renv.lock index ca6849e..0c36946 100644 --- a/renv.lock +++ b/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.3.1", + "Version": "4.3.2", "Repositories": [ { "Name": "CRAN", @@ -717,6 +717,19 @@ ], "Hash": "b8552d117e1b808b09a832f589b79035" }, + "lubridate": { + "Package": "lubridate", + "Version": "1.9.5", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "generics", + "methods", + "timechange" + ], + "Hash": "07061b348d057e8ac86771e0eff36b62" + }, "magrittr": { "Package": "magrittr", "Version": "2.0.3", @@ -1203,6 +1216,17 @@ ], "Hash": "79540e5fcd9e0435af547d885f184fd5" }, + "timechange": { + "Package": "timechange", + "Version": "0.4.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cpp11" + ], + "Hash": "39c40cb1ad47a4cc384a34a22a29463f" + }, "tinytex": { "Package": "tinytex", "Version": "0.46", diff --git a/test.xlsx b/test.xlsx deleted file mode 100644 index dc38ed3..0000000 Binary files a/test.xlsx and /dev/null differ