footballdata-api 0.2.0 → 0.3.1

data/lib/footballdata/prettyprint.rb

@@ -17,7 +17,7 @@ def self.fmt_competition( rec )
    buf << "#{rec['competition']['name']} (#{rec['competition']['code']}) -- "
    buf << "#{rec['area']['name']} (#{rec['area']['code']}) "
    buf << "#{rec['competition']['type']} "
-   buf << "#{rec['season']['startDate']} - #{rec['season']['endDate']} "  
+   buf << "#{rec['season']['startDate']} - #{rec['season']['endDate']} "
    buf << "@ #{rec['season']['currentMatchday']}"
    buf << "\n"
 
@@ -26,12 +26,12 @@ end
 
 def self.fmt_match( rec )
    buf = String.new
- 
+
     ## -- 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
-    utc = DateTime.strptime( rec['utcDate'], '%Y-%m-%dT%H:%M:%SZ' ).to_time.utc 
+    utc = DateTime.strptime( rec['utcDate'], '%Y-%m-%dT%H:%M:%SZ' ).to_time.utc
     assert( utc.strftime( '%Y-%m-%dT%H:%M:%SZ' ) == rec['utcDate'], 'utc time mismatch' )
 
     status = rec['status']
@@ -50,7 +50,7 @@ def self.fmt_match( rec )
      team1 = rec['homeTeam']['name'] ?
                   "#{rec['homeTeam']['name']} (#{rec['homeTeam']['tla']})" : '?'
      team2 = rec['awayTeam']['name'] ?
-                  "#{rec['awayTeam']['name']} (#{rec['awayTeam']['tla']})" : '?'     
+                  "#{rec['awayTeam']['name']} (#{rec['awayTeam']['tla']})" : '?'
      buf << '%22s' % team1
      buf << " - "
      buf << '%-22s' % team2
@@ -58,7 +58,7 @@ def self.fmt_match( rec )
 
      stage = rec['stage']
      group = rec['group']
-     
+
      buf << "#{rec['matchday']} - #{stage} "
      buf << "/ #{group}  "  if group
      buf << "\n"
@@ -66,49 +66,31 @@ def self.fmt_match( rec )
      buf << "  "
      buf << '%-20s' % rec['score']['duration']
      buf << ' '*24
-     
+
      duration = rec['score']['duration']
      assert( %w[REGULAR
                 EXTRA_TIME
                 PENALTY_SHOOTOUT
                ].include?( duration ), "unknown duration - #{duration}" )
 
-     score = String.new 
-
-     if duration == 'PENALTY_SHOOTOUT'
-        if rec['score']['extraTime'] 
-          ## quick & dirty hack - calc et via regulartime+extratime 
-          score << "#{rec['score']['penalties']['home']}-#{rec['score']['penalties']['away']} pen. "
-          score << "#{rec['score']['regularTime']['home']+rec['score']['extraTime']['home']}"
-          score << "-"
-          score << "#{rec['score']['regularTime']['away']+rec['score']['extraTime']['away']}"
-          score << " a.e.t. "
-          score << "(#{rec['score']['regularTime']['home']}-#{rec['score']['regularTime']['away']},"
-          score << "#{rec['score']['halfTime']['home']}-#{rec['score']['halfTime']['away']})"
-        else  ### south american-style (no extra time)
-            ## quick & dirty hacke - calc ft via fullTime-penalties
-            score << "#{rec['score']['penalties']['home']}-#{rec['score']['penalties']['away']} pen. "
-            score << "(#{rec['score']['fullTime']['home']-rec['score']['penalties']['home']}"
-            score << "-"
-            score << "#{rec['score']['fullTime']['away']-rec['score']['penalties']['away']},"
-            score << "#{rec['score']['halfTime']['home']}-#{rec['score']['halfTime']['away']})"  
-        end
-     elsif  duration == 'EXTRA_TIME'
-          score << "#{rec['score']['regularTime']['home']+rec['score']['extraTime']['home']}"
-          score << "-"
-          score << "#{rec['score']['regularTime']['away']+rec['score']['extraTime']['away']}"
-          score << " a.e.t. "
-          score << "(#{rec['score']['regularTime']['home']}-#{rec['score']['regularTime']['away']},"
-          score << "#{rec['score']['halfTime']['home']}-#{rec['score']['halfTime']['away']})"          
-     elsif  duration == 'REGULAR'
-          if rec['score']['fullTime']['home'] && rec['score']['fullTime']['away']
-            score << "#{rec['score']['fullTime']['home']}-#{rec['score']['fullTime']['away']} "
-            score << "(#{rec['score']['halfTime']['home']}-#{rec['score']['halfTime']['away']})"
-          end          
+
+     ft, ht, et, pen = convert_score( rec['score'] )
+     score = String.new
+     if !pen.empty?
+       if et.empty? ### south american-style (no extra time)
+         score << "#{pen} pen. "
+         score << "(#{ft}, #{ht})"
+       else
+         score << "#{pen} pen. "
+         score << "#{et} a.e.t. "
+         score << "(#{ft}, #{ht})"
+      end
+     elsif !et.empty?
+       score << "#{et} a.e.t. "
+       score << "(#{ft}, #{ht})"
      else
