footballdata-api 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16f099d030a007993b7289956e920fd89baff6abc506feeca3dad792453efe76
-  data.tar.gz: 8f3d2df27a3dc12cc15fa2a8ee0dcd42a51ed793261a2ab2795020147596e7f6
+  metadata.gz: b3350fb47d596e6d5b2e4d73582b2615020d56db38cf86d9545a10b1760494c1
+  data.tar.gz: d7ba6c51f3e12beed59df7b851e8d533a838de67e73c5b1d025ab7a1256caa7d
 SHA512:
-  metadata.gz: cca1d63da2e1823a3c9cc2636953da2f691101c32b63f5004c5349338d9dd75099ac993786e038cf3e2ea8a41f3ac1ce7510cdf148f1f13a98d360203613cf99
-  data.tar.gz: 6030f680eb2e5dadd269ee78bd778c1b465914702e20fe98e55e0967346feb67a6b74d8a965dea73ce62b9c8f457ba1de811d02e26a603b90ff4d3a160b8ee99
+  metadata.gz: 2943bcf6f2da49dfc1cab26da0933957d2bde2fb13749c7ce4d4896214484bac3edcea197e01ed9b2b63f92e2e74f560ac49189f63be7644522b7b24b7cbed73
+  data.tar.gz: 945cc2d0cb9346434c6f3875c33dd153867318b73e067c5574bc6e789f7b3b293d5c7f126c80221c676998eaa0e532647b7a25b960d082097209b6a1428f879e

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.2.0
+### 0.3.1
 
 ### 0.0.1 / 2024-07-03
 

data/Manifest.txt

@@ -3,13 +3,15 @@ Manifest.txt
 README.md
 Rakefile
 bin/fbdat
+config/leagues.csv
+config/timezones.csv
 lib/footballdata.rb
 lib/footballdata/convert.rb
 lib/footballdata/download.rb
-lib/footballdata/generator.rb
 lib/footballdata/leagues.rb
 lib/footballdata/mods.rb
 lib/footballdata/prettyprint.rb
 lib/footballdata/stat.rb
 lib/footballdata/teams.rb
+lib/footballdata/timezones.rb
 lib/footballdata/version.rb

data/Rakefile

@@ -19,15 +19,15 @@ Hoe.spec 'footballdata-api' do
 
   self.extra_deps = [
     ['tzinfo'],
-    ['season-formats'], 
-    ['webget'],    
+    ['season-formats'],
+    ['webget'],
     ['cocos'],  ## later pull in with sportsdb-writers
   ]
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   required_ruby_version: '>= 2.2.2'
+   required_ruby_version: '>= 3.1.0'
   }
 
 end

data/bin/fbdat

@@ -12,17 +12,20 @@ load_env   ## use dotenv (.env)
 Webcache.root =  if File.exist?( '/sports/cache' )
                      puts "  setting web cache to >/sports/cache<"
                      '/sports/cache'
-                 else 
+                 else
                      './cache'
                  end
 
-## note -  free tier (tier one) plan - 10 requests/minute   
+## note -  free tier (tier one) plan - 10 requests/minute
 ##              (one request every 6 seconds 6*10=60 secs)
 ##     10 API calls per minute max.
 ##  note - default sleep (delay in secs) is 3 sec(s)
 Webget.config.sleep  = 10
 
 
+Footballdata.config.convert.out_dir = '/sports/cache.api.fbdat'   if File.exist?( '/sports/cache.api.fbdat' )
+
+
 
 
 require 'optparse'
@@ -32,17 +35,28 @@ require 'optparse'
 module Footballdata
 def self.main( args=ARGV )
 
-opts = {}
+opts = {
+   cached:  false,
+   convert: true,
+}
+
 parser = OptionParser.new do |parser|
-  parser.banner = "Usage: #{$PROGRAM_NAME} [options]"
+  parser.banner = "Usage: #{$PROGRAM_NAME} [options] [args]"
 
   parser.on( "--cache", "--cached", "--offline",
-               "use cached data in #{Webcache.root}" ) do |cached|
+               "use cached data in #{Webcache.root} - default is (#{opts[:cached]})" ) do |cached|
     opts[:cached] = cached
   end
