Merge branch 'master' into wilson-v2

loosolab · Jun 26, 2018 · e7e41d2 · e7e41d2
2 parents 7aea5e9 + c23d7d6
commit e7e41d2
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/wilson-basic/app.R b/wilson-basic/app.R
@@ -506,6 +506,21 @@ server <- function(session, input, output) {
   # Use all .se and .clarion files specified in data/
   load <- sapply(list.files(path = "data/", pattern = "\\.se|\\.clarion"), function(x){ paste0("data/", x)})
 
+  # check for additional data
+  if (dir.exists("external_data/")) {
+    # use all .se and .clarion files specified in external_data/
+    external <- sapply(list.files(path = "external_data/", pattern = "\\.se|\\.clarion"), function(x){ paste0("external_data/", x)})
+
+    if (length(external) > 0) {
+      # omit duplicated names from load
+      load <- load[setdiff(names(load), names(external))]
+      # merge file lists
+      load <- c(load, external)
+      # sort by name
+      load <- load[order(names(load))]
+    }
+  }
+
   output$fileLoader <- renderUI({
     shiny::req(input$data_origin)