-        raise ArgumentError, "unexpected/unknown score duration #{rec['score']['duration']}"
+       score << "#{ft} (#{ht})"
      end
- 
 
      buf << score
      buf << "\n"
@@ -118,14 +100,14 @@ end
 
 def self.pp_matches( data )
 
-  ## track match status and score duration  
+  ## track match status and score duration
   stats = { 'status'    => Hash.new(0),
             'duration'  => Hash.new(0),
             'stage'     => Hash.new(0),
             'group'     => Hash.new(0),
            }
 
-  first = Date.strptime( data['resultSet']['first'], '%Y-%m-%d' ) 
+  first = Date.strptime( data['resultSet']['first'], '%Y-%m-%d' )
   last  = Date.strptime( data['resultSet']['last'], '%Y-%m-%d' )
 
   diff = (last - first).to_i  # note - returns rational number (e.g. 30/1)
@@ -142,16 +124,16 @@ def self.pp_matches( data )
 
     ## track stats
     status = rec['status']
-    stats['status'][status] += 1 
+    stats['status'][status] += 1
 
     stage = rec['stage']
-    stats['stage'][stage] += 1  
+    stats['stage'][stage] += 1
 
      group = rec['group']
-     stats['group'][group] += 1  if group 
+     stats['group'][group] += 1  if group
 
      duration = rec['score']['duration']
-     stats['duration'][duration] += 1       
+     stats['duration'][duration] += 1
   end
 
   print "   #{data['resultSet']['played']}/#{data['resultSet']['count']} matches"
@@ -182,7 +164,7 @@ def self.fmt_count( h, sort: false )
                             end
     end
     pairs = pairs.map { |name,count| "#{name} (#{count})" }
-    pairs.join( ' · ' )                                                                 
+    pairs.join( ' · ' )
 end
 
 

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

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

data/lib/footballdata.rb

@@ -17,7 +17,7 @@ module Footballdata
         def out_dir()       @out_dir || './o'; end
         def out_dir=(value) @out_dir = value; end
      end
- 
+
     def convert()  @convert ||= Convert.new; end
   end # class Configuration
 
@@ -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'
 
@@ -44,13 +46,6 @@ require_relative 'footballdata/convert'
 require_relative 'footballdata/teams'
 
 
-require_relative 'footballdata/generator'
-
-
-
-### for processing tool
-##   (auto-)add sportdb/writer  (pulls in sportdb/catalogs and gitti)
-##  require 'sportdb/writers'
 
 
 puts FootballdataApi.banner  ## say hello

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: footballdata-api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-07 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -116,15 +116,17 @@ files:
 - 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
 homepage: https://github.com/sportdb/sport.db
 licenses:
@@ -140,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/footballdata/generator.rb

@@ -1,33 +0,0 @@
-
-##
-### check - change Generator to Writer 
-##                   and write( league:, season: ) - why? why not?
-
-module Footballdata
-class Generator
-
-
-
-###########    
-## always download for now - why? why not?
-##      support cache - why? why not?
-def generate( league:, season: )
-
-  ## for testing use cached version always - why? why not?    
-  ## step 1 - download
-  Footballdata.schedule( league: league, season: season )
-
-  ## step 2 - convert (to .csv)
-
-  ## todo/fix - convert in-memory and return matches
-  Footballdata.convert( league: league, season: season )
-
-  source_dir = Footballdata.config.convert.out_dir
-
-  Writer.write( league: league, 
-                season: season,
-                source: source_dir )
-end  # def generate
-
-end # class Generator
-end # module Footballdata