[misc] use stringi in inner_update() this is fractions of a ms faster

Author: JanMarvin

NAMESPACE

@@ -164,6 +164,7 @@ importFrom(grDevices,tiff)
 importFrom(magrittr,"%>%")
 importFrom(stringi,stri_c)
 importFrom(stringi,stri_encode)
+importFrom(stringi,stri_extract_first)
 importFrom(stringi,stri_isempty)
 importFrom(stringi,stri_join)
 importFrom(stringi,stri_match)

R/class-style_mgr.R

@@ -469,7 +469,7 @@ style_mgr <- R6::R6Class("wbStylesMgr", {
         if (skip_duplicates && is_tabSty && style_name[sty] %in% self$tableStyle$name) next
 
         if (is_numfmt) {
-          typ <- "numFmt"         
+          typ <- "numFmt"
           id  <- unname(unlist(xml_attr(style[sty], "numFmt"))["numFmtId"])
           self$styles$numFmts <- c(self$styles$numFmts, style[sty])
         }

R/openxlsx2-package.R

@@ -12,9 +12,9 @@
 #' @import R6
 #' @importFrom grDevices bmp col2rgb colors dev.copy dev.list dev.off jpeg png rgb tiff
 #' @importFrom magrittr %>%
-#' @importFrom stringi stri_c stri_encode stri_isempty stri_join stri_match
-#'   stri_match_all_regex stri_order stri_opts_collator stri_pad_left
-#'   stri_rand_strings stri_read_lines stri_replace_all_fixed
+#' @importFrom stringi stri_c stri_encode stri_extract_first stri_isempty
+#'   stri_join stri_match stri_match_all_regex stri_order stri_opts_collator
+#'   stri_pad_left stri_rand_strings stri_read_lines stri_replace_all_fixed
 #'   stri_split_fixed stri_split_regex stri_sub stri_unescape_unicode
 #'   stri_unique
 #' @importFrom utils download.file head menu read.csv unzip

R/write.R

@@ -62,8 +62,8 @@ inner_update <- function(
     # create missing cells
     cc_missing <- create_char_dataframe(names(cc), length(missing_cells))
     cc_missing$r     <- missing_cells
-    cc_missing$row_r <- gsub("[[:upper:]]", "", cc_missing$r)
-    cc_missing$c_r   <- gsub("[[:digit:]]", "", cc_missing$r)
+    cc_missing$row_r <- stringi::stri_extract_first(missing_cells, regex = "[0-9]+")
+    cc_missing$c_r   <- stringi::stri_extract_first(missing_cells, regex = "[A-Z]+")
 
     # assign to cc
     cc <- rbind(cc, cc_missing)

tests/testthat/test-save.R

@@ -215,22 +215,22 @@ test_that("writing NA, NaN and Inf", {
   wb$add_worksheet("Test3")$add_data(x = x, na.strings = "N/A")$save(tmp)
 
   exp <- c(NA, "s", "s", "s")
-  got <- df_to_char(attr(wb_to_df(tmp, "Test1", keep_attributes = TRUE), "tt")))
+  got <- df_to_char(attr(wb_to_df(tmp, "Test1", keep_attributes = TRUE), "tt"))
   expect_equal(exp, got)
 
   exp <- c("N/A", "#NUM!", "#NUM!", "#VALUE!")
-  got <- df_to_char(wb_to_df(tmp, "Test2", keep_attributes = TRUE)))
+  got <- df_to_char(wb_to_df(tmp, "Test2", keep_attributes = TRUE))
   expect_equal(exp, got)
 
   wb$clone_worksheet("Test1", "Clone1")$add_data(x = x, na.strings = NULL)$save(tmp)
   wb$clone_worksheet("Test3", "Clone3")$add_data(x = x, na.strings = "N/A")$save(tmp)
 
   exp <- c(NA, "s", "s", "s")
-  got <- df_to_char(attr(wb_to_df(tmp, "Test1", keep_attributes = TRUE), "tt")))
+  got <- df_to_char(attr(wb_to_df(tmp, "Test1", keep_attributes = TRUE), "tt"))
   expect_equal(exp, got)
 
   exp <- c("N/A", "#NUM!", "#NUM!", "#VALUE!")
-  got <- df_to_char(wb_to_df(tmp, "Test2")))
+  got <- df_to_char(wb_to_df(tmp, "Test2"))
   expect_equal(exp, got)
 
 })