mv 'has_extension' -> 'has_file_ext' #38

R/export_gtfs.R

@@ -68,8 +68,8 @@ export_gtfs <- function(gtfs,
   # input checks that depend on more than one argument
 
   if (fs::file_exists(path) & !overwrite) error_cannot_overwrite()
-  if (!as_dir & !has_extension(path, "zip")) error_ext_must_be_zip()
-  if (as_dir & has_extension(path, "zip")) error_path_must_be_dir()
+  if (!as_dir & !has_file_ext(path, "zip")) error_ext_must_be_zip()
+  if (as_dir & has_file_ext(path, "zip")) error_path_must_be_dir()
 
   extra_files <- setdiff(files, names(gtfsio::gtfs_reference))
   if (standard_only & !is.null(files) & !identical(extra_files, character(0))) {
@@ -132,7 +132,7 @@ export_gtfs <- function(gtfs,
 
     dt <- gtfs[[file]]
 
-    if (has_extension(filename, "geojson")) {
+    if (has_file_ext(filename, "geojson")) {
       jsonlite::write_json(dt, filepath, pretty = FALSE, auto_unbox = TRUE, digits = 8)
     } else {
 

R/import_gtfs.R

@@ -117,7 +117,7 @@ import_gtfs <- function(path,
   )
   if (inherits(filenames_in_gtfs, "error")) error_path_must_be_zip()
 
-  non_standard_file_ext <- filenames_in_gtfs[!(has_extension(filenames_in_gtfs, "txt") | has_extension(filenames_in_gtfs, "geojson"))]
+  non_standard_file_ext <- filenames_in_gtfs[!(has_file_ext(filenames_in_gtfs, "txt") | has_file_ext(filenames_in_gtfs, "geojson"))]
 
   if (!identical(non_standard_file_ext, character(0))) {
     warning(
@@ -241,7 +241,7 @@ read_files <- function(file,
   stopifnot(length(file) == 1L)
 
   filename <- file
-  file_type <- ifelse(has_extension(file, "txt"), "txt", "geojson")
+  file_type <- ifelse(has_file_ext(file, "txt"), "txt", "geojson")
   file <- remove_file_ext(file)
 
   if (!quiet) message("Reading ", file)

R/utils.R

@@ -10,7 +10,7 @@ append_file_ext = function(file) {
       # behaviour defined in test_import_gtfs.R#292
       file_ext <- "txt"
     }
-    if (!has_extension(.f, file_ext)) {
+    if (!has_file_ext(.f, file_ext)) {
       .f <- fs::path_ext_set(.f, file_ext)
     }
     return(.f)
@@ -26,6 +26,6 @@ append_file_ext = function(file) {
 #' with specified extension, `FALSE` otherwise.
 #'
 #' @noRd
-has_extension <- function(path, ext = "zip") {
+has_file_ext <- function(path, ext = "zip") {
   fs::path_ext(path) == ext
 }