Respect the format argument to import_list() (fix #467) (#468)

* Add failing test

* Respect the `format` argument to `import_list()` (fix #467)

Author: billdenney

R/import_list.R

@@ -82,19 +82,25 @@ import_list <- function(file, setclass = getOption("rio.import.class", "data.fra
 }
 
 .read_file_as_list <- function(file, which, setclass, rbind, rbind_label, ...) {
+    ## respect the `format` argument, if given
+    if ("format" %in% ...names()) {
+      format <- list(...)[["format"]]
+    } else {
+      format <- get_info(file)$format
+    }
     if (R.utils::isUrl(file)) {
         file <- remote_to_local(file)
     }
-    if (get_info(file)$format == "rdata") {
+    if (format == "rdata") {
         return(.import.rio_rdata(file = file, .return_everything = TRUE, ...))
     }
     archive_format <- find_compress(file)
-    if (!get_info(file)$format %in% c("html", "xlsx", "xls", "ods", "fods") && !archive_format$compress %in% c("zip", "tar", "tar.gz", "tar.bz2")) {
+    if (!format %in% c("html", "xlsx", "xls", "ods", "fods") && !archive_format$compress %in% c("zip", "tar", "tar.gz", "tar.bz2")) {
         which <- 1
         whichnames <- NULL
     }
     ## getting list of `whichnames`
-    if (get_info(file)$format == "html") {
+    if (format == "html") {
         .check_pkg_availability("xml2")
         tables <- xml2::xml_find_all(xml2::read_html(unclass(file)), ".//table")
         if (missing(which)) {
@@ -106,10 +112,10 @@ import_list <- function(file, setclass = getOption("rio.import.class", "data.fra
         )
         names(which) <- whichnames
     }
-    if (get_info(file)$format %in% c("xls", "xlsx", "ods", "fods")) {
+    if (format %in% c("xls", "xlsx", "ods", "fods")) {
         ## .check_pkg_availability("readxl")
         sheet_func <- readxl::excel_sheets
-        if (get_info(file)$format %in% c("ods", "fods")) {
+        if (format %in% c("ods", "fods")) {
             .check_pkg_availability("readODS")
             sheet_func <- readODS::list_ods_sheets
         }

tests/testdata/example.xlsm

@@ -49,3 +49,15 @@ test_that("Import from Excel (.xls)", {
     expect_true(is.data.frame(import("../testdata/iris.xls", sheet = 1)))
     expect_true(is.data.frame(import("../testdata/iris.xls", which = 1)))
 })
+
+test_that("Import from Excel (.xlsm)", {
+  expect_true(is.data.frame(import("../testdata/example.xlsm", sheet = 1, format = "xlsx")))
+  expect_true(is.data.frame(import("../testdata/example.xlsm", which = 1, format = "xlsx")))
+  expect_equal(
+    import_list("../testdata/example.xlsm", format = "xlsx"),
+    list(
+      Sheet1 = data.frame(A = 1),
+      Sheet2 = data.frame(B = 2)
+    )
+  )
+})