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

Jump to bottom

Fix Issue #1961: tidy unzip directory #1962

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Fix Issue #1961: tidy unzip directory #1962

Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8993625
modified top_directory helper function to accommodate sub-dirs in zip…
Mar 8, 2024
21810fc
Merge branch 'r-lib:main' into tidy_unzip_directory
burnsal Mar 8, 2024
3eae5e7
Update R/course.R
burnsal Mar 12, 2024
0faf4de
add small zip for testthat/test_course rename
Mar 12, 2024
acc7f0c
add test for tidy_unzip_directory update
Mar 12, 2024
2719697
Merge branch 'tidy_unzip_directory' of https://github.com/burnsal/use…
Mar 12, 2024
c3943b0
Merge branch 'tidy_unzip_directory' of https://github.com/burnsal/use…
Mar 12, 2024
8b04032
Merge branch 'tidy_unzip_directory' of https://github.com/burnsal/use…
Mar 12, 2024
00d9e63
Merge branch 'r-lib:main' into tidy_unzip_directory
burnsal Mar 26, 2024
f129042
fix function name test_that typo
Mar 26, 2024
19b826d
Merge branch 'tidy_unzip_directory' of https://github.com/burnsal/use…
Mar 26, 2024
192b7ac
add second file to /foo to test multiple files in the same directory
Mar 26, 2024
f5c4315
update test_that tidy_dir to handle dir name updates
Mar 26, 2024
61893a0
update test_that tidy_dir to handle dir name updates
Mar 26, 2024
41424af
Merge branch 'tidy_unzip_directory' of https://github.com/burnsal/use…
Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions R/course.R
View file
Open in desktop
Expand Up @@ -529,10 +529,14 @@ top_directory <- function(filenames) {
in_top <- path_dir(filenames) == "."
unique_top <- unique(filenames[in_top])
is_directory <- grepl("/$", unique_top)
if (length(unique_top) > 1 || !is_directory) {
NA_character_
if(length(unique(path_dir(filenames)))==1 & length(unique_top) == 0){
burnsal marked this conversation as resolved.
Show resolved Hide resolved
unique_top <- unique(path_dir(filenames))
} else {
unique_top
if (length(unique_top) > 1 || !is_directory) {
NA_character_
} else {
unique_top
}
}
}

Expand Down