Fixed get_current_season with new no-internet recovery

SCasanova · Mar 6, 2024 · 669aa2a · 669aa2a
1 parent 3453c36
commit 669aa2a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/R/utils.R b/R/utils.R
@@ -98,20 +98,18 @@ get_ergast_content <- function(url) {
 #' @export
 #' @return Year (four digit number) representation of current season, as numeric.
 get_current_season <- function() {
-  current_season <- ifelse(as.numeric(strftime(Sys.Date(), "%m")) < 3,
-    as.numeric(strftime(Sys.Date(), "%Y")) - 1,
-    as.numeric(strftime(Sys.Date(), "%Y"))
-  )
-  tryCatch(
-    {
-      url <- "current.json?limit=30"
-      data <- get_ergast_content(url)
-      current_season <- as.numeric(data$MRData$RaceTable$season)
-    },
-    error = function(e) {
-      cli::cli_inform("Falling back to manually determined 'current' season")
-    }
-  )
+  url <- "current.json?limit=30"
+  data <- get_ergast_content(url)
+
+  if(is.null(data)){
+    cli::cli_inform("Falling back to manually determined 'current' season")
+    current_season <- ifelse(as.numeric(strftime(Sys.Date(), "%m")) < 3,
+                             as.numeric(strftime(Sys.Date(), "%Y")) - 1,
+                             as.numeric(strftime(Sys.Date(), "%Y"))
+    )
+  } else {
+    current_season <- as.numeric(data$MRData$RaceTable$season)
+  }
   return(current_season)
 }
 

diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
@@ -52,7 +52,7 @@ test_that("Utility Functions work without internet", {
   if (requireNamespace("httptest2", quietly = TRUE)) {
     # Test internet failures for get_current_season
     httptest2::without_internet({
-      expect_message(get_current_season(), "f1dataR: Error getting current season from Ergast")
+      expect_message(get_current_season(), "f1dataR: Error getting data from Ergast")
       expect_gte(get_current_season(), 2022)
     })
   }