add to more exported functions

r-box · Jan 7, 2024 · 79002c3 · 79002c3
1 parent 7c37398
commit 79002c3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/R/boxr__internal_misc.R b/R/boxr__internal_misc.R
@@ -25,7 +25,7 @@ as_box_id <- function(x, arg = rlang::caller_arg(x),
 
   # a box_id is a string that contains only digits
 
-  # do we need this?
+  # some defaults are NULL; we just pass these through
   if (is.null(x)) {
     return(NULL)    
   }

diff --git a/R/boxr_misc.R b/R/boxr_misc.R
@@ -306,6 +306,10 @@ boxDirCreate <- function(dir_name, parent_dir_id = box_getwd()) {
 #' @export
 #' 
 box_browse <- function(dir_id = NULL, file_id = NULL) {
+
+  dir_id <- as_box_id(dir_id)
+  file_id <- as_box_id(file_id)
+
   item <- collab_item_helper(dir_id, file_id)
   utils::browseURL(glue::glue("https://app.box.com/{item$type}/{item$id}"))
 }
diff --git a/R/boxr_read.R b/R/boxr_read.R
@@ -53,6 +53,7 @@ box_read <- function(file_id, type = NULL, version_id = NULL,
                      version_no = NULL, read_fun = rio::import,
                      ...) {
   checkAuth()
+  file_id <- as_box_id(file_id)
 
   temp_file <- tempfile()
 
@@ -122,33 +123,38 @@ box_read <- function(file_id, type = NULL, version_id = NULL,
 #' @rdname box_read
 #' @export
 box_read_csv <- function(file_id, ...) {
+  file_id <- as_box_id(file_id)
   box_read(file_id, format = "csv", ...)
 }
 
 
 #' @rdname box_read
 #' @export
 box_read_tsv <- function(file_id, ...) {
+  file_id <- as_box_id(file_id)
   box_read(file_id, format = "tsv", ...)
 }
 
 
 #' @rdname box_read
 #' @export
 box_read_json <- function(file_id, ...) {
+  file_id <- as_box_id(file_id)
   box_read(file_id, read_fun = jsonlite::fromJSON, ...)
 }
 
 
 #' @rdname box_read
 #' @export
 box_read_excel <- function(file_id, ...) {
+  file_id <- as_box_id(file_id)
   box_read(file_id, format = "excel", ...)
 }
 
 #' @rdname box_read
 #' @export
 box_read_rds <- function(file_id, ...) {
+  file_id <- as_box_id(file_id)
   box_read(file_id, read_fun = readRDS, ...)
 }
 
diff --git a/R/boxr_save_load.R b/R/boxr_save_load.R
@@ -50,6 +50,8 @@ box_save <- function(..., dir_id = box_getwd(), file_name = ".RData",
 box_save_image <- function(dir_id = box_getwd(), file_name = ".RData", 
                            description = NULL, filename) {
 
+  dir_id <- as_box_id(dir_id)
+
   # TODO: in future version, remove argument
   if (!missing(filename)) {
 
@@ -75,7 +77,10 @@ box_save_image <- function(dir_id = box_getwd(), file_name = ".RData",
 #' @rdname box_save
 #' @export
 #' 
-box_load <- function(file_id) {  
+box_load <- function(file_id) {
+
+  file_id <- as_box_id(file_id)
+
   temp_dir  <- tempdir()
   temp_file <- box_dl(file_id, overwrite = TRUE, local_dir = temp_dir)
   on.exit(fs::file_delete(temp_file))

diff --git a/R/boxr_write.R b/R/boxr_write.R
@@ -43,6 +43,8 @@
 box_write <- function(object, file_name, dir_id = box_getwd(), description = NULL,
                     write_fun = rio::export, x, filename, ...) {
 
+  dir_id <- as_box_id(dir_id)
+
   # TODO: in future version, remove argument
   if (!missing(filename)) {
 
@@ -78,6 +80,8 @@ box_write <- function(object, file_name, dir_id = box_getwd(), description = NUL
 box_save_rds <- function(object, dir_id = box_getwd(), file_name = ".RDS",
                          description = NULL) {
 
+  dir_id <- as_box_id(dir_id)
+
   temp_file <- fs::path_temp(file_name)
   on.exit(fs::file_delete(temp_file))