Merge pull request #448 from JaseZiv/tm-dates

address tm dates issue, including #445

Author: JaseZiv

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: worldfootballR
 Title: Extract and Clean World Football (Soccer) Data
-Version: 0.6.8
+Version: 0.6.8.0001
 Authors@R: c(
     person("Jason", "Zivkovic", , "jaseziv83@gmail.com", role = c("aut", "cre", "cph")),
     person("Tony", "ElHabr", , "anthonyelhabr@gmail.com", role = "ctb"),

NEWS.md

@@ -1,5 +1,15 @@
 # worldfootballR (development version)
 
+### Improvements
+
+* Internal function `.tm_fix_dates` Now handles parsing even more date formats, including "30.08.2029" and "2029.08.30"  (0.6.8.0001) ([#445](https://github.com/JaseZiv/worldfootballR/issues/445))
+* Address issues with dates for `player_dob` in the output of `tm_player_market_values()` and `tm_each_team_player_market_val()` (0.6.8.0001)
+
+
+***
+
+# worldfootballR 0.6.8
+
 ### New Functions
 
 * `tm_each_team_player_market_val()` created to allow users to get player market values per team [#432](https://github.com/JaseZiv/worldfootballR/issues/432)

R/internals.R

@@ -357,24 +357,43 @@
 #' @noRd
 #'
 .tm_fix_dates <- function(dirty_dates) {
-
+  
   fix_date <- function(dirty_date) {
     if(is.na(dirty_date)) {
       clean_date <- NA_character_
+    } else if (grepl("\\.", dirty_date)) {
+      
+      first_part <- sub("\\..*", "", dirty_date)
+      
+      # Count digits
+      n <- nchar(first_part)
+      
+      if (n == 4) {
+        # Do something if 4 digits
+        tryCatch({clean_date <- lubridate::ymd(dirty_date) %>% as.character()}, error = function(e) {clean_date <- NA_character_})
+      } else if (n == 2) {
+        # Do something else if 2 digits
+        tryCatch({clean_date <- lubridate::dmy(dirty_date) %>% as.character()}, error = function(e) {clean_date <- NA_character_})
+      } else {
+        # Fallback
+        clean_date <- NA_character_
+      }
+      
+      
     } else {
       split_string <- strsplit(dirty_date, split = " ") %>% unlist() %>% gsub(",", "", .)
       if(length(split_string) != 3) {
         clean_date <- NA_character_
       } else {
         tryCatch({clean_date <- lubridate::ymd(paste(split_string[3], split_string[1], split_string[2], sep = "-")) %>%
-          as.character()}, error = function(e) {country_name <- NA_character_})
+          as.character()}, error = function(e) {clean_date <- NA_character_})
       }
     }
-
+    
     return(clean_date)
   }
   clean_dates <- dirty_dates %>% purrr::map_chr(fix_date)
-
+  
   return(clean_dates)
 }
 

R/player_market_values.R

@@ -151,12 +151,10 @@ tm_each_team_player_market_val <- function(each_team_url, time_pause = 15) {
     dplyr::mutate(player_market_value_euro = mapply(.convert_value_to_numeric, player_market_value)) %>%
     dplyr::mutate(date_joined = .tm_fix_dates(.data[["date_joined"]]),
                   contract_expiry = .tm_fix_dates(.data[["contract_expiry"]])) %>%
-    tidyr::separate(., player_birthday, into = c("Month", "Day", "Year"), sep = " ", remove = F) %>% suppressWarnings() |> 
+    tidyr::separate(., player_birthday, into = c("Month", "Day", "Year"), sep = "\\.", remove = F) %>% suppressWarnings() |> 
     dplyr::mutate(player_age = gsub(".*\\(", "", .data[["player_birthday"]]) %>% gsub("\\)", "", .),
-                  Day = gsub(",", "", .data[["Day"]]) %>% as.numeric(),
-                  Year = as.numeric(gsub("\\(.*", "", .data[["Year"]])),
-                  Month = match(.data[["Month"]], month.abb),
-                  player_dob = suppressWarnings(lubridate::ymd(paste(.data[["Year"]], .data[["Month"]], .data[["Day"]], sep = "-")))) %>%
+                  player_birthday = gsub("\\s*\\([^)]*\\)", "", .data[["player_birthday"]]),
+                  player_dob = suppressWarnings(lubridate::dmy(.data[["player_birthday"]]))) %>%
     dplyr::mutate(player_age = as.numeric(gsub("\\D", "", .data[["player_age"]]))) %>%
     dplyr::select(.data[["comp_name"]], .data[["country"]], .data[["season_start_year"]], .data[["squad"]], .data[["player_num"]], .data[["player_name"]], .data[["player_position"]], .data[["player_dob"]], .data[["player_age"]], .data[["player_nationality"]], .data[["current_club"]],
                   .data[["player_height_mtrs"]], .data[["player_foot"]], .data[["date_joined"]], .data[["joined_from"]], .data[["contract_expiry"]], .data[["player_market_value_euro"]], .data[["player_url"]])
@@ -397,10 +395,8 @@ tm_player_market_values <- function(country_name, start_year, league_url = NA) {
                   contract_expiry = .tm_fix_dates(.data[["contract_expiry"]])) %>%
     tidyr::separate(., player_birthday, into = c("Month", "Day", "Year"), sep = " ", remove = F) %>%
     dplyr::mutate(player_age = gsub(".*\\(", "", .data[["player_birthday"]]) %>% gsub("\\)", "", .),
-                  Day = gsub(",", "", .data[["Day"]]) %>% as.numeric(),
-                  Year = as.numeric(gsub("\\(.*", "", .data[["Year"]])),
-                  Month = match(.data[["Month"]], month.abb),
-                  player_dob = suppressWarnings(lubridate::ymd(paste(.data[["Year"]], .data[["Month"]], .data[["Day"]], sep = "-")))) %>%
+                  player_birthday = gsub("\\s*\\([^)]*\\)", "", .data[["player_birthday"]]),
+                  player_dob = suppressWarnings(lubridate::dmy(.data[["player_birthday"]]))) %>%
     dplyr::mutate(player_age = as.numeric(gsub("\\D", "", .data[["player_age"]]))) %>%
     dplyr::select(.data[["comp_name"]], .data[["region"]], .data[["country"]], .data[["season_start_year"]], .data[["squad"]], .data[["player_num"]], .data[["player_name"]], .data[["player_position"]], .data[["player_dob"]], .data[["player_age"]], .data[["player_nationality"]], .data[["current_club"]],
                   .data[["player_height_mtrs"]], .data[["player_foot"]], .data[["date_joined"]], .data[["joined_from"]], .data[["contract_expiry"]], .data[["player_market_value_euro"]], .data[["player_url"]])