Extract out check_pin_version helper

rstudio · Aug 6, 2021 · cc72877 · cc72877
1 parent fb6d53c
commit cc72877
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/R/board_folder.R b/R/board_folder.R
@@ -99,10 +99,7 @@ pin_fetch.pins_board_folder <- function(board, name, version = NULL, ...) {
 pin_meta.pins_board_folder <- function(board, name, version = NULL, ...) {
   check_name(name)
   check_pin_exists(board, name)
-
-  version <- version %||%
-    last(pin_versions(board, name)$version) %||%
-    abort("No versions found")
+  version <- check_pin_version(board, name, version)
 
   path_version <- fs::path(board$path, name, version)
   if (!fs::dir_exists(path_version)) {

diff --git a/R/board_s3.R b/R/board_s3.R
@@ -152,14 +152,7 @@ pin_version_delete.pins_board_s3 <- function(board, name, version, ...) {
 #' @export
 pin_meta.pins_board_s3 <- function(board, name, version = NULL, ...) {
   check_pin_exists(board, name)
-
-  if (is.null(version)) {
-    version <- last(pin_versions(board, name)$version) %||% abort("No versions found")
-  } else if (is_string(version)) {
-    # check_pin_version(board, name, version)
-  } else {
-    abort("`version` must be a string or `NULL`")
-  }
+  version <- check_pin_version(board, name, version)
 
   path_version <- fs::path(board$cache, name, version)
   fs::dir_create(path_version)

diff --git a/R/pin-meta.R b/R/pin-meta.R
@@ -45,3 +45,14 @@ print.pins_meta <- function(x, ...) {
   utils::str(unclass(x))
   invisible(x)
 }
+
+check_pin_version <- function(board, name, version) {
+  if (is.null(version)) {
+    last(pin_versions(board, name)$version) %||% abort("No versions found")
+  } else if (is_string(version)) {
+    # TODO: provide pin_version_exists() so this can return informative error
+    version
+  } else {
+    abort("`version` must be a string or `NULL`")
+  }
+}