Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set names for import_list() #164

Merged
merged 9 commits into from
Jan 31, 2018
Merged

Set names for import_list() #164

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e7e94dc
Add names to "which" for excel and zip
Oct 7, 2017
3caba1f
Use filenames as list elements
Oct 7, 2017
88d00d6
import_list() naming tests
Oct 8, 2017
4a33bed
Add names to "which" for html
Oct 8, 2017
00ffcc3
Add a "class" to twotables.html and add test
Oct 9, 2017
0d7c579
Cleanup and update description
Oct 10, 2017
258a50c
Improve removal of file extensions and update tests
Oct 11, 2017
1781e2e
Simplify strip_exts
Oct 22, 2017
8db6f27
Merge branch 'master' into import_list_names
leeper Jan 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions R/import_list.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ function(file,
setclass <- NULL
}
if (length(file) > 1) {
names(file) <- gsub(paste0("\\.", tools::file_ext(file[1]), "$"), "", file, ignore.case = TRUE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand what's happening here. Can you explain?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's what the first comment in this PR is trying to explain but unfortunately the comment didn't attach itself to the precise line of code for clarity...

Also relates to Case 4 in the PR description

Copy link
Contributor Author

@ruaridhw ruaridhw Oct 11, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've since realised that assuming all files have the same extension somewhat defeats the purpose of ingesting multiple disparate datasets of differing file types at the same time.

file <- c("mtcars.csv", "iris.csvy", "flights.xlsx", "USArrests.csv")
my_list <- import_list(file, rbind = FALSE)
names(my_list)
#> [1] "mtcars"  "iris.csvy"  "flights.xlsx"  "USArrests"

If it's going to strip file extensions it probably makes more sense to lapply(file, tools::file_ext) and strip each respective one so that we end up with

exts <- paste0("\\.", lapply(file, tools::file_ext), "$")
names(file) <- sapply(seq_along(file), function(x) gsub(exts[x], "", file[x]))
names(file)
#> [1] "mtcars"  "iris"  "flights"  "USArrests"

Also, on second thoughts it also doesn't really seem appropriate to treat zip files differently so Case 3 should now be the same as Case 4

  1. zip retains the file names without extension

Implemented in 258a50c

x <- lapply(file, function(thisfile) {
out <- try(import(thisfile, setclass = setclass, ...), silent = TRUE)
if (inherits(out, "try-error")) {
Expand All @@ -67,12 +68,24 @@ function(file,
if (missing(which)) {
if (get_ext(file) == "html") {
requireNamespace("xml2", quietly = TRUE)
which <- seq_along(xml2::xml_find_all(xml2::read_html(unclass(file)), ".//table"))
tables <- xml2::xml_find_all(xml2::read_html(unclass(file)), ".//table")
which <- seq_along(tables)
names(which) <- sapply(xml2::xml_attrs(tables), function(x) {
if ("class" %in% names(x)) {
x["class"]
} else {
""
}
})
} else if (get_ext(file) %in% c("xls","xlsx")) {
requireNamespace("readxl", quietly = TRUE)
which <- seq_along(readxl::excel_sheets(path = file))
whichnames <- readxl::excel_sheets(path = file)
which <- seq_along(whichnames)
names(which) <- whichnames
} else if (get_ext(file) %in% c("zip")) {
which <- seq_len(nrow(utils::unzip(file, list = TRUE)))
whichnames <- utils::unzip(file, list = TRUE)[, "Name"]
which <- seq_along(whichnames)
names(which) <- whichnames
} else {
which <- 1
}
Expand Down
Loading