andreas/FreesearchR
1
0
Fork 0
mirror of https://github.com/agdamsbo/FreesearchR.git synced 2025-09-12 09:59:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

deployed latest

Browse source
This commit is contained in:
Andreas Gammelgaard Damsbo 2025-03-17 20:26:30 +01:00
parent 9e8ff6b4a9
commit a8ab648eda
No known key found for this signature in database
6 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
R/app_version.R
View file

@ -1 +1 @@
app_version <- function()'250317_1458' app_version <- function()'250317_2026'

2
R/data-import.R
View file

@ -84,7 +84,7 @@ data_import_server <- function(id) {
shiny::observeEvent(data_file$data(), { shiny::observeEvent(data_file$data(), {
shiny::req(data_file$data()) shiny::req(data_file$data())
browser()
rv$data_temp <- data_file$data() rv$data_temp <- data_file$data()
rv$code <- append_list(data = data_file$code(), list = rv$code, index = "import") rv$code <- append_list(data = data_file$code(), list = rv$code, index = "import")
}) })

5
R/import-file-ext.R
View file

@ -239,10 +239,7 @@ import_file_server <- function(id,
{ {
req(input$file) req(input$file)
if (is_workbook(input$file$datapath)) shiny::req(input$sheet) if (is_workbook(input$file$datapath)) shiny::req(input$sheet)
# browser()
# browser()
# req(input$skip_rows)
extension <- tools::file_ext(input$file$datapath) extension <- tools::file_ext(input$file$datapath)
parameters <- list( parameters <- list(
@ -253,7 +250,7 @@ import_file_server <- function(id,
encoding = input$encoding, encoding = input$encoding,
na.strings = datamods:::split_char(input$na_label) na.strings = datamods:::split_char(input$na_label)
) )
# browser()
parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(get(read_fns[[extension]])))] parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(get(read_fns[[extension]])))]
# parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(read_fns[[extension]]))] # parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(read_fns[[extension]]))]
imported <- try(rlang::exec(read_fns[[extension]], !!!parameters), silent = TRUE) imported <- try(rlang::exec(read_fns[[extension]], !!!parameters), silent = TRUE)

14
inst/apps/freesearcheR/app.R
View file

@ -10,7 +10,7 @@
#### Current file: R//app_version.R #### Current file: R//app_version.R
######## ########
app_version <- function()'250317_1458' app_version <- function()'250317_2026'
######## ########
@ -1757,7 +1757,7 @@ data_import_server <- function(id) {
shiny::observeEvent(data_file$data(), { shiny::observeEvent(data_file$data(), {
shiny::req(data_file$data()) shiny::req(data_file$data())
browser()
rv$data_temp <- data_file$data() rv$data_temp <- data_file$data()
rv$code <- append_list(data = data_file$code(), list = rv$code, index = "import") rv$code <- append_list(data = data_file$code(), list = rv$code, index = "import")
}) })
@ -2843,10 +2843,7 @@ import_file_server <- function(id,
{ {
req(input$file) req(input$file)
if (is_workbook(input$file$datapath)) shiny::req(input$sheet) if (is_workbook(input$file$datapath)) shiny::req(input$sheet)
# browser()
# browser()
# req(input$skip_rows)
extension <- tools::file_ext(input$file$datapath) extension <- tools::file_ext(input$file$datapath)
parameters <- list( parameters <- list(
@ -2857,7 +2854,7 @@ import_file_server <- function(id,
encoding = input$encoding, encoding = input$encoding,
na.strings = datamods:::split_char(input$na_label) na.strings = datamods:::split_char(input$na_label)
) )
# browser()
parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(get(read_fns[[extension]])))] parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(get(read_fns[[extension]])))]
# parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(read_fns[[extension]]))] # parameters <- parameters[which(names(parameters) %in% rlang::fn_fmls_names(read_fns[[extension]]))]
imported <- try(rlang::exec(read_fns[[extension]], !!!parameters), silent = TRUE) imported <- try(rlang::exec(read_fns[[extension]], !!!parameters), silent = TRUE)
@ -7477,7 +7474,7 @@ server <- function(input, output, session) {
deparse() |> deparse() |>
paste(collapse="") |> paste(collapse="") |>
paste("|> paste("|>
dplyr::select(tidyselect::all_of(c(",paste(input$import_var,collapse=","),"))) |> dplyr::select(",paste(input$import_var,collapse=","),") |>
freesearcheR::default_parsing()") |> freesearcheR::default_parsing()") |>
(\(.x){ (\(.x){
paste0("data <- ",.x) paste0("data <- ",.x)
@ -7725,7 +7722,7 @@ server <- function(input, output, session) {
) )
output$code_import <- shiny::renderPrint({ output$code_import <- shiny::renderPrint({
rv$code$import cat(rv$code$import)
}) })
output$code_data <- shiny::renderPrint({ output$code_data <- shiny::renderPrint({
@ -7734,7 +7731,6 @@ server <- function(input, output, session) {
sapply(ls,\(.x) paste(deparse(.x),collapse=",")), sapply(ls,\(.x) paste(deparse(.x),collapse=",")),
collapse="|> \n") collapse="|> \n")
cat(out) cat(out)
# attr(rv$data, "code")
}) })
output$code_filter <- shiny::renderPrint({ output$code_filter <- shiny::renderPrint({

2
inst/apps/freesearcheR/rsconnect/shinyapps.io/agdamsbo/freesearcheR.dcf
View file

@ -5,6 +5,6 @@ account: agdamsbo
server: shinyapps.io server: shinyapps.io
hostUrl: https://api.shinyapps.io/v1 hostUrl: https://api.shinyapps.io/v1
appId: 13611288 appId: 13611288
bundleId: 9937654 bundleId: 9958659
url: https://agdamsbo.shinyapps.io/freesearcheR/ url: https://agdamsbo.shinyapps.io/freesearcheR/
version: 1 version: 1

2
inst/apps/freesearcheR/server.R
View file

@ -173,7 +173,7 @@ server <- function(input, output, session) {
deparse() |> deparse() |>
paste(collapse="") |> paste(collapse="") |>
paste("|> paste("|>
dplyr::select(tidyselect::all_of(c(",paste(input$import_var,collapse=","),"))) |> dplyr::select(",paste(input$import_var,collapse=","),") |>
freesearcheR::default_parsing()") |> freesearcheR::default_parsing()") |>
(\(.x){ (\(.x){
paste0("data <- ",.x) paste0("data <- ",.x)