diff --git a/R/conn.R b/R/conn.R index 3d21731a..6f92d608 100644 --- a/R/conn.R +++ b/R/conn.R @@ -174,7 +174,7 @@ neuprint_connection <- function(server=NULL, token=NULL, dataset=NULL, # we will always add one in our calls neuprint_server <- remove_trailing_slash(neuprint_server) # Set a default token if none specified - neuprint_token <- if(is.null(token)) unlist(getenvoroption("token")) else token + neuprint_token <- if(is.null(token) || !nzchar(token)) unlist(getenvoroption("token")) else token # collect any curl options defined as environment variables config=neuprint_curl_options(config) conn=list(server = neuprint_server, token = neuprint_token, config=config, diff --git a/inst/images/neuprint-favicon-196x196.png b/inst/images/neuprint-favicon-196x196.png new file mode 100644 index 00000000..0d68c89d Binary files /dev/null and b/inst/images/neuprint-favicon-196x196.png differ diff --git a/inst/rstudio/connections.dcf b/inst/rstudio/connections.dcf new file mode 100644 index 00000000..97453c1f --- /dev/null +++ b/inst/rstudio/connections.dcf @@ -0,0 +1,3 @@ +Name: Janelia-Neuprint +HelpUrl: https://github.com/natverse/neuprintr?tab=readme-ov-file#authentication +Icon: images/neuprint-favicon-196x196.png diff --git a/inst/rstudio/connections/Janelia-Neuprint.R b/inst/rstudio/connections/Janelia-Neuprint.R new file mode 100644 index 00000000..34c4b8d6 --- /dev/null +++ b/inst/rstudio/connections/Janelia-Neuprint.R @@ -0,0 +1,15 @@ +library(neuprintr) + +connspec <- neuprintr::neuprint_connection( + server="${1:Server=https$colon$//neuprint.janelia.org}", + token = "${2:Neuprint Token=}", + dataset = "${3:Dataset=hemibrain$colon$v1.2.1}" +) +if(!nzchar(connspec$token)) { + connspec$token=neuprintr:::getenvoroption('token')[[1]] + if(is.null(connspec$token)) + stop("Sorry you must either specify your neuprint token directly\n", + "or set the NEUPRINT_TOKEN environment variable!") +} + +conn <- neuprintr::neuprint_login(connspec)