Refactoring earnaud#6

charlycou · Jul 16, 2020 · 535f15b · 535f15b
1 parent 9ad7f13
commit 535f15b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 62 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -38,8 +38,6 @@ importFrom(dplyr,slice)
 importFrom(emldown,render_eml)
 importFrom(fs,path_home)
 importFrom(gdata,read.xls)
-importFrom(golem,get_golem_options)
-importFrom(golem,with_golem_options)
 importFrom(jsonlite,read_json)
 importFrom(jsonlite,serializeJSON)
 importFrom(jsonlite,unserializeJSON)

diff --git a/R/header.R b/R/header.R
@@ -18,24 +18,10 @@
   # Environment setup ====
   main.env <- new.env()
 
-  assign(
-    "dev",
-    isTRUE(args$dev),
-    main.env
-  )
-  assign(
-    "wip",
-    isTRUE(args$wip),
-    main.env
-  )
-  assign(
-    "reactlog",
-    isTRUE(args$reactlog),
-    main.env
-  )
-
+  assign("dev", args$dev, main.env)
+  assign("wip", args$wip, main.env)
 
-  # Paths====
+  # Paths ====
   wwwPaths <- system.file("resources", package = "MetaShARK") %>%
     paste(., dir(.), sep = "/") %>%
     as.list
@@ -50,11 +36,7 @@
   dir.create(isolate(PATHS$eal.dp), recursive = TRUE, showWarnings = FALSE)
   dir.create(isolate(PATHS$eal.tmp), recursive = TRUE, showWarnings = FALSE)
 
-  assign(
-    "PATHS", 
-    PATHS, 
-    envir = main.env
-  )
+  assign("PATHS", PATHS, envir = main.env)
 
   # Sessionning ====
   if (isTRUE(file.exists(isolate(PATHS$eal.dp.index)))) {
@@ -70,15 +52,9 @@
     )
     data.table::fwrite(DP.LIST, isolate(PATHS$eal.dp.index), sep = "\t")
   }
-  assign(
-    "DP.LIST",
-    DP.LIST,
-    envir = main.env
-  )
-  makeReactiveBinding(
-    "DP.LIST", 
-    env = main.env
-  )
+
+  assign("DP.LIST", DP.LIST, envir = main.env)
+  makeReactiveBinding("DP.LIST", env = main.env)
 
   # Values ====
   assign(
@@ -148,7 +124,6 @@
   )
 
   # Settings ====
-
   assign(
     "SETTINGS", 
     reactiveValues(
@@ -178,11 +153,7 @@
     envir = main.env
   )
 
-  assign(
-    "save.variable",
-    initReactive(main.env = main.env),
-    envir = main.env
-  )
+  assign("save.variable", initReactive(main.env = main.env), envir = main.env)
 
   # Patterns ====
   assign(
@@ -198,9 +169,9 @@
   )
 
   # output ====
-  shinyOptions(main.env = main.env)
-  shinyOptions(shiny.reactlog = main.env$reactlog)
+  assign("main.env", main.env, .GlobalEnv)
+  shinyOptions(shiny.reactlog = args$reactlog)
   addResourcePath("media", system.file("media/", package = "MetaShARK"))
-  # return(main.env)
+
   return(NULL)
 }
diff --git a/R/runMetashark.R b/R/runMetashark.R
@@ -29,21 +29,14 @@
 #'
 #' @export
 #' @import shiny
-#' @importFrom golem with_golem_options
 runMetashark <- function(...) {
   args <- list(...)
   args$dev <- isTRUE(args$dev)
   args$wip <- isTRUE(args$wip)
   args$reactlog <- if(is.null(args$reactlog)) TRUE else isTRUE(args$reactlog)
 
   .globalScript(args = args)
+  on.exit(rm(main.env, envir=.GlobalEnv))
 
-  .app <- shinyApp(
-    ui = appUI,
-    server = appServer
-  )
-
-  browser()
-
-  runApp(.app)
+  runApp(shinyApp(ui = appUI, server = appServer))
 }
diff --git a/R/server.R b/R/server.R
@@ -1,16 +1,16 @@
 #' @import shiny
 #' @importFrom shinydashboard updateTabItems
-#' @importFrom golem get_golem_options
 #' @importFrom shinyjs onclick
 #'
 #' @noRd
 appServer <- function(input, output, session) {
-  message("server")
+message("* server")
   # get variables
-  main.env <- getShinyOption("main.env")
+  main.env <- get("main.env", .GlobalEnv)
 
   if (main.env$dev) {
-    shinyjs::onclick("dev",
+    shinyjs::onclick(
+      "dev",
       {
         browser()
       },

diff --git a/R/ui.R b/R/ui.R
@@ -1,4 +1,3 @@
-#' @importFrom golem get_golem_options
 #' @import shiny
 #' @importFrom shinydashboard dashboardPage dashboardHeader dashboardSidebar 
 #' sidebarMenu menuItem dashboardBody tabItems tabItem
@@ -8,10 +7,8 @@
 #' @noRd
 appUI <- function() {
   # get app arguments
-  main.env <- getShinyOption("main.env")
-  dev <- main.env$dev
-  wip <- main.env$wip
-
+  main.env <- get("main.env", .GlobalEnv)
+
   # prepare variable
   .menu.width <- "250px"
 
@@ -75,7 +72,7 @@ appUI <- function() {
         shinydashboard::tabItems(
           shinydashboard::tabItem(
             tabName = "welcome",
-            welcomeUI("welcome", wip=wip)
+            welcomeUI("welcome", wip=main.env$wip)
           ),
           shinydashboard::tabItem(
             tabName = "fill",
@@ -95,7 +92,7 @@ appUI <- function() {
           ),
           shinydashboard::tabItem(
             tabName = "settings",
-            settingsUI("settings", wip=wip)
+            settingsUI("settings", wip=main.env$wip)
           )
         )
       )