Fixing volume write function adding bytes

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: brickster
 Title: R interface to Databricks REST 2.0 APIs
-Version: 0.2.0
+Version: 0.2.1
 Authors@R: 
   c(
     person(given = "Zac",
@@ -13,7 +13,7 @@ Authors@R:
            email = "[email protected]"),
     person("Databricks", role = c("cph", "fnd"))
   )
-Description: Toolkit to work with Databricks from R
+Description: Toolkit to work with Databricks from R.
 License: MIT + file LICENSE
 Encoding: UTF-8
 LazyData: true
@@ -32,15 +32,14 @@ Imports:
     rlang
 Suggests: 
     testthat (>= 3.0.0),
-    DT,
     htmltools,
     knitr,
     magick,
     rmarkdown,
     rstudioapi,
     rvest
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.0
+RoxygenNote: 7.3.1
 VignetteBuilder: knitr
 URL: https://github.com/zacdav-db/brickster
 Config/testthat/edition: 3

R/volume-fs.R

@@ -26,8 +26,7 @@ db_volume_read <- function(path, destination,
   if (perform_request) {
     req %>%
       httr2::req_error(body = db_req_error_body) %>%
-      # uncomment when available via cran
-      # httr2::req_progress(type = "down") %>%
+      httr2::req_progress(type = "down") %>%
       httr2::req_perform(path = destination) %>%
       httr2::resp_check_status()
   } else {
@@ -75,39 +74,24 @@ db_volume_delete <- function(path,
 #' Upload a file to volume filesystem.
 #'
 #' @param file Path to a file on local system, takes precedent over `path`.
-#' @param contents String that is base64 encoded.
 #' @param overwrite Flag (Default: `FALSE`) that specifies whether to overwrite
 #' existing files.
 #' @inheritParams db_volume_read
 #' @inheritParams auth_params
 #'
 #' @details
-#' Either `contents` or `file` must be specified. `file` takes precedent over
-#' `contents` if both are specified.
-#'
-#' Uploads a file of up to 2 GiB.
+#' Uploads a file of up to 5 GiB.
 #'
 #' @family Volumes FileSystem API
 #'
 #' @export
-db_volume_write <- function(path, file = NULL, contents = NULL, overwrite = FALSE,
-                        host = db_host(), token = db_token()) {
-
-  body <- list(
-    path = path,
-    overwrite = ifelse(overwrite, "true", "false")
-  )
+db_volume_write <- function(path, file = NULL, overwrite = FALSE,
+                        host = db_host(), token = db_token(), perform_request = TRUE) {
 
-  # file takes priority, so don't bother if file is also specified
-  if (!is.null(contents) && is.null(file)) {
-    # contents must be base64 encoded string
-    body$contents <- base64enc::base64encode(base::charToRaw(contents))
-  } else if (!is.null(file)) {
-    body$contents <- curl::form_file(path = file)
-  } else {
+  if (is.null(file)) {
     stop(cli::format_error(c(
       "Nothing to upload:",
-      "x" = "Either `file` or `contents` must be specified."
+      "x" = "Either `file` must be specified."
     )))
   }
 
@@ -119,13 +103,15 @@ db_volume_write <- function(path, file = NULL, contents = NULL, overwrite = FALS
     token = token
   )
 
+  req <- req %>%
+    httr2::req_url_query(
+      overwrite = ifelse(overwrite, "true", "false")
+    )
+
   req %>%
-    httr2::req_body_multipart(
-      path = body$path,
-      contents = body$contents,
-      overwrite = body$overwrite
-    ) %>%
+    httr2::req_body_file(file) %>%
     httr2::req_error(body = db_req_error_body) %>%
+    httr2::req_progress(type = "up") %>%
     httr2::req_perform() %>%
     httr2::resp_check_status()