+
+  parser.on( "--no-convert",
+               "turn off conversion to .csv in #{Footballdata.config.convert.out_dir} - default is (#{!opts[:convert]})" ) do |convert|
+    opts[:convert] = !convert
+  end
 end
 parser.parse!( args )
 
+
+
 puts "OPTS:"
 p opts
 puts "ARGV:"
@@ -51,23 +65,23 @@ p args
 
 ## try special args
 
-if ['plan', 'plans', 
-    'comp', 'comps'].include?(args[0]) 
+if ['plan', 'plans',
+    'comp', 'comps'].include?(args[0])
 
     if opts[:cached]
         ## do nothing
-    else    
+    else
       Metal.competitions( auth: true )   ## get free tier (TIER_ONE) with auth (token)
     end
 
   url = Metal.competitions_url
   pp url
   #=> "http://api.football-data.org/v4/competitions"
-   
+
   data = Webcache.read_json( url )
   pp data
-    
-  comps = data['competitions']  
+
+  comps = data['competitions']
   comps.each do |rec|
       print "==> "
       print "#{rec['area']['name']} (#{rec['area']['code']}) - "
@@ -75,12 +89,12 @@ if ['plan', 'plans',
       print "#{rec['plan']} #{rec['type']}, "
       print "#{rec['numberOfAvailableSeasons']} season(s)"
       print "\n"
-  
-      print "     #{rec['currentSeason']['startDate']} - #{rec['currentSeason']['endDate']} "  
+
+      print "     #{rec['currentSeason']['startDate']} - #{rec['currentSeason']['endDate']} "
       print "@ #{rec['currentSeason']['currentMatchday']}"
       print "\n"
   end
-  
+
   puts "  #{comps.size} competition(s)"
   exit 0
 end
@@ -100,9 +114,9 @@ end
 ## todo - add more date offsets - t+2,t+3,t+4, etc.
 
 date =  if ['y', 'yesterday', 't-1', '-1'].include?( args[0] )
-            Date.today-1       
+            Date.today-1
         elsif ['t', 'tomorrow', 't+1', '1', '+1'].include?( args[0] )
-            Date.today+1        
+            Date.today+1
         elsif ['m', 'match', 'matches', 'today'].include?( args[0] || 'today' )  ## make default - why? why not?
             Date.today
         else
@@ -110,7 +124,7 @@ date =  if ['y', 'yesterday', 't-1', '-1'].include?( args[0] )
         end
 
 if date
-  if opts[:cached] 
+  if opts[:cached]
       ## do nothing
   else
      Metal.todays_matches( date )
@@ -124,7 +138,7 @@ if date
     ## only print competition header if different from last match
     comp = fmt_competition( rec )
     puts comp   if comp != last_comp
-    
+
     puts fmt_match( rec )
 
     last_comp = comp
@@ -145,40 +159,41 @@ end
 ##   club cups intl
 ##    CL 2023  - (uefa/european) champions league
 ##    CLI 2204 - (south american) copa libertadores
-##   club leagues 
+##   club leagues
 ##    PL 2024  - england premiere league
 
+##
+## note - only use "generic" uniform league codes for now!!
 
-league_code       = args[0] || 'PL'
+league_code       = (args[0] || 'eng.1').downcase
 
+##  todo - find a better name
+##  use internal_league_code or such - why? why not?
 ###  convenience helpers - lets you use eng.1, euro, etc.
 ## check if mapping for league_code
-if LEAGUES.has_key?( league_code.downcase )
-  league_code = LEAGUES[ league_code.downcase ]
-else
-   ## assume  "native" code
-   ##  always upcase e.g. pl => PL etc.
-   league_code = league_code.upcase
-end
+metal_league_code = find_league!( league_code )
 
 
-season            = Season( args[1] ||  
-                             (league_code == 'EC' ? '2024' : '2024/25'))
+season            = Season( args[1] ||
+                             (['euro',
+                               'copa.l',
+                               'br.1'].include?(league_code) ? '2024' : '2024/25'))
 
 season_start_year  = season.start_year   ## use year - why? why not?
 
-pp league_code, season_start_year
+pp [metal_league_code, season_start_year]
 
 if opts[:cached]
     ## do nothing
 else
     ## download dataset(s)
     ## try download
-    Metal.matches( league_code, 
-                   season_start_year )
-end    
+    ##   note:  include teams (for convert) for now too!!
+    Metal.teams( metal_league_code, season_start_year )
+    Metal.matches( metal_league_code, season_start_year )
+end
 
-url = Metal.competition_matches_url( league_code, 
+url = Metal.competition_matches_url( metal_league_code,
                                       season_start_year )
 pp url
 #=> "http://api.football-data.org/v4/competitions/EC/matches?season=2024"
@@ -188,6 +203,13 @@ data = Webcache.read_json( url )
 
 pp_matches( data )
 
+
+if opts[:convert]
+  puts "==> converting to .csv"
+  convert( league: league_code, season: season )
+end
+
+
 end  # def self.main
 end  # module Footballdata
 

data/config/leagues.csv

@@ -0,0 +1,54 @@
+key, code
+
+eng.1,    PL          # incl. team(s) from wales
+eng.2,    ELC
+     # PL  - Premier League, England        27 seasons | 2019-08-09 - 2020-07-25 / matchday 31
+     #  ELC - Championship,  England         3 seasons | 2019-08-02 - 2020-07-22 / matchday 38
+     #
+     # 2019 => 2019/20
+     # 2018 => 2018/19
+     # 2017 => xxx 2017-18 - requires subscription !!!
+
+es.1,    PD
+    # PD  - Primera Division, Spain          27 seasons | 2019-08-16 - 2020-07-19 / matchday 31
+
+pt.1,     PPL
+    # PPL - Primeira Liga, Portugal        9 seasons | 2019-08-10 - 2020-07-26 / matchday 28
+
+de.1,     BL1
+    # BL1 - Bundesliga, Germany        24 seasons | 2019-08-16 - 2020-06-27 / matchday 34
+
+nl.1,     DED
+    # DED - Eredivisie, Netherlands    10 seasons | 2019-08-09 - 2020-03-08 / matchday 34
+
+fr.1,     FL1        # incl. team(s) monaco
+    # FL1 - Ligue 1, France
+    #   9 seasons | 2019-08-09 - 2020-05-31 / matchday 38
+    #
+    # 2019 => 2019/20
+    # 2018 => 2018/19
+    # 2017 => xxx 2017-18 - requires subscription !!!
+
+it.1,      SA
+    # SA  - Serie A, Italy          15 seasons | 2019-08-24 - 2020-08-02 / matchday 27
+
+br.1,       BSA
+    # BSA - Série A, Brazil
+    #   4 seasons | 2020-05-03 - 2020-12-06 / matchday 10
+    #
+    #  2020 => 2020
+    #  2019 => 2019
+    #  2018 => 2018
+    #  2017 => xxx 2017 - requires subscription !!!
+
+uefa.cl,    CL        ## note: cl is country code for chile!! - use champs - why? why not?
+    ##  was europe.cl / cl
+    ## todo/check: use champs and NOT cl - why? why not?
+
+copa.l,     CLI
+   ## Copa Libertadores
+
+############
+## national teams
+euro,       EC
+world,      WC

data/config/timezones.csv

@@ -0,0 +1,27 @@
+key,    zone
+eng,    Europe/London
+es,     Europe/Madrid
+de,     Europe/Berlin
+fr,     Europe/Paris
+it,     Europe/Rome
+
+nl,     Europe/Amsterdam
+pt,     Europe/Lisbon
+
+## for champs default for not to cet (central european time) - why? why not?
+uefa.cl,  Europe/Paris
+euro,     Europe/Paris
+
+## todo/fix - pt.1
+##  one team in madeira!!! check for different timezone??
+##  CD Nacional da Madeira
+
+br,  America/Sao_Paulo
+    ## todo/fix - brazil has 4 timezones
+    ##           really only two in use for clubs
+    ##             west and east (amazonas et al)
+    ##           for now use west for all - why? why not?
+copa.l,  America/Sao_Paulo
+
+
+##  world+2022,    add quatar here