footballdata-api 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0fe438df785fdc33e14a57346b2ec720029a97e34ae4a5eaeddf4e7fa4d8cda
-  data.tar.gz: e4eaf71567d20a666525139d94dbe4323fb2c8773e245b67454281e6740a9cb4
+  metadata.gz: b3350fb47d596e6d5b2e4d73582b2615020d56db38cf86d9545a10b1760494c1
+  data.tar.gz: d7ba6c51f3e12beed59df7b851e8d533a838de67e73c5b1d025ab7a1256caa7d
 SHA512:
-  metadata.gz: 4081619b75253f9ad57b77ef6232e262b37af91a6e154e3832274520d7363a150a38ddf5a6596d12c5e28646419e530c569a902a74b807f78c987de02104e92f
-  data.tar.gz: 2639c457fea6f4c4a7cae24196f8133e72ccfa80c433963726b17b498f7e2fcb34dfbe7ae64afb78c76ebc5ff120905cc2f71b3ceec05deb5a535140b6761faa
+  metadata.gz: 2943bcf6f2da49dfc1cab26da0933957d2bde2fb13749c7ce4d4896214484bac3edcea197e01ed9b2b63f92e2e74f560ac49189f63be7644522b7b24b7cbed73
+  data.tar.gz: 945cc2d0cb9346434c6f3875c33dd153867318b73e067c5574bc6e789f7b3b293d5c7f126c80221c676998eaa0e532647b7a25b960d082097209b6a1428f879e

data/CHANGELOG.md

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

data/Manifest.txt

@@ -3,6 +3,8 @@ Manifest.txt
 README.md
 Rakefile
 bin/fbdat
+config/leagues.csv
+config/timezones.csv
 lib/footballdata.rb
 lib/footballdata/convert.rb
 lib/footballdata/download.rb
@@ -11,4 +13,5 @@ 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/bin/fbdat

@@ -166,19 +166,12 @@ end
 ## note - only use "generic" uniform league codes for now!!
 
 league_code       = (args[0] || 'eng.1').downcase
-metal_league_code  = nil  ##  todo - find a better name
-                          ##  use internal_league_code or such - why? why not?
 
