Always ignore case, search recursively, include hidden files. Expand exclude_dirs to all files and substract these from the scheduled files, otherwise, we might fail to exclude some sub-directories

Author: lorenzwalthert

R/ui-styling.R

@@ -110,42 +110,42 @@ prettify_pkg <- function(transformers,
                          include_roxygen_examples,
                          base_indention,
                          dry) {
-  filetype <- set_and_assert_arg_filetype(filetype)
+  filetype_ <- set_and_assert_arg_filetype(filetype)
   r_files <- rprofile_files <- vignette_files <- readme <- NULL
-  exclude_files <- set_arg_paths(exclude_files)
-  exclude_dirs <- set_arg_paths(exclude_dirs)
-  without_excluded <- purrr::partial(setdiff, y = exclude_dirs)
-  if ("\\.r" %in% filetype) {
+  exclude_files <- c(
+    set_arg_paths(exclude_files),
+    dir_without_.(exclude_dirs, pattern = map_filetype_to_pattern(filetype))
+  )
+  if ("\\.r" %in% filetype_) {
     r_files <- dir_without_.(
-      path = without_excluded(c("R", "tests", "data-raw", "demo")),
+      path = c("R", "tests", "data-raw", "demo"),
       pattern = "\\.r$"
     )
   }
 
-  if ("\\.rprofile" %in% filetype) {
+  if ("\\.rprofile" %in% filetype_) {
     rprofile_files <- dir_without_.(
-      path = without_excluded("."), pattern = "^\\.rprofile$"
+      path = ".", pattern = "^\\.rprofile$"
     )
   }
-  if ("\\.rmd" %in% filetype) {
+  if ("\\.rmd" %in% filetype_) {
     vignette_files <- dir_without_.(
-      path = without_excluded("vignettes"), pattern = "\\.rmd$"
+      path = "vignettes", pattern = "\\.rmd$"
     )
     readme <- dir_without_.(
       path = ".",
-      pattern = without_excluded("^readme\\.rmd$")
+      pattern = "^readme\\.rmd$"
     )
   }
 
-  if ("\\.rnw" %in% filetype) {
+  if ("\\.rnw" %in% filetype_) {
     vignette_files <- append(
       vignette_files,
       dir_without_.(
-        path = without_excluded("vignettes"), pattern = "\\.rnw$"
+        path = "vignettes", pattern = "\\.rnw$"
       )
     )
   }
-
   files <- setdiff(
     c(r_files, rprofile_files, vignette_files, readme),
     exclude_files

R/utils-files.R

@@ -27,13 +27,15 @@ map_filetype_to_pattern <- function(filetype) {
   paste0("(", paste(set_and_assert_arg_filetype(filetype), collapse = "|"), ")$")
 }
 
-#' `dir()`, but without dot-prefix
+#' `dir()`, but without dot-prefix and different defaults
 #'
 #' When using `dir()`, you can set `full.names = FALSE`, but then you can only
 #' pass a character vector of length one as `path` to not loose the information
 #' about where the files are. This function solves that case. It's needed when
 #' one wants to standardize paths to use set operations on them, i.e. when the
 #' user supplied input does not have a dot prefix. See 'Examples'.
+#'
+#' For different defaults, see `dir_without_._one`.
 #' @param path A path.
 #' @param ... Passed to [base::dir()].
 #' @seealso set_and_assert_arg_paths
@@ -45,6 +47,9 @@ dir_without_. <- function(path, ...) {
     unlist()
 }
 
+#' `dir()`, but with full names, ignored case, and included hidden files and
+#' recursive.
+#' @keywords internal
 dir_without_._one <- function(path, ...) {
   relative <- dir(
     path = path,