ropensci · boshek · Mar 11, 2025 · Mar 11, 2025
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
 # tidyhydat 0.7.0.9999
 - add columns added by a webservice update (#213)
 - fix some partial matching in `realtime_add_local_datetime` internals
+- re-format all code with the lovely air tool
 
 # tidyhydat 0.7.0
 - bump minimum R version to 4.2.0

diff --git a/R/cli_style.R b/R/cli_style.R
@@ -10,7 +10,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-
 ## drawing heavily from the tidyverse package
 
 done <- function(msg) {

diff --git a/R/data.R b/R/data.R
@@ -10,7 +10,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and limitations under the License.
 
-
 #' All Canadian stations
 #'
 #' A shorthand to avoid having always call `hy_stations` or `realtime_stations`.
@@ -66,7 +65,7 @@
 #' @title Parameter ID
 #'
 #' @description A tibble of parameter id codes and their corresponding explanation/description specific to the ECCC webservice
-#' 
+#'
 #' @format A tibble with 8 rows and 7 variables:
 #' \describe{
 #'   \item{Parameter}{Numeric parameter code}

diff --git a/R/download.R b/R/download.R
@@ -34,13 +34,14 @@ download_hydat <- function(dl_hydat_here = NULL, ask = TRUE) {
     if (!dir.exists(dl_hydat_here)) {
       dir.create(dl_hydat_here)
       message(crayon::blue("You have downloaded hydat to", dl_hydat_here))
-      message(crayon::blue("See ?hy_set_default_db to change where tidyhydat looks for HYDAT"))
+      message(crayon::blue(
+        "See ?hy_set_default_db to change where tidyhydat looks for HYDAT"
+      ))
     }
   }
 
   if (!is.logical(ask)) stop("Parameter ask must be a logical")
 
-
   ## Create actual hydat_path
   hydat_path <- file.path(dl_hydat_here, "Hydat.sqlite3")
 
@@ -52,7 +53,6 @@ download_hydat <- function(dl_hydat_here = NULL, ask = TRUE) {
     existing_hydat <- "HYDAT not present"
   }
 
-
   new_hydat <- hy_remote()
   # Make the download URL
   url <- paste0(hy_base_url(), "Hydat_sqlite3_", new_hydat, ".zip")
@@ -62,30 +62,40 @@ download_hydat <- function(dl_hydat_here = NULL, ask = TRUE) {
   req <- tidyhydat_perform(req)
   httr2::resp_check_status(req)
 
-  size <- round(as.numeric(
-    httr2::resp_header(req, "Content-Length")
-  ) / 1000000, 0)
-
+  size <- round(
+    as.numeric(
+      httr2::resp_header(req, "Content-Length")
+    ) /
+      1000000,
+    0
+  )
 
   ## Do we need to download a new version?
-  if (new_hydat == existing_hydat & ask) { # DB exists and no new version
+  if (new_hydat == existing_hydat & ask) {
+    # DB exists and no new version
     msg <- paste0(
       "The existing local version of HYDAT, published on ",
       lubridate::ymd(existing_hydat),
       ", is the most recent version available. \nDo you wish to overwrite it? \nDownloading HYDAT could take up to 10 minutes (",
-      size, " MB)."
+      size,
+      " MB)."
     )
     dl_overwrite <- ask(msg)
   } else {
     dl_overwrite <- TRUE
   }
 
   if (!dl_overwrite) {
-    info("HYDAT is updated on a quarterly basis, check again soon for an updated version.")
+    info(
+      "HYDAT is updated on a quarterly basis, check again soon for an updated version."
+    )
   }
-  if (new_hydat != existing_hydat & ask) { # New DB available or no local DB at all
+  if (new_hydat != existing_hydat & ask) {
+    # New DB available or no local DB at all
     msg <- paste0(
-      "This version of HYDAT is ", size, "MB in size and will take some time to download. 
+      "This version of HYDAT is ",
+      size,
+      "MB in size and will take some time to download. 
       \nThis will remove any older versions of HYDAT, if applicable.  \nIs that okay?"
     )
     ans <- ask(msg)
@@ -99,12 +109,18 @@ download_hydat <- function(dl_hydat_here = NULL, ask = TRUE) {
     green_message(paste0("Downloading HYDAT to ", dl_hydat_here))
   }
 
-
   if (dl_overwrite) {
     if (new_hydat == existing_hydat) {
-      info(paste0("Your local copy of HYDAT published on ", crayon::blue(lubridate::ymd(new_hydat)), " will be overwritten."))
+      info(paste0(
+        "Your local copy of HYDAT published on ",
+        crayon::blue(lubridate::ymd(new_hydat)),
+        " will be overwritten."
+      ))
     } else {
-      info(paste0("Downloading new version of HYDAT created on ", crayon::blue(lubridate::ymd(new_hydat))))
+      info(paste0(
+        "Downloading new version of HYDAT created on ",
+        crayon::blue(lubridate::ymd(new_hydat))
+      ))
     }
 
     ## temporary path to save
@@ -130,7 +146,6 @@ download_hydat <- function(dl_hydat_here = NULL, ask = TRUE) {
       overwrite = TRUE
     )
 
-
     if (file.exists(hydat_path)) {
       congrats("HYDAT successfully downloaded")
     } else {
@@ -160,10 +175,10 @@ hy_remote <- function() {
   req <- tidyhydat_perform(req)
   resp <- httr2::resp_check_status(req)
 
-
   raw_date <- substr(
     gsub("^.*\\Hydat_sqlite3_", "", httr2::resp_body_string(req)),
-    1, 8
+    1,
+    8
   )
 
   raw_date
@@ -182,7 +197,6 @@ hy_check <- function(hydat_path = NULL) {
     red_message(paste0(tbl_diff, "\n"))
   }
 
-
   invisible(lapply(have_tbls, function(x) {
     tbl_rows <- dplyr::tbl(con, x) |>
       utils::head(1) |>

diff --git a/R/hy-classes.R b/R/hy-classes.R
@@ -25,7 +25,11 @@ print.hy <- function(x, ...) {
 }
 
 summary_msg <- function(x) {
-  cat(paste0("  Queried from version of HYDAT released on ", as.Date(hy_version()$Date), "\n"))
+  cat(paste0(
+    "  Queried from version of HYDAT released on ",
+    as.Date(hy_version()$Date),
+    "\n"
+  ))
 
   n_records <- format(nrow(x), big.mark = ",")
   cat(paste0("   Observations:                      ", n_records, "\n"))
@@ -36,11 +40,19 @@ summary_msg <- function(x) {
   }
 
   if ("PROV_TERR_STATE_LOC" %in% names(x)) {
-    cat(paste0("   Jurisdictions: ", paste0(unique(x$PROV_TERR_STATE_LOC), collapse = ", "), "\n"))
+    cat(paste0(
+      "   Jurisdictions: ",
+      paste0(unique(x$PROV_TERR_STATE_LOC), collapse = ", "),
+      "\n"
+    ))
   }
 
   if ("Parameter" %in% names(x)) {
-    cat(paste0("   Parameter(s):                      ", paste0(unique(x$Parameter), collapse = "/"), "\n"))
+    cat(paste0(
+      "   Parameter(s):                      ",
+      paste0(unique(x$Parameter), collapse = "/"),
+      "\n"
+    ))
   }
 }
 
@@ -58,12 +70,17 @@ missed_station_msg <- function(x) {
   cat("   Stations requested but not returned: \n")
   if (length(differ) != 0) {
     if (length(differ) > 50) {
-      cat(crayon::cyan("     More than 50 stations requested but not returned. \n"))
-      cat(crayon::cyan(paste0("     See object attributes for complete list of missing stations.\n")))
+      cat(crayon::cyan(
+        "     More than 50 stations requested but not returned. \n"
+      ))
+      cat(crayon::cyan(paste0(
+        "     See object attributes for complete list of missing stations.\n"
+      )))
     } else {
       cat(
         crayon::cyan(
-          paste0("    ",
+          paste0(
+            "    ",
             strwrap(
               paste0(differ, collapse = " "),
               width = 40