Skip to content

Commit

Permalink
refacto(write_sf_ext): incorporate filenamr package
Browse files Browse the repository at this point in the history
  • Loading branch information
elipousson committed Nov 27, 2022
1 parent 47716ca commit 2be1dfa
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
6 changes: 4 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Depends:
Imports:
cli,
dplyr,
filenamr (>= 0.1.0),
glue,
janitor,
purrr,
Expand Down Expand Up @@ -49,8 +50,9 @@ Suggests:
tidyr
VignetteBuilder:
knitr
Remotes:
elipousson/esri2sf
Remotes:
elipousson/esri2sf,
elipousson/filenamr
Config/testthat/edition: 3
Config/testthat/parallel: true
Encoding: UTF-8
Expand Down
9 changes: 5 additions & 4 deletions R/sfext-package.R
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#' @import rlang
#' @importFrom rlang .data .env caller_env has_length is_interactive
#' @importFrom cli cli_abort cli_warn cli_inform
#' @importFrom glue glue glue_collapse
#' @keywords internal
"_PACKAGE"

## usethis namespace: start
#' @import rlang
#' @importFrom rlang .data .env caller_env has_length is_interactive
#' @importFrom cli cli_abort cli_warn cli_inform
#' @importFrom glue glue glue_collapse
#' @importFrom filenamr make_filename
## usethis namespace: end
rlang::on_load(rlang::local_use_cli())
16 changes: 8 additions & 8 deletions R/write_sf_ext.R
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ write_sf_ext <- function(data,

# If data is sf object, write or cache it
filename <-
make_filename(
filenamr::make_filename(
name = name,
label = label,
filetype = filetype,
fileext = filetype,
filename = filename,
path = NULL,
prefix = prefix,
Expand Down Expand Up @@ -125,10 +125,10 @@ write_sf_cache <- function(data,
create = TRUE,
...) {
filename <-
make_filename(
filenamr::make_filename(
name = name,
label = label,
filetype = filetype,
fileext = filetype,
filename = filename,
prefix = prefix,
postfix = postfix,
Expand Down Expand Up @@ -173,10 +173,10 @@ write_sf_gist <- function(data,
is_pkg_installed("gistr")

filename <-
make_filename(
filenamr::make_filename(
name = name,
label = label,
filetype = filetype,
fileext = filetype,
filename = filename,
prefix = prefix,
postfix = postfix,
Expand Down Expand Up @@ -237,10 +237,10 @@ write_sf_gsheet <- function(data,
}

filename <-
make_filename(
filenamr::make_filename(
name = name,
label = label,
filetype = NULL,
fileext = NULL,
filename = filename,
prefix = prefix,
postfix = postfix,
Expand Down

0 comments on commit 2be1dfa

Please sign in to comment.