Merged origin/main into debug-check-boards

rstudio · Aug 10, 2023 · 05160db · 05160db
2 parents b3780f6 + ff30f59
commit 05160db
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -31,7 +31,7 @@ Imports:
     jsonlite,
     lifecycle,
     magrittr,
-    purrr,
+    purrr (>= 1.0.0),
     rappdirs,
     rlang (>= 1.1.0),
     tibble,

diff --git a/R/board_gdrive.R b/R/board_gdrive.R
@@ -171,10 +171,13 @@ required_pkgs.pins_board_gdrive <- function(x, ...) {
 
 # Helpers -----------------------------------------------------------------
 
+possibly_drive_ls <- function(...) {
+  tryCatch(googledrive::drive_ls(...), error = function(err) NULL)
+}
+
 gdrive_file_exists <- function(board, name) {
   path <- fs::path(board$dribble$name, fs::path_dir(name))
   name <- fs::path_file(name)
-  possibly_drive_ls <- purrr::possibly(googledrive::drive_ls)
   all_names <- possibly_drive_ls(path)
   name %in% all_names$name
 }

diff --git a/R/pin-meta.R b/R/pin-meta.R
@@ -46,7 +46,9 @@ pin_meta <- function(board, name, version = NULL, ...) {
   UseMethod("pin_meta")
 }
 
-possibly_pin_meta <- possibly(pin_meta)
+possibly_pin_meta <- function(...) {
+  tryCatch(pin_meta(...), error = function(err) NULL)
+}
 
 multi_meta <- function(board, names) {
   meta <- map(names, possibly(pin_meta, empty_local_meta), board = board)