From 172129446994320003e9028442bc2ee75740f44d Mon Sep 17 00:00:00 2001
From: pat-s <patrick.schratz@gmail.com>
Date: Wed, 24 Jul 2024 18:21:05 +0200
Subject: [PATCH] create correct s3 paths for upload

---
 R/upload.R | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/R/upload.R b/R/upload.R
index 9d883db..0060cbc 100644
--- a/R/upload.R
+++ b/R/upload.R
@@ -1,32 +1,22 @@
-#' @importFrom paws.storage s3
+#' @importFrom s3fs s3_file_exists s3_file_upload s3_file_system
 #' @export
 upload_single_binary_to_s3 <- function(
     endpoint = "https://s3.eu-central-003.backblazeb2.com",
     region = "eu-central-003",
+    bucket = "devxy-arm64-r-binaries",
     local_build_root = "/root", codename = NULL,
     package_name, tag,
-    r_version_minor = NULL, build_for_minor = TRUE,
+    r_version_minor = NULL, build_for_minor = FALSE,
     force = FALSE,
     debug = FALSE) {
-
   codename <- set_codename(codename)
 
   if (is.null(r_version_minor)) {
     r_version_minor <- sub("R version (\\d+\\.\\d+).*", "\\1", R.Version()$version.string)
   }
 
-  # create directory structure
-  if (is.null(r_version_minor) && !build_for_minor) {
-    dir_out_bin <- sprintf(
-      "%s/__linux__/%s/latest/src/contrib",
-      local_build_root, codename
-    )
-  } else {
-    dir_out_bin <- sprintf(
-      "%s/__linux__/%s/%s/latest/src/contrib",
-      local_build_root, codename, r_version_minor
-    )
-  }
+  local_bin_path <- set_bin_path(r_version_minor, build_for_minor, local_build_root = local_build_root, codename)
+  remote_bin_path <- set_bin_path(r_version_minor, build_for_minor, local_build_root = bucket, codename)
 
   if (debug) {
     cli::cli_alert_danger("DEBUG: dir_out_bin: {dir_out_bin}, codename: {codename}")
@@ -41,19 +31,19 @@ upload_single_binary_to_s3 <- function(
   )
 
   tarball_name <- sprintf("%s_%s.tar.gz", package_name, tag)
-  exists <- s3fs::s3_file_exists(sprintf("devxy-arm64-r-binaries/__linux__/%s/%s/latest/src/contrib/%s", codename, r_version_minor, tarball_name))
+  exists <- s3fs::s3_file_exists(sprintf("%s/%s", remote_bin_path, tarball_name))
 
   if (!exists && !force) {
-    cli::cli_alert_info("{.fun build_single_tag}: 5. Uploading {.pkg {package_name}} {.strong {tag}} to S3.")
+    cli::cli_alert_info("{.fun build_single_tag}: 5. Uploading {.pkg {package_name}} {.field {tag}} to S3.")
     s3fs::s3_file_upload(
-      sprintf("%s/%s", dir_out_bin, tarball_name),
-      sprintf("devxy-arm64-r-binaries/__linux__/%s/%s/latest/src/contrib/%s", codename, r_version_minor, tarball_name)
+      sprintf("%s/%s", local_bin_path, tarball_name),
+      sprintf("%s/%s", remote_bin_path, tarball_name)
     )
   } else if (exists && force) {
     cli::cli_alert_info("{.fun upload_to_s3}: Force uploading package {.pkg {package_name}} {.path {tag}} because force = TRUE was set.")
     s3fs::s3_file_upload(
-      sprintf("%s/%s", dir_out_bin, tarball_name),
-      sprintf("devxy-arm64-r-binaries/__linux__/%s/%s/latest/src/contrib/%s", codename, r_version_minor, tarball_name),
+      sprintf("%s", local_bin_path, tarball_name),
+      sprintf("%s", remote_bin_path, tarball_name),
       overwrite = TRUE
     )
   } else if (exists && !force) {