Use fs for file path manipulations; closes #38

DESCRIPTION

@@ -40,6 +40,7 @@ URL: https://r-transit.github.io/gtfsio/,
 BugReports: https://github.com/r-transit/gtfsio/issues
 Imports: 
     data.table,
+    fs,
     utils,
     zip,
     jsonlite
@@ -51,7 +52,7 @@ VignetteBuilder:
     knitr
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Collate: 
     'gtfsio_error.R'
     'assert_gtfs.R'

R/assert_inputs.R

@@ -278,3 +278,16 @@ error_x_wrong_inheritance <- function(input_name,
     error_call
   )
 }
+
+#' Vectorized assertion of path extensions
+#'
+#' @param path Vector of file paths
+#' @param ext File extension to be asserted for each `path`
+#'
+#' @return Logicl vector of same length as `path`, with `TRUE` for each element
+#' with specified extension, `FALSE` otherwise.
+#'
+#' @noRd
+assert_extension <- function(path, ext = "zip") {
+  fs::path_ext(path) == ext
+}

R/export_gtfs.R

@@ -67,9 +67,9 @@ export_gtfs <- function(gtfs,
 
   # input checks that depend on more than one argument
 
-  if (file.exists(path) & !overwrite) error_cannot_overwrite()
-  if (!as_dir & !grepl("\\.zip$", path)) error_ext_must_be_zip()
-  if (as_dir & grepl("\\.zip$", path)) error_path_must_be_dir()
+  if (fs::file_exists(path) & !overwrite) error_cannot_overwrite()
+  if (!as_dir & !assert_extension(path, "zip")) error_ext_must_be_zip()
+  if (as_dir & assert_extension(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))) {
@@ -107,18 +107,20 @@ export_gtfs <- function(gtfs,
   if (as_dir) {
     tmpd <- path
   } else {
-    tmpd <- tempfile(pattern = "gtfsio")
+    tmpd <- fs::file_temp(pattern = "gtfsio")
   }
 
-  unlink(tmpd, recursive = TRUE)
-  dir.create(tmpd)
+  if (fs::dir_exists(tmpd)) {
+    fs::dir_delete(tmpd)
+  }
+  fs::dir_create(tmpd, recurse = TRUE)
 
   # write files to 'tmpd'
 
   if (!quiet) message("Writing text files to ", tmpd)
 
   filenames <- append_file_ext(files)
-  filepaths <- file.path(tmpd, filenames)
+  filepaths <- fs::path(tmpd, filenames)
 
   for (i in seq_along(files)) {
 
@@ -130,7 +132,7 @@ export_gtfs <- function(gtfs,
 
     dt <- gtfs[[file]]
 
-    if(endsWith(filename, ".geojson")) {
+    if (assert_extension(filename, "geojson")) {
       jsonlite::write_json(dt, filepath, pretty = FALSE, auto_unbox = TRUE, digits = 8)
     } else {
 
@@ -165,7 +167,9 @@ export_gtfs <- function(gtfs,
 
   if (!as_dir) {
 
-    unlink(path, recursive = TRUE)
+    if (fs::dir_exists(path)) {
+      fs::dir_delete(path)
+    }
 
     zip::zip(
       path,

R/import_gtfs.R

@@ -86,7 +86,7 @@ import_gtfs <- function(path,
 
   path_is_url <- grepl("^http[s]?\\:\\/\\/\\.*", path)
 
-  if (!path_is_url && !file.exists(path)) error_non_existent_file(path)
+  if (!path_is_url && !fs::file_exists(path)) error_non_existent_file(path)
   if (!is.null(files) && !is.null(skip)) error_files_and_skip_provided()
 
   for (input_types in extra_spec) {
@@ -98,7 +98,7 @@ import_gtfs <- function(path,
   # if 'path' is an URL, download it and save path to downloaded file to 'path'
 
   if (path_is_url) {
-    tmp <- tempfile(pattern = "gtfs", fileext = ".zip")
+    tmp <- fs::file_temp(pattern = "gtfs", ext = ".zip")
     utils::download.file(path, tmp, method = "auto", quiet = quiet)
 
     if (!quiet) message("File downloaded to ", tmp, ".")
@@ -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[!(grepl("\\.txt$", filenames_in_gtfs) | grepl("\\.geojson$", filenames_in_gtfs))]
+  non_standard_file_ext <- filenames_in_gtfs[!(assert_extension(filenames_in_gtfs, "txt") | assert_extension(filenames_in_gtfs, "geojson"))]
 
   if (!identical(non_standard_file_ext, character(0))) {
     warning(
@@ -159,8 +159,10 @@ import_gtfs <- function(path,
   # extract text files to temporary folder to later read them
   # 'unlink()' makes sure that previous imports don't interfere with current one
 
-  tmpdir <- file.path(tempdir(), "gtfsio")
-  unlink(tmpdir, recursive = TRUE, force = TRUE)
+  tmpdir <- fs::path(fs::path_temp(), "gtfsio")
+  if (fs::dir_exists(tmpdir)) {
+    fs::dir_delete(tmpdir)
+  }
 
   zip::unzip(
     path,
@@ -190,12 +192,7 @@ import_gtfs <- function(path,
   # assign names to 'gtfs', noting that zip_list may return full paths, which
   # need to be stripped here
 
-  file_names <- vapply(
-    filenames_to_read,
-    function(i) utils::tail(strsplit(i, .Platform$file.sep)[[1]], 1),
-    character(1),
-    USE.NAMES = FALSE
-  )
+  file_names <- basename(filenames_to_read)
 
   names(gtfs) <- remove_file_ext(file_names)
 
@@ -241,19 +238,17 @@ read_files <- function(file,
                        encoding) {
 
   # create object to hold the file with '.txt' extension
+  stopifnot(length(file) == 1L)
 
   filename <- file
-  file_type <- "txt" # TODO get file ext as function
-  if(grepl("\\.geojson$", file)) {
-    file_type <- "geojson"
-  }
+  file_type <- ifelse(assert_extension(file, "txt"), "txt", "geojson")
   file <- remove_file_ext(file)
 
   if (!quiet) message("Reading ", file)
 
   # read geojson and return
   if (file_type == "geojson") {
-    return(read_geojson(file.path(tmpdir, filename)))
+    return(read_geojson(fs::path(tmpdir, filename)))
   }
 
   # get standards for reading and fields to be read from the given 'file'
@@ -283,7 +278,7 @@ read_files <- function(file,
   withCallingHandlers(
     {
       sample_dt <- data.table::fread(
-        file.path(tmpdir, filename),
+        fs::path(tmpdir, filename),
         nrows = 1,
         colClasses = "character"
       )
@@ -357,7 +352,7 @@ read_files <- function(file,
   withCallingHandlers(
     {
       full_dt <- data.table::fread(
-        file.path(tmpdir, filename),
+        fs::path(tmpdir, filename),
         select = fields_classes,
         encoding = encoding
       )
@@ -380,7 +375,7 @@ read_geojson <- function(file.geojson) {
 }
 
 remove_file_ext = function(file) {
-  tools::file_path_sans_ext(file)
+  fs::path_ext_remove(file)
 }
 
 append_file_ext = function(file) {
@@ -391,11 +386,10 @@ append_file_ext = function(file) {
       # behaviour defined in test_import_gtfs.R#292
       file_ext <- "txt"
     }
-    if(endsWith(.f, paste0(".", file_ext))) {
-      return(.f) # file extension already present
-    } else {
-      return(paste0(.f, ".", file_ext))
+    if (!identical(fs::path_ext(.f), file_ext)) {
+      .f <- fs::path_ext_set(.f, file_ext)
     }
+    return(.f)
   }, ".txt", USE.NAMES = FALSE)
 }