ropensci · chainsawriot · Apr 4, 2023 · Apr 4, 2023
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -12,7 +12,8 @@ Imports:
     readr (>= 1.2.1),
     stringi,
     utils,
-    purrr
+    purrr,
+    zip
 Suggests:
     dplyr,
     testthat,

diff --git a/NAMESPACE b/NAMESPACE
@@ -7,4 +7,3 @@ export(ods_sheets)
 export(read.ods)
 export(read_ods)
 export(write_ods)
-importFrom(utils,unzip)
diff --git a/R/readODS.R b/R/readODS.R
@@ -1,5 +1,3 @@
-#' @importFrom utils unzip
-
 ## ' @keywords internal
 ## ' @description
 ## ' converts numbers to microplate row names and Excel & ODS column names
@@ -40,7 +38,7 @@
 
 .unzip_ods <- function(file) {
     exdir <- tempdir()
-    unzip(file, files = "content.xml", exdir = exdir)
+    zip::unzip(file, files = "content.xml", exdir = exdir)
     return(file.path(exdir, "content.xml"))
 }
 

diff --git a/R/writeODS.R b/R/writeODS.R
@@ -1,13 +1,8 @@
-.zip_tmp_to_path <- function(temp_ods_dir, path, overwrite, verbose) {
-    if (verbose) {
-        zip_flags <- "-r9X"
-    } else {
-        zip_flags <- "-r9Xq"
-    }
+.zip_tmp_to_path <- function(temp_ods_dir, path, overwrite) {
     wd <- getwd()
     on.exit(setwd(wd), add = TRUE)
     setwd(temp_ods_dir)
-    utils::zip(basename(path), dir(), flags = zip_flags)
+    zip::zip(basename(path), files = dir())
     setwd(wd)
     file.copy(file.path(temp_ods_dir, basename(path)), path, overwrite = overwrite)
 }
@@ -125,8 +120,8 @@
 #' @param update logical, TRUE indicates that the sheet with sheet_name in the existing file (path) should be updated with the content of x. If a sheet with sheet_name does not exist, an exception is thrown. Please also note that writing is slower if TRUE. Default is FALSE.
 #' @param row_names logical, TRUE indicates that row names of x are to be included in the sheet. Default is FALSE.
 #' @param col_names logical, TRUE indicates that column names of x are to be included in the sheet. Default is FALSE.
-#' @param verbose logical, if messages should be displayed. Default is FALSE.
 #' @param na_as_string logical, TRUE indicates that NAs are written as string. Default is `option("write_ods_na")` (will change to TRUE in the next version).
+#' @param verbose logical, deprecated
 #' @param overwrite logical, deprecated.
 #' @return An ODS file written to the file path location specified by the user. The value of \code{path} is also returned invisibly.
 #' @author Detlef Steuer <steuer@@hsu-hh.de>, Thomas J. Leeper <thosjleeper@@gmail.com>, John Foster <john.x.foster@@nab.com.au>, Chung-hong Chan <chainsawtiney@@gmail.com>
@@ -138,7 +133,7 @@
 #' write_ods(PlantGrowth, "mtcars.ods", append = TRUE, sheet = "plant")
 #' }
 #' @export
-write_ods <- function(x, path, sheet = "Sheet1", append = FALSE, update = FALSE, row_names = FALSE, col_names = TRUE, verbose = FALSE, na_as_string = getOption("write_ods_na", default = FALSE), overwrite = NULL) {
+write_ods <- function(x, path, sheet = "Sheet1", append = FALSE, update = FALSE, row_names = FALSE, col_names = TRUE, na_as_string = getOption("write_ods_na", default = FALSE), verbose = NULL, overwrite = NULL) {
     ## setup temp directory
     ## one can't just use tempdir() because it is the same in the same session
     temp_ods_dir <- file.path(tempdir(), stringi::stri_rand_strings(1, 20, pattern = "[A-Za-z0-9]"))
@@ -149,6 +144,11 @@ write_ods <- function(x, path, sheet = "Sheet1", append = FALSE, update = FALSE,
     } else {
         overwrite <- TRUE
     }
+    if (!is.null(verbose)) {
+        warning("verbose is deprecated. Future versions will always set it to FALSE.")
+    } else {
+        verbose <- FALSE
+    }
     if (!is.data.frame(x)) {
         stop("x must be a data.frame.", call. = FALSE)
     }
@@ -183,6 +183,6 @@ write_ods <- function(x, path, sheet = "Sheet1", append = FALSE, update = FALSE,
         xml2::write_xml(content, contentfile)
     }
     ## zip up ODS archive
-    .zip_tmp_to_path(temp_ods_dir, path, overwrite, verbose)
+    .zip_tmp_to_path(temp_ods_dir, path, overwrite)
     invisible(path)
 }
diff --git a/man/write_ods.Rd b/man/write_ods.Rd