Update load_lib.R

load_lib.R

@@ -21,11 +21,11 @@ save_r_lib_zip <- function(zip_out = "/content/R_library.zip",
 # 2) LOAD: Unzip rồi dán đè packages vào R library hiện tại
 # =========================
 load_r_lib_zip <- function(zip_path,
-                            target_lib = .libPaths()[1],
-                            backup = TRUE,
-                            backup_dir = "/content",
-                            try_direct_unzip = TRUE,
-                            quiet = FALSE) {
+                           target_lib = .libPaths()[1],
+                           backup = TRUE,
+                           backup_dir = "/content",
+                           overwrite = TRUE,
+                           quiet = FALSE) {
 
   if (!file.exists(zip_path)) stop("Zip file not found: ", zip_path)
   dir.create(target_lib, recursive = TRUE, showWarnings = FALSE)
@@ -35,81 +35,54 @@ load_r_lib_zip <- function(zip_path,
     message("Target R lib: ", target_lib)
   }
 
-  # 1) Backup (optional)
+  # (optional) backup thư mục library hiện tại
   backup_tar <- NULL
   if (backup) {
     backup_tar <- file.path(
       backup_dir,
       sprintf("R_lib_backup_%s.tar.gz", format(Sys.time(), "%Y%m%d_%H%M%S"))
     )
-    old <- getwd(); on.exit(setwd(old), add = TRUE)
+    old <- getwd()
+    on.exit(setwd(old), add = TRUE)
     setwd(dirname(target_lib))
     utils::tar(backup_tar, files = basename(target_lib), compression = "gzip")
     if (!quiet) message("🗄️ Backup saved: ", backup_tar)
   }
 
-  # helper: check if directory looks like an R library (contains package folders with DESCRIPTION)
-  has_packages <- function(dir) {
-    any(file.exists(file.path(list.dirs(dir, recursive = FALSE, full.names = TRUE), "DESCRIPTION")))
+  # unzip ra folder tạm
+  tmp <- tempfile("Rlib_unzip_")
+  dir.create(tmp)
+  utils::unzip(zipfile = zip_path, exdir = tmp, overwrite = overwrite)
+
+  # tìm các folder package (có DESCRIPTION)
+  desc_files <- list.files(tmp, pattern = "^DESCRIPTION$", recursive = TRUE, full.names = TRUE)
+  pkg_dirs <- unique(dirname(desc_files))
+  if (length(pkg_dirs) == 0) stop("Không tìm thấy package nào (không thấy file DESCRIPTION) trong zip.")
+
+  if (!quiet) message("Found packages: ", length(pkg_dirs))
+
+  # copy đè từng package
+  copied <- 0L
+  for (src in pkg_dirs) {
+    pkg <- basename(src)
+    dest <- file.path(target_lib, pkg)
+
+    # xóa bản cũ để tránh sót file
+    system2("bash", c("-lc", paste("rm -rf", shQuote(dest))))
+    # copy bản mới vào target_lib
+    system2("bash", c("-lc", paste("cp -a", shQuote(src), shQuote(target_lib))))
+    copied <- copied + 1L
   }
 
-  # 2) Option A: Unzip directly into target_lib (fast path)
-  direct_ok <- FALSE
-  if (try_direct_unzip) {
-    if (!quiet) message("➡️ Trying direct unzip into target_lib ...")
-    # unzip trực tiếp; overwrite=TRUE sẽ đè file nếu trùng
-    utils::unzip(zip_path, exdir = target_lib, overwrite = TRUE)
-
-    # kiểm tra có package "rụng" vào đúng chỗ chưa
-    if (has_packages(target_lib)) {
-      direct_ok <- TRUE
-      if (!quiet) message("✅ Direct unzip worked (packages detected in target_lib).")
-    } else {
-      if (!quiet) message("⚠️ Direct unzip did not place packages correctly. Falling back...")
-    }
+  if (!quiet) {
+    message("✅ Done. Overwritten packages: ", copied)
+    message("Library paths now:"); print(.libPaths())
   }
 
-  if (direct_ok) {
-    invisible(list(
-      zip_path = zip_path,
-      target_lib = target_lib,
-      method = "direct_unzip",
-      backup_tar = backup_tar
-    ))
-  } else {
-    # 3) Option B: Unzip to temp, then locate package dirs and copy/overwrite
-    tmp <- tempfile("Rlib_unzip_")
-    dir.create(tmp)
-    utils::unzip(zip_path, exdir = tmp, overwrite = TRUE)
-
-    # find all package directories (with DESCRIPTION)
-    desc_files <- list.files(tmp, pattern = "^DESCRIPTION$", recursive = TRUE, full.names = TRUE)
-    pkg_dirs <- unique(dirname(desc_files))
-    if (length(pkg_dirs) == 0) stop("Không tìm thấy package nào (không thấy file DESCRIPTION) trong zip.")
-
-    if (!quiet) message("Found packages: ", length(pkg_dirs), " (copying into target_lib...)")
-
-    copied <- 0L
-    for (src in pkg_dirs) {
-      pkg <- basename(src)
-      dest <- file.path(target_lib, pkg)
-
-      system2("bash", c("-lc", paste("rm -rf", shQuote(dest))))
-      system2("bash", c("-lc", paste("cp -a", shQuote(src), shQuote(target_lib))))
-      copied <- copied + 1L
-    }
-
-    if (!quiet) {
-      message("✅ Done. Overwritten packages: ", copied)
-      message("Library paths now:"); print(.libPaths())
-    }
-
-    invisible(list(
-      zip_path = zip_path,
-      target_lib = target_lib,
-      method = "copy_packages",
-      overwritten = copied,
-      backup_tar = backup_tar
-    ))
-  }
+  invisible(list(
+    zip_path = zip_path,
+    target_lib = target_lib,
+    overwritten = copied,
+    backup_tar = backup_tar
+  ))
 }