Update load_lib.R

load_lib.R

@@ -21,68 +21,87 @@ 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,
+                           unpack_root = "/content/R_site_library_unpacked",
+                           add_to_libpaths = TRUE,
+                           backup = FALSE,
                            backup_dir = "/content",
+                           sync_to_target = FALSE,
+                           target_lib = "/content/R_site_library",
                            overwrite = TRUE,
                            quiet = FALSE) {
 
   if (!file.exists(zip_path)) stop("Zip file not found: ", zip_path)
-  dir.create(target_lib, recursive = TRUE, showWarnings = FALSE)
 
-  if (!quiet) {
-    message("ZIP: ", zip_path)
-    message("Target R lib: ", target_lib)
-  }
-
-  # (optional) backup thư mục library hiện tại
+  # B1) (optional) backup target_lib nếu bạn sync đè vào đó
   backup_tar <- NULL
-  if (backup) {
+  if (backup && sync_to_target) {
+    dir.create(target_lib, recursive = TRUE, showWarnings = FALSE)
     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)
   }
 
-  # 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
-  }
+  # B2) Unpack zip
+  unlink(unpack_root, recursive = TRUE, force = TRUE)
+  dir.create(unpack_root, recursive = TRUE, showWarnings = FALSE)
+  utils::unzip(zipfile = zip_path, exdir = unpack_root, overwrite = overwrite)
+
+  # B3) Auto-detect best lib dir (chứa nhiều package nhất)
+  desc_files <- list.files(unpack_root, pattern = "^DESCRIPTION$", recursive = TRUE, full.names = TRUE)
+  if (length(desc_files) == 0) stop("Không thấy DESCRIPTION trong zip -> không phải thư viện R chuẩn.")
+
+  pkg_dirs <- unique(dirname(desc_files))   # .../<pkg>
+  lib_dirs <- unique(dirname(pkg_dirs))     # .../<lib> (vd .../site-library)
+
+  pkg_count <- sapply(lib_dirs, function(d) length(list.dirs(d, recursive = FALSE, full.names = TRUE)))
+  best_lib <- lib_dirs[which.max(pkg_count)]
 
   if (!quiet) {
-    message("✅ Done. Overwritten packages: ", copied)
-    message("Library paths now:"); print(.libPaths())
+    message("Best lib dir = ", best_lib)
+    message("Packages in best lib = ", max(pkg_count))
+  }
+
+  # B4) Add best_lib vào .libPaths()
+  if (add_to_libpaths) {
+    .libPaths(c(best_lib, .libPaths()))
+    if (!quiet) { message("Library paths now:"); print(.libPaths()) }
+  }
+
+  # B5) (optional) Sync/copy đè best_lib -> target_lib (writable)
+  overwritten <- NA_integer_
+  if (sync_to_target) {
+    dir.create(target_lib, recursive = TRUE, showWarnings = FALSE)
+
+    # copy từng package folder
+    pkgs <- list.dirs(best_lib, recursive = FALSE, full.names = TRUE)
+    pkgs <- pkgs[file.exists(file.path(pkgs, "DESCRIPTION"))]
+
+    for (src in pkgs) {
+      pkg <- basename(src)
+      dest <- file.path(target_lib, pkg)
+      unlink(dest, recursive = TRUE, force = TRUE)
+      system2("bash", c("-lc", paste("cp -a", shQuote(src), shQuote(target_lib))))
+    }
+    overwritten <- length(pkgs)
+
+    # ưu tiên target_lib nếu bạn muốn dùng nó thay vì best_lib
+    .libPaths(c(target_lib, .libPaths()))
+    if (!quiet) message("✅ Synced packages to target_lib: ", target_lib, " (", overwritten, " pkgs)")
   }
 
   invisible(list(
     zip_path = zip_path,
-    target_lib = target_lib,
-    overwritten = copied,
+    unpack_root = unpack_root,
+    best_lib = best_lib,
+    added_to_libpaths = add_to_libpaths,
+    synced = sync_to_target,
+    target_lib = if (sync_to_target) target_lib else NULL,
+    overwritten = overwritten,
     backup_tar = backup_tar
   ))
 }