+##  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 )
-  metal_league_code = LEAGUES[ league_code ]
-else
-  puts "!! ERROR - no code/mapping found for league >#{league_code}<"
-  puts "     mappings include:"
-  pp LEAGUES
-  exit 1
-end
+metal_league_code = find_league!( league_code )
 
 
 season            = Season( args[1] ||

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

data/lib/footballdata/convert.rb

@@ -1,41 +1,7 @@
 
-
-
 module Footballdata
 
 
-  TIMEZONES = {
-    'eng.1' => 'Europe/London',
-    'eng.2' => 'Europe/London',
-
-    'es.1'  => 'Europe/Madrid',
-
-    'de.1'  => 'Europe/Berlin',
-    'fr.1'  => 'Europe/Paris',
-    'it.1'  => 'Europe/Rome',
-    'nl.1'  => 'Europe/Amsterdam',
-
-    'pt.1'  => '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.1'  => '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',
-  }
-
-
-
-
 def self.convert_score( score )
   ## duration: REGULAR  · PENALTY_SHOOTOUT  · EXTRA_TIME
   ft, ht, et, pen = ["","","",""]
@@ -123,7 +89,7 @@ def self.convert( league:, season: )
 
   season = Season( season )   ## cast (ensure) season class (NOT string, integer, etc.)
 
-  league_code = LEAGUES[league.downcase]
+  league_code = find_league!( league )
 
   matches_url = Metal.competition_matches_url( league_code, season.start_year )
   teams_url   = Metal.competition_teams_url(   league_code, season.start_year )
@@ -132,14 +98,10 @@ def self.convert( league:, season: )
   data_teams     = Webcache.read_json( teams_url )
 
 
-  ## check for time zone
-  tz_name = TIMEZONES[ league.downcase ]
-  if tz_name.nil?
-    puts "!! ERROR - sorry no timezone configured for league #{league}"
-    exit 1
-  end
 
-  tz  = TZInfo::Timezone.get( tz_name )
+  ## check for time zone
+  tz  = find_zone!( league: league,
+                    season: season )
   pp tz
 
   ## build a (reverse) team lookup by name
@@ -285,10 +247,23 @@ matches.each do |m|
     ## utc   = ## tz_utc.strptime( m['utcDate'], '%Y-%m-%dT%H:%M:%SZ' )
     ##  note:  DateTime.strptime  is supposed to be unaware of timezones!!!
     ##            use to parse utc
-    utc = DateTime.strptime( m['utcDate'], '%Y-%m-%dT%H:%M:%SZ' ).to_time.utc
+    utc = UTC.strptime( m['utcDate'], '%Y-%m-%dT%H:%M:%SZ' )
     assert( utc.strftime( '%Y-%m-%dT%H:%M:%SZ' ) == m['utcDate'], 'utc time mismatch' )
 
-    local = tz.to_local( utc )
+
+    ## assume NOT valid utc time if 00:00
+    ##   do
+    if utc.hour == 0 && utc.min == 0 &&
+       ['SCHEDULED','POSTPONED'].include?( m['status'] )
+       date     = utc.strftime( '%Y-%m-%d' )
+       time     = ''
+       timezone = ''
+    else
+      local    = tz.to_local( utc )
+      date     = local.strftime( '%Y-%m-%d' )
+      time     = local.strftime( '%H:%M' )
+      timezone = local.strftime( '%Z/%z' )
+    end
 
 
     ## do NOT add time if status is SCHEDULED
@@ -301,9 +276,9 @@ matches.each do |m|
     recs << [stage,
              group,
              matchday,
-             local.strftime( '%Y-%m-%d' ),
-             ['SCHEDULED','POSTPONED'].include?( m['status'] ) ? '' : local.strftime( '%H:%M' ),
-             local.strftime( '%Z / UTC%z' ),
+             date,
+             time,
+             timezone,
              team1,
              ft,
              ht,

data/lib/footballdata/download.rb

@@ -6,7 +6,7 @@ module Footballdata
 def self.schedule( league:, season: )
   season = Season( season )   ## cast (ensure) season class (NOT string, integer, etc.)
 
-  league_code = LEAGUES[ league.downcase ]
+  league_code = find_league!( league )
   puts "  mapping league >#{league}< to >#{league_code}<"
 
   Metal.teams(   league_code, season.start_year )
@@ -17,7 +17,7 @@ end
 def self.matches( league:, season: )
   season = Season( season )   ## cast (ensure) season class (NOT string, integer, etc.)
 
-  league_code = LEAGUES[ league.downcase ]
+  league_code = find_league!( league )
   puts "  mapping league >#{league}< to >#{league_code}<"
   Metal.matches( league_code, season.start_year )
 end
@@ -26,7 +26,7 @@ end
 def self.teams( league:, season: )
   season = Season( season )   ## cast (ensure) season class (NOT string, integer, etc.)
 
-  league_code = LEAGUES[ league.downcase ]
+  league_code = find_league!( league )
   puts "  mapping league >#{league}< to >#{league_code}<"
   Metal.teams(   league_code, season.start_year )
 end
@@ -38,7 +38,7 @@ end
 
 class Metal
 
-  def self.get( url, 
+  def self.get( url,
                   auth:    true,
                   headers: {} )
 
@@ -84,19 +84,19 @@ class Metal
   def self.competition_teams_url( code, year )     "#{BASE_URL}/competitions/#{code}/teams?season=#{year}";     end
   def self.competition_standings_url( code, year ) "#{BASE_URL}/competitions/#{code}/standings?season=#{year}"; end
   def self.competition_scorers_url( code, year )   "#{BASE_URL}/competitions/#{code}/scorers?season=#{year}"; end
-    
+
   def self.matches( code, year,
-                    headers: {} )  
-      get( competition_matches_url( code, year ), 
-           headers: headers ) 
+                    headers: {} )
+      get( competition_matches_url( code, year ),
+           headers: headers )
   end
 
-  def self.todays_matches_url( date=Date.today )   
+  def self.todays_matches_url( date=Date.today )
     "#{BASE_URL}/matches?"+
     "dateFrom=#{date.strftime('%Y-%m-%d')}&"+
-    "dateTo=#{(date+1).strftime('%Y-%m-%d')}"   
+    "dateTo=#{(date+1).strftime('%Y-%m-%d')}"
   end
-  def self.todays_matches( date=Date.today )    ## use/rename to matches_today or such - why? why not? 
+  def self.todays_matches( date=Date.today )    ## use/rename to matches_today or such - why? why not?
       get( todays_matches_url( date ) )
   end
 

data/lib/footballdata/leagues.rb

@@ -1,59 +1,24 @@
 module Footballdata
 
-  LEAGUES = {
-    '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 !!!
-
-    ## todo/check: use champs and NOT cl - why? why not?
-    'uefa.cl'        => 'CL',    ## note: cl is country code for chile!! - use champs - why? why not?
-    ##  was europe.cl / cl  
-    
-    ## Copa Libertadores
-    'copa.l'  => 'CLI',
- 
-    ############
-    ## national teams
-    'euro'  => 'EC',
-    'world' => 'WC',
-
-  }
+  def self.find_league!( league )
+     @leagues ||= begin
+                     recs = read_csv( "#{FootballdataApi.root}/config/leagues.csv" )
+                     leagues = {}
+                     recs.each do |rec|
+                        leagues[ rec['key'] ] = rec['code']
+                     end
+                     leagues
+                  end
+
+     key = league.downcase
+     code =  @leagues[ key ]
+     if code.nil?
+        puts "!! ERROR - no code/mapping found for league >#{league}<"
+        puts "     mappings include:"
+        pp @leagues
+        exit 1
+     end
+     code
+  end
 end   #  module Footballdata
 

data/lib/footballdata/teams.rb

@@ -8,9 +8,9 @@ module Footballdata
 def self.export_teams( league:, season: )
 
     season      = Season( season )   ## cast (ensure) season class (NOT string, integer, etc.)
-    league_code = LEAGUES[league.downcase]
+    league_code = find_league!( league )
 
-    teams_url = Metal.competition_teams_url( league_code, 
+    teams_url = Metal.competition_teams_url( league_code,
                                              season.start_year )
     data_teams = Webcache.read_json( teams_url )
 
@@ -22,12 +22,12 @@ def self.export_teams( league:, season: )
     clubs = {}   ## by country
 
     data_teams['teams'].each do |rec|
-    
-        buf = String.new  ### use for string buffer (or String.new('') - why? why not?      
+
+        buf = String.new  ### use for string buffer (or String.new('') - why? why not?
         buf << "#{rec['name']}"
         buf << ", #{rec['founded']}"  if rec['founded']
-        if rec['venue'] 
-          buf << ", @ #{rec['venue']}"   
+        if rec['venue']
+          buf << ", @ #{rec['venue']}"
           # buf << "  # #{rec['area']['name']}"
         end
         buf << "\n"
@@ -39,7 +39,7 @@ def self.export_teams( league:, season: )
 
         alt_names << " | #{rec['tla']}"        if rec['tla'] &&
                                                   rec['tla'] != rec['name']
-        
+
         if alt_names.size > 0
           buf << " "
           buf << alt_names
@@ -48,7 +48,7 @@ def self.export_teams( league:, season: )
 
         ## clean null in address (or keep nulls) - why? why not?
         ##  e.g. null Rionegro null
-        ##       Calle 104 No. 13a - 32 Bogotá null 
+        ##       Calle 104 No. 13a - 32 Bogotá null
 
         buf << "  address: #{rec['address'].gsub( /\bnull\b/, '')}"
         buf << "\n"
@@ -57,21 +57,21 @@ def self.export_teams( league:, season: )
         buf << "  colors:  #{rec['clubColors']}"
         buf << "\n"
 
-        country = rec['area']['name'] 
+        country = rec['area']['name']
         ary = clubs[ country] ||= []
         ary << buf
     end
     # puts buf
-   
+
     ## pp clubs
 
-  
+
     buf = String.new
 
     if clubs.size > 1
       clubs.each do |country, ary|
         buf << "#  #{country} - #{ary.size} clubs\n"
-      end  
+      end
       buf << "\n"
     end
 
@@ -82,9 +82,8 @@ def self.export_teams( league:, season: )
     end
 
     path = "#{config.convert.out_dir}/#{season.to_path}/#{league.downcase}.clubs.txt"
-    write_text( path, buf )                            
+    write_text( path, buf )
 end
 
 
 end  # module Footballdata
- 

data/lib/footballdata/timezones.rb

@@ -0,0 +1,97 @@
+
+class UTC
+  def self.now()  Time.now.utc; end
+  def self.today() now.to_date; end
+
+  ## -- todo - make sure / assert it's always utc - how???
+  ## utc   = ## tz_utc.strptime( m['utcDate'], '%Y-%m-%dT%H:%M:%SZ' )
+  ##  note:  DateTime.strptime  is supposed to be unaware of timezones!!!
+  ##            use to parse utc
+  ## quick hack -
+  ##     use to_time.getutc instead of utc ???
+  def self.strptime( str, format )
+      DateTime.strptime( str, format ).to_time.utc
+  end
+
+  def self.find_zone( name )
+     zone = TZInfo::Timezone.get( name )
+     ## wrap tzinfo timezone in our own - for adding more (auto)checks etc.
+     zone ? Timezone.new( zone ) : nil
+  end
+
+class Timezone   ## nested inside UTC
+   ## todo/fix
+   ##  cache timezone - why? why not?
+   def initialize( zone )
+     @zone = zone
+   end
+
+   def to_local( time )
+      ## assert time is Time (not Date or DateTIme)
+      ##  and assert utc!!!
+      assert( time.is_a?( Time ),  "time #{time} is NOT of class Time; got #{time.class.name}" )
+      assert( time.utc?,           "time #{time} is NOT utc; utc? returns #{time.utc?}" )
+      local = @zone.to_local( time )
+      local
+   end
+
+   def assert( cond, msg )
+    if cond
+      # do nothing
+    else
+      puts "!!! assert failed - #{msg}"
+      exit 1
+    end
+  end
+end  # class Timezone
+end   # class UTC
+
+
+
+module Footballdata
+def self.find_zone!( league:, season: )
+   @zones ||= begin
+                recs = read_csv( "#{FootballdataApi.root}/config/timezones.csv" )
+                zones = {}
+                recs.each do |rec|
+                    zone = UTC.find_zone( rec['zone'] )
+                    if zone.nil?
+                      ## raise ArgumentError - invalid zone
+                      puts "!! ERROR - cannot find timezone in timezone db:"
+                      pp rec
+                      exit 1
+                    end
+                    zones[ rec['key']] = zone
+                end
+                zones
+              end
+
+
+   ## lookup first try by league+season
+   league_code = league.downcase
+   season      = Season( season )
+
+   ##  e.g. world+2022, etc.
+   key = "#{league_code}+#{season}"
+   zone = @zones[key]
+
+   ## try league e.g. eng.1 etc.
+   zone = @zones[league_code]  if zone.nil?
+
+   ## try first code only (country code )
+   if zone.nil?
+     code, _  = league_code.split( '.', 2 )
+     zone = @zones[code]
+   end
+
+   if zone.nil?  ## still not found; report error
+      puts "!! ERROR: no timezone found for #{league} #{season}"
+      exit 1
+   end
+
+   zone
+end
+end # module Footballdata
+
+
+

data/lib/footballdata/version.rb

@@ -2,7 +2,7 @@
 module FootballdataApi
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 3
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/footballdata.rb

@@ -36,6 +36,8 @@ end   # module Footballdata
 # our own code
 require_relative 'footballdata/version'
 require_relative 'footballdata/leagues'
+require_relative 'footballdata/timezones'
+
 require_relative 'footballdata/download'
 require_relative 'footballdata/prettyprint'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: footballdata-api
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-08 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -116,6 +116,8 @@ files:
 - README.md
 - Rakefile
 - bin/fbdat
+- config/leagues.csv
+- config/timezones.csv
 - lib/footballdata.rb
 - lib/footballdata/convert.rb
 - lib/footballdata/download.rb
@@ -124,6 +126,7 @@ files:
 - lib/footballdata/prettyprint.rb
 - lib/footballdata/stat.rb
 - lib/footballdata/teams.rb
+- lib/footballdata/timezones.rb
 - lib/footballdata/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses: