Update data using new source data directory structure

cdalzell · Apr 4, 2022 · d317d4e · d317d4e
1 parent 20712f3
commit d317d4e
Show file tree

Hide file tree

Showing 33 changed files with 8 additions and 12 deletions.
diff --git a/data/AllstarFull.RData b/data/AllstarFull.RData
diff --git a/data/Appearances.RData b/data/Appearances.RData
diff --git a/data/AwardsManagers.RData b/data/AwardsManagers.RData
diff --git a/data/AwardsPlayers.RData b/data/AwardsPlayers.RData
diff --git a/data/AwardsShareManagers.RData b/data/AwardsShareManagers.RData
diff --git a/data/AwardsSharePlayers.RData b/data/AwardsSharePlayers.RData
diff --git a/data/Batting.RData b/data/Batting.RData
diff --git a/data/BattingPost.RData b/data/BattingPost.RData
diff --git a/data/CollegePlaying.RData b/data/CollegePlaying.RData
diff --git a/data/Fielding.RData b/data/Fielding.RData
diff --git a/data/FieldingOF.RData b/data/FieldingOF.RData
diff --git a/data/FieldingOFsplit.RData b/data/FieldingOFsplit.RData
diff --git a/data/FieldingPost.RData b/data/FieldingPost.RData
diff --git a/data/HallOfFame.RData b/data/HallOfFame.RData
diff --git a/data/HomeGames.RData b/data/HomeGames.RData
diff --git a/data/LahmanData.RData b/data/LahmanData.RData
diff --git a/data/Managers.RData b/data/Managers.RData
diff --git a/data/ManagersHalf.RData b/data/ManagersHalf.RData
diff --git a/data/Master.RData b/data/Master.RData
diff --git a/data/Parks.RData b/data/Parks.RData
diff --git a/data/People.RData b/data/People.RData
diff --git a/data/Pitching.RData b/data/Pitching.RData
diff --git a/data/PitchingPost.RData b/data/PitchingPost.RData
diff --git a/data/Salaries.RData b/data/Salaries.RData
diff --git a/data/Schools.RData b/data/Schools.RData
diff --git a/data/SeriesPost.RData b/data/SeriesPost.RData
diff --git a/data/Teams.RData b/data/Teams.RData
diff --git a/data/TeamsFranchises.RData b/data/TeamsFranchises.RData
diff --git a/data/TeamsHalf.RData b/data/TeamsHalf.RData
diff --git a/data/battingLabels.RData b/data/battingLabels.RData
diff --git a/data/fieldingLabels.RData b/data/fieldingLabels.RData
diff --git a/data/pitchingLabels.RData b/data/pitchingLabels.RData
diff --git a/inst/scripts/readLahman.R b/inst/scripts/readLahman.R
@@ -23,11 +23,12 @@ unzip(dataFile, exdir=indir)
 #Batting <- read.csv(file="Batting.csv", header=TRUE, stringsAsFactors=FALSE, na.strings="")
 #Master <- read.csv(file="Master.csv", header=TRUE, stringsAsFactors=FALSE)
 
-# set indir to the directories the csv are extracted to
-indir <- paste0(indir, "/baseballdatabank-2022.2/core")
+
+indir <- paste0(indir, "/baseballdatabank-2022.2")
 setwd(indir)
 
-(files <- list.files(path=getwd(), pattern="csv"))
+directoryList = c(paste0(getwd(), "/core"), paste0(getwd(), "/contrib"))
+(files <- list.files(directoryList, pattern="csv", full.names=TRUE))
 
 for (i in 1:length(files)) {
 	inp <- read.csv(file=files[i], header=TRUE, stringsAsFactors=FALSE, na.strings="")
@@ -45,12 +46,8 @@ for (i in 1:length(files)) {
 	if("teamIDwinner" %in% names(inp)) inp$teamIDwinner <- factor(inp$teamIDwinner)
 	if("teamIDloser" %in% names(inp)) inp$teamIDloser <- factor(inp$teamIDloser)
 
-	cname <- name <- sub(".csv", "", files[i])
-	assign( name, inp)
-
-	# these will be saved below after being compressed
-	#save(inp, file=paste(cname, ".RData", sep=""))
-  #promptData(inp, name=cname)
+	name <- sub(".csv", "", basename(files[i]))
+	assign(name, inp)
 }
 
 # fix column names or perform any needed data cleanup here
@@ -87,7 +84,7 @@ People <- within(People, {
 #  'named Guillermo VelC!zquez' in object 'Master'
 #  'Martmn Magdaleno Dihigo (Llanos)' in object 'Master'
 
-tools:::showNonASCII(paste0(indir, 'People.csv'))
+tools:::showNonASCII(paste0(indir, '/core/People.csv'))
 
 # then, fix manually, because I don't know an R way ...
 
@@ -151,8 +148,7 @@ if (FALSE) {
   promptData(HallOfFame,          filename="HallOfFame.Rd")         
   promptData(HOFold,              filename="HOFold.Rd")             
   promptData(Managers,            filename="Managers.Rd")           
-  promptData(ManagersHalf,        filename="ManagersHalf.Rd")       
-  promptData(Master,              filename="Master.Rd")             
+  promptData(ManagersHalf,        filename="ManagersHalf.Rd")
   promptData(Pitching,            filename="Pitching.Rd")           
   promptData(PitchingPost,        filename="PitchingPost.Rd")       
   promptData(Salaries,            filename="Salaries.Rd")