From c3e74af21f188c4bf983fb5c2a8a05d72773aa50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Todor=20Kondi=C4=87?= <kontrapunkt@uclmail.net>
Date: Sun, 5 Mar 2023 13:45:01 +0100
Subject: [PATCH] Fun unpack_app_state changes gui$paths$data to absolute path
now (otherwise dfile_list is not immediately filled).
---
R/shiny-state.R | 6 ++--
R/shiny-ui-base.R | 76 +++++++++++++++++++----------------------------
2 files changed, 35 insertions(+), 47 deletions(-)
diff --git a/R/shiny-state.R b/R/shiny-state.R
index 930f6eb..ef287a0 100644
--- a/R/shiny-state.R
+++ b/R/shiny-state.R
@@ -329,8 +329,10 @@ unpack_app_state <- function(session,envopts,input,top_data_dir,project_path,pac
gui$filetag$tag <- packed_state$filetag$tag
x <- packed_state$paths$data
- gui$paths$data = if (length(x)>0 && nchar(x)>0) basename(x) else ""
- if (!dir.exists(file.path(top_data_dir,gui$paths$data))) {warning("Data directory ", gui$paths$data, " does not exist. You must select one.")}
+ gui$paths$data = if (length(x)>0 && nchar(x)>0) {
+ file.path(top_data_dir,basename(x))
+ } else ""
+ if (!dir.exists(gui$paths$data)) {warning("Data directory ", gui$paths$data, " does not exist. You must select one.")}
gui
})
diff --git a/R/shiny-ui-base.R b/R/shiny-ui-base.R
index 6726937..8cd232e 100644
--- a/R/shiny-ui-base.R
+++ b/R/shiny-ui-base.R
@@ -905,29 +905,35 @@ mk_shinyscreen_server <- function(projects,init) {
choices = list.files(path=top_data_dir,
pattern = CMPD_LIST_PATT))
- updateSelectInput(session = session,
- inputId = "dfile_list",
- choices = list.files(path=top_data_dir,
- pattern = DFILES_LIST_PATT))
- updateSelectInput(session = session,
- inputId = "top_data_dir_list",
- selected = basename(top_data_dir),
- choices = list.dirs(path = init$envopts$top_data_dir,
- full.names = F,
- recursive = F))
})
observe({
- top_data_dir = rvs$gui$paths$data
- req(isTruthy(top_data_dir) && dir.exists(top_data_dir))
+ data_dir = rvs$gui$paths$data
+ if ((isTruthy(data_dir) && dir.exists(data_dir))) {
+
+ dfchoices = list.files(path=data_dir,
+ pattern = DFILES_LIST_PATT)
+
+
+ updateSelectInput(session = session,
+ inputId = "dfile_list",
+ choices = dfchoices)
+
+
+
+ updateSelectInput(session = session,
+ inputId = "top_data_dir_list",
+ selected = basename(rvs$gui$paths$data),
+ choices = list.dirs(path = init$envopts$top_data_dir,
+ full.names = F,
+ recursive = F))
+ }
+
- updateSelectInput(session = session,
- inputId = "dfile_list",
- choices = list.files(path=top_data_dir,
- pattern = DFILES_LIST_PATT))
})
+
## Update projects and data directories every second.
observeEvent(rtimer1000(),{
@@ -988,6 +994,8 @@ mk_shinyscreen_server <- function(projects,init) {
message("Initialising project: ",wd)
rvs$gui = create_gui(project_path=fullwd)
}
+
+
message("project: ",rvs$gui$project())
}, label = "project-b")
@@ -1017,10 +1025,11 @@ mk_shinyscreen_server <- function(projects,init) {
observeEvent(input$sel_data_dir_b,{
data_dir = input$top_data_dir_list
- req(isTruthy(data_dir))
- rvs$gui$paths$data = file.path(init$envopts$top_data_dir, data_dir)
-
- message("Selected data dir:",rvs$gui$paths$data)
+ if (isTruthy(data_dir)) {
+ rvs$gui$paths$data = file.path(init$envopts$top_data_dir, data_dir)
+ message("Selected data dir:",rvs$gui$paths$data)
+ }
+
})
@@ -1045,32 +1054,9 @@ mk_shinyscreen_server <- function(projects,init) {
observeEvent(input$datafiles_b,{
new_file = input$dfile_list
- if (isTruthy(new_file)) {
- rvs$gui$filetag = filetag_add_file(rvs$gui$filetag,
- new_file)
+ if (isTruthy(new_file)) rvs$gui$filetag = filetag_add_file(rvs$gui$filetag,
+ new_file)
- ## curr_file = rvs$gui$datatab$file
- ## curr_tag = rvs$gui$datatab$tag
- ## curr_adduct = rvs$gui$datatab$adduct
- ## curr_set = rvs$gui$datatab$set
-
- ## res_file = union(curr_file,new_file)
-
- ## res_adduct = c(curr_adduct,rep(NA_character_,nd))
- ## res_set = c(curr_set,rep(NA_character_,nd))
- ## rvs$gui$datatab$file = res_file
- ## rvs$gui$datatab$tag = add_new_def_tag(as.character(rvs$gui$datatab$tag),nd)
- ## rvs$gui$datatab$adduct = res_adduct
- ## rvs$gui$datatab$set = res_set
-
-
- }
-
- updateSelectInput(session=session,
- inputId="dfile_list",
- selected=NULL)
-
-
})
observeEvent(input$rem_dfiles_b,{
--
GitLab