misc cleanup

Author: atungate

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: ffanalytics
 Type: Package
 Title: Scrape Data For Fantasy Football
-Version: 3.1.9.0000
+Version: 3.1.10.0000
 Authors@R: c(person("Andrew", "Tungate", 
                     role = c("aut", "cre"), 
                     email = "atungate@gmail.com"),
@@ -25,11 +25,11 @@ Imports:
     readxl,
     httr2,
     rvest,
-    stringr,
     purrr,
     tidyr,
     dplyr,
-    rrapply
+    rrapply,
+    readr
 Depends: 
     R (>= 4.1.0)
 RoxygenNote: 7.3.2

NAMESPACE

@@ -28,4 +28,5 @@ import(rvest)
 import(tidyr)
 importFrom(data.table,fread)
 importFrom(data.table,rbindlist)
+importFrom(readr,read_csv)
 importFrom(readxl,read_xlsx)

R/adp_functions.R

@@ -384,7 +384,7 @@ espn_draft <- function(metric = c("adp", "aav")){
   metric = match.arg(tolower(metric), c("adp", "aav"))
   obj_name = "ESPN ADP/AAV"
   is_cached = obj_name %in% list_ffanalytics_cache(quiet = TRUE)$object
-  season = ffanalytics:::get_scrape_year()
+  season = get_scrape_year()
 
   if(is_cached) {
     l_pos = get_cached_object("espn_adp_aav.rds")
@@ -464,12 +464,12 @@ espn_draft <- function(metric = c("adp", "aav")){
       out_df = dplyr::bind_rows(l_players)
 
       if(pos == "DST") { # ESPN ID's coming in as negative for 2023 wk 0 DST
-        out_df$id = ffanalytics:::get_mfl_id(
+        out_df$id = get_mfl_id(
           team = out_df$team,
           pos = out_df$position
         )
       } else {
-        out_df$id = ffanalytics:::get_mfl_id(
+        out_df$id = get_mfl_id(
           out_df$espn_id,
           player_name = out_df$player_name,
           pos = out_df$position

R/ffanalytics.R

@@ -1,6 +1,7 @@
 #' @import dplyr tidyr purrr httr2 rvest rrapply
 #' @importFrom data.table fread rbindlist
 #' @importFrom readxl read_xlsx
+#' @importFrom readr read_csv
 
 .onLoad <- function(libname, pkgname){
   player_table = data.table::fread("https://s3.us-east-2.amazonaws.com/ffanalytics/packagedata/player_table.csv",

R/get_league_info.R

@@ -33,9 +33,8 @@ get_league_info_sleeper = function(league_id) {
 
 clean_scoring_sleeper = function(scoring_obj) {
 
-  s_obj = ffanalytics:::scoring_empty
+  s_obj = scoring_empty
 
-  s_obj = .
   s_obj$dst$dst_blk = scoring_obj$blk_kick
   s_obj$pass$pass_300_yds = scoring_obj$bonus_pass_yd_300
   s_obj$pass$pass_400_yds = scoring_obj$bonus_pass_yd_400

R/schedule_data.R

@@ -36,7 +36,7 @@ first_last_games = get_first_last_kickoff()
 
 get_scrape_starts = function(first_last_games) {
   if(missing(first_last_games)) {
-    first_last_games = ffanalytics:::first_last_games
+    first_last_games = first_last_games
   }
   first_last_df = dplyr::bind_rows(first_last_games)
   last_vec = first_last_df$last
@@ -51,7 +51,7 @@ scrape_start_date = get_scrape_starts(first_last_games)
 
 get_scrape_week = function(scrape_start_date) {
   if(missing(scrape_start_date)) {
-    scrape_start_date = ffanalytics:::scrape_start_date
+    scrape_start_date = scrape_start_date
   }
   sum(Sys.Date() >= scrape_start_date)
 }

R/source_scrapes.R

@@ -1250,12 +1250,12 @@ scrape_espn = function(pos = c("QB", "RB", "WR", "TE", "K", "DST"), season = NUL
     out_df$data_src = "ESPN"
 
     if(pos == "DST") { # ESPN ID's coming in as negative for 2023 wk 0 DST
-      out_df$id = ffanalytics:::get_mfl_id(
+      out_df$id = get_mfl_id(
         team = out_df$team,
         pos = out_df$position
       )
     } else {
-      out_df$id = ffanalytics:::get_mfl_id(
+      out_df$id = get_mfl_id(
         out_df$espn_id,
         player_name = out_df$player_name,
         pos = out_df$position,
@@ -1541,7 +1541,7 @@ scrape_fanduel <- function(pos = c("QB", "RB", "WR", "TE", "K", "DST"),
       flatten = TRUE
     )
 
-    df <- tibble::as_tibble(result$data$getProjections)
+    df <- dplyr::as_tibble(result$data$getProjections)
 
     names(df) <- gsub("\\.", "_", names(df))
     names(df) <- rename_vec(names(df), fanduel_columns)

R/to_be_deprecated.R

@@ -319,14 +319,14 @@ projected_points <- function(agg_stats, scoring_rules) {
   dst_src <- agg_stats %>% slice(0) %>% mutate(points = 0)
   if(dst_bracket){
     dst_src <- agg_stats %>%  filter(data_col == "dst_pts_allowed") %>%
-      mutate(points = ffanalytics:::dst_points(stat_value, scoring_rules$pts_bracket))
+      mutate(points = dst_points(stat_value, scoring_rules$pts_bracket))
   }
 
   dst_agg <- dst_src %>% slice(0)
 
   if(dst_bracket){
     dst_agg <- agg_stats %>% filter(data_col == "dst_pts_allowed") %>%
-      mutate(points = ffanalytics:::dst_points(stat_value, scoring_rules$pts_bracket))
+      mutate(points = dst_points(stat_value, scoring_rules$pts_bracket))
   }
   agg_stats  %>%
     inner_join(scoring_tbl, by = c("pos", "data_col")) %>%
@@ -974,7 +974,7 @@ source_points_old <- function(data_result, scoring_rules){
   dst_src <- long_result %>% slice(0) %>% mutate(points = 0)
   if(dst_bracket){
     dst_src <- long_result %>%  filter(data_col == "dst_pts_allowed") %>%
-      mutate(points = ffanalytics:::dst_points(stat_value, scoring$pts_bracket))
+      mutate(points = dst_points(stat_value, scoring$pts_bracket))
   }
 
   long_result %>%