Explicit arguments to orderly_metadata_extract

R/location.R

@@ -349,7 +349,7 @@ orderly_location_pull_packet <- function(expr,
                                     allow_remote = TRUE,
                                     pull_metadata = pull_metadata)
 
-  if (is.character(expr) && is.null(name) && all(grepl(re_id, expr))) {
+  if (expr_is_literal_id(expr, name)) {
     ids <- expr
   } else {
     ## TODO:  we may drop options here

R/outpack_tools.R

@@ -182,27 +182,32 @@
 ##'
 ##' @title Extract metadata from orderly2 packets
 ##'
-##' @param ... Arguments passed through to
-##'   [orderly2::orderly_search]. In the special case where the first
-##'   argument is a character vector of ids *and* there are no named
-##'   dot arguments, then we interpret this argument as a vector of
-##'   ids directly.
-##'
 ##' @param extract A character vector of columns to extract, possibly
 ##'   named. See Details for the format.
 ##'
 ##' @inheritParams orderly_metadata
+##' @inheritParams orderly_search
 ##'
 ##' @return A `data.frame`, the columns of which vary based on the
 ##'   names of `extract`; see Details for more information.
 ##'
 ##' @export
-orderly_metadata_extract <- function(..., extract = NULL, root = NULL) {
+orderly_metadata_extract <- function(expr = NULL, name = NULL, location = NULL,
+                                     allow_remote = NULL, pull_metadata = FALSE,
+                                     extract = NULL, root = NULL) {
   root <- root_open(root, require_orderly = FALSE)
-  if (dots_is_literal_id(...)) {
-    ids <- ..1
+
+  options <- orderly_search_options(location = location,
+                                    allow_remote = allow_remote,
+                                    pull_metadata = pull_metadata)
+  if (expr_is_literal_id(expr, name)) {
+    ids <- expr
   } else {
-    ids <- orderly_search(..., root = root)
+    ## TODO:  we may drop options here
+    ids <- orderly_search(expr, name = name,
+                          options = options,
+                          # location = location, pull_metadata = pull_metadata,
+                          root = root)
   }
   extract <- parse_extract(extract, environment())
 

R/query.R

@@ -55,6 +55,13 @@ dots_is_literal_id <- function(...) {
 }
 
 
+expr_is_literal_id <- function(expr, ...) {
+  all(vlapply(list(...), is.null)) &&
+    is.character(expr) &&
+    all(grepl(re_id, expr))
+}
+
+
 as_orderly_query <- function(expr, name = NULL, scope = NULL, subquery = NULL,
                              arg = "expr", call = parent.frame()) {
   if (missing(expr)) {