fifadat 0.0.1 → 2026.9.23

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fifadat
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 2026.9.23
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-22 00:00:00.000000000 Z
+date: 2026-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos
@@ -88,8 +88,7 @@ dependencies:
         version: '4.2'
 description: fifadat - get football data via the (unofficial) fifa api
 email: gerald.bauer@gmail.com
-executables:
-- fifadat
+executables: []
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -100,93 +99,70 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- bin/fifadat
+- config/codes_club-europe.csv
+- config/codes_club.csv
+- config/codes_nati.csv
+- config/seasons/ar.csv
+- config/seasons/at.csv
+- config/seasons/at.cup.csv
+- config/seasons/au.csv
+- config/seasons/be.csv
+- config/seasons/br.csv
+- config/seasons/ch.csv
+- config/seasons/clubworldcup.csv
+- config/seasons/cn.csv
+- config/seasons/co.csv
+- config/seasons/copa.l.csv
+- config/seasons/copa.s.csv
+- config/seasons/cz.csv
+- config/seasons/de.2.csv
+- config/seasons/de.csv
+- config/seasons/de.cup.csv
+- config/seasons/eg.csv
+- config/seasons/eng.2.csv
+- config/seasons/eng.csv
+- config/seasons/eng.facup.csv
+- config/seasons/es.csv
+- config/seasons/fr.csv
+- config/seasons/gr.csv
+- config/seasons/hu.csv
+- config/seasons/ie.csv
+- config/seasons/il.csv
+- config/seasons/interconticup.csv
+- config/seasons/is.csv
+- config/seasons/it.csv
+- config/seasons/it.cup.csv
+- config/seasons/jp.csv
+- config/seasons/kr.csv
+- config/seasons/lu.csv
+- config/seasons/ma.csv
+- config/seasons/mls.csv
+- config/seasons/mx.2.csv
+- config/seasons/mx.csv
+- config/seasons/mx.cup.csv
+- config/seasons/nir.csv
+- config/seasons/nl.csv
+- config/seasons/no.csv
+- config/seasons/pl.csv
+- config/seasons/pt.csv
+- config/seasons/sa.csv
+- config/seasons/sco.csv
+- config/seasons/se.csv
+- config/seasons/tn.csv
+- config/seasons/tr.csv
+- config/seasons/uefa.cl.csv
+- config/seasons/uefa.con.csv
+- config/seasons/uefa.europa.csv
+- config/seasons/uy.csv
+- config/seasons/wal.csv
+- config/seasons/worldcup.csv
+- config/seasons/za.csv
 - lib/fifadat.rb
-- lib/fifadat/api-config.rb
 - lib/fifadat/api.rb
-- lib/fifadat/config/codes_club-europe.csv
-- lib/fifadat/config/codes_club.csv
-- lib/fifadat/config/codes_nati.csv
-- lib/fifadat/config/seasons/ar.csv
-- lib/fifadat/config/seasons/at.csv
-- lib/fifadat/config/seasons/at.cup.csv
-- lib/fifadat/config/seasons/au.csv
-- lib/fifadat/config/seasons/be.csv
-- lib/fifadat/config/seasons/br.csv
-- lib/fifadat/config/seasons/ch.csv
-- lib/fifadat/config/seasons/clubworldcup.csv
-- lib/fifadat/config/seasons/cn.csv
-- lib/fifadat/config/seasons/co.csv
-- lib/fifadat/config/seasons/copa.l.csv
-- lib/fifadat/config/seasons/copa.s.csv
-- lib/fifadat/config/seasons/cz.csv
-- lib/fifadat/config/seasons/de.2.csv
-- lib/fifadat/config/seasons/de.csv
-- lib/fifadat/config/seasons/de.cup.csv
-- lib/fifadat/config/seasons/eg.csv
-- lib/fifadat/config/seasons/eng.2.csv
-- lib/fifadat/config/seasons/eng.csv
-- lib/fifadat/config/seasons/eng.facup.csv
-- lib/fifadat/config/seasons/es.csv
-- lib/fifadat/config/seasons/fr.csv
-- lib/fifadat/config/seasons/gr.csv
-- lib/fifadat/config/seasons/hu.csv
-- lib/fifadat/config/seasons/ie.csv
-- lib/fifadat/config/seasons/il.csv
-- lib/fifadat/config/seasons/interconticup.csv
-- lib/fifadat/config/seasons/is.csv
-- lib/fifadat/config/seasons/it.csv
-- lib/fifadat/config/seasons/it.cup.csv
-- lib/fifadat/config/seasons/jp.csv
-- lib/fifadat/config/seasons/kr.csv
-- lib/fifadat/config/seasons/lu.csv
-- lib/fifadat/config/seasons/ma.csv
-- lib/fifadat/config/seasons/mls.csv
-- lib/fifadat/config/seasons/mx.2.csv
-- lib/fifadat/config/seasons/mx.csv
-- lib/fifadat/config/seasons/mx.cup.csv
-- lib/fifadat/config/seasons/nir.csv
-- lib/fifadat/config/seasons/nl.csv
-- lib/fifadat/config/seasons/no.csv
-- lib/fifadat/config/seasons/pl.csv
-- lib/fifadat/config/seasons/pt.csv
-- lib/fifadat/config/seasons/sa.csv
-- lib/fifadat/config/seasons/sco.csv
-- lib/fifadat/config/seasons/se.csv
-- lib/fifadat/config/seasons/tn.csv
-- lib/fifadat/config/seasons/tr.csv
-- lib/fifadat/config/seasons/uefa.cl.csv
-- lib/fifadat/config/seasons/uefa.con.csv
-- lib/fifadat/config/seasons/uefa.europa.csv
-- lib/fifadat/config/seasons/uy.csv
-- lib/fifadat/config/seasons/wal.csv
-- lib/fifadat/config/seasons/worldcup.csv
-- lib/fifadat/config/seasons/za.csv
-- lib/fifadat/errata.rb
-- lib/fifadat/helper.rb
+- lib/fifadat/config.rb
 - lib/fifadat/json.rb
-- lib/fifadat/pp/build_match.rb
-- lib/fifadat/pp/build_report.rb
-- lib/fifadat/pp/convert-reports.rb
-- lib/fifadat/pp/convert.rb
-- lib/fifadat/pp/goals-calc_score.rb
-- lib/fifadat/pp/goals.rb
-- lib/fifadat/pp/helper-date.rb
-- lib/fifadat/pp/helper-minute.rb
-- lib/fifadat/pp/helper-score.rb
-- lib/fifadat/pp/norm.rb
-- lib/fifadat/pp/officials.rb
-- lib/fifadat/pp/penalties.rb
-- lib/fifadat/pp/players.rb
-- lib/fifadat/pp/stadiums.rb
-- lib/fifadat/pp/stages.rb
-- lib/fifadat/pp/substitutions.rb
-- lib/fifadat/pp/teams.rb
-- lib/fifadat/ppdebug.rb
-- lib/fifadat/ppmatch.rb
 - lib/fifadat/prepare.rb
-- lib/fifadat/tool.rb
-- lib/fifadat/types.rb
+- lib/fifadat/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain

data/bin/fifadat

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-## tip: to test run:
-##   ruby -I ./lib bin/fifadat
-
-
-##
-## note - always use latest (local) if present
-$LOAD_PATH.unshift( '/sports/yorobot/sport.db.more/fifadat/lib' )
-
-require 'fifadat'
-
-
-Fifadat.main( ARGV )

data/lib/fifadat/errata.rb

@@ -1,59 +0,0 @@
-###
-#  known data gotchas/errors
-
-
-##
-#  worldcup 2026 - USA v Belgium
-#  -- goal  (period, minute)
-
-=begin
-in USA v Belgium
-"Type"=>2,
- "IdPlayer"=>"448362",
- "Minute"=>"1'",
- "IdAssistPlayer"=>nil,
- "Period"=>2,
- "IdGoal"=>nil,
- "IdTeam"=>"43935"}
-
-{     "Type": 2,
-      "IdPlayer": "448362",
-      "Minute": "0'",
-      "IdAssistPlayer": null,
-      "Period": 2,
-      "IdGoal": null,
-      "IdTeam": "43935"},
-
-=end
-
-
-def errata_autofix_goal( h )
-   if h['Type']     ==  2 &&
-      h['IdPlayer'] == '448362' &&         ##
-      h['IdTeam']   == '43935'             ## Belgium
-         h['Type']    = 3    ## 1ST_HALF
-         h['Minute']  = "9'"
-
-         puts "-- ERRATA - autofix goal  USA v Belgium / Worldcup"
-   end
-
-   h
-end
-
-
-##
-#  clubworldcup
-#  -- score (ResultType)
-
-
-def errata_autofix_score( m )
-   ##  pachuca vs salzburg in cwc 2025??
-   if m['IdMatch'] == '400019191'  &&        ##  fix for pachuca vs salzburg
-      m['ResultType'] == 0
-            m['ResultType'] == 1   ## regular   (or use 4-REG/AGG - why? why not?)
-
-            puts "-- ERRATA - autofix score    pachuca vs salzburg / Club Worldcup"
-    end
-
-    m
-end

data/lib/fifadat/helper.rb

@@ -1,46 +0,0 @@
-
-
-def assert( test, msg )
-    if test
-    else
-        puts "!! ASSERT FAILED - #{msg}"
-        exit 1
-    end
-end
-
-### fix - change/rename to datetime!!!
-def parse_date( date_str )
-    date = DateTime.strptime( date_str, '%Y-%m-%dT%H:%M:%S%z' )
-
-    assert( date_str == date.strftime('%Y-%m-%dT%H:%M:%SZ'),
-              "date parse expected #{date_str} - got #{date.inspect}" )
-    date
-end
-
-
-def parse_date_utc( str )
-    date = DateTime.strptime( str, '%Y-%m-%dT%H:%M:%S%z' )
-
-    ## note: check for seconds is 00
-    ##    AND   timezone  is Z (zulu)  (shortkey for utc!)
-    ##  e.g. hard code   ":00Z" in strftime!!!
-
-    str_exp = date.strftime('%Y-%m-%dT%H:%M:00Z')
-    assert( str == str_exp,
-              "date parse expected #{str_exp} - got #{str} #{date.inspect}" )
-    date
-end
-
-
-
-
-def desc( data )   ## get description
-    return nil if data.nil? || (data.is_a?(Array) && data.empty?)
-
-    row = data[0]   ## assume first entry is en-GB
-    locale = row['Locale']
-    assert( locale == 'en-GB' || locale == 'en-gb',
-              "locale en-GB expected in data[0] - got #{data}")
-
-    row['Description']
-end

data/lib/fifadat/pp/build_match.rb

@@ -1,105 +0,0 @@
-
-
-
-def _build_match( m )   ## use _fill/build_match_basics() or such ???
-    rec = {}
-
-    ## 0 =>   FINISHED/complete (OK)
-       ## 1 =>   SCHEDULED/not yet played
-       status = m['MatchStatus']
-       timed  = m['TimeDefined']
-
-       if status == 1 && timed    ## note: use TIMED (instead of SCHEDULED)
-          rec[:status] = 'TIMED'
-       else
-          rec[:status] = MATCH_STATUS[ status ] || "#{status}-???"
-       end
-
-
-
-       rec[:stage]  = desc( m['StageName'] )
-
-       ## check optional  group, matchday, (match) num
-       ##    note - matchday is a string!! (check if always a number)
-       ##      ## convert to int if str - why? why not??
-       group = desc( m['GroupName'] )
-       rec[:group]  = group   if group
-
-       matchday  = m['MatchDay']
-       rec[:matchday]  = matchday.to_i(10)  if matchday
-
-       num  = m['MatchNumber']
-       rec[:num]  = num   if num
-
-
-       dateTime       = parse_date_utc( m['Date'] )
-       localDateTime  = parse_date_utc( m['LocalDate'] )
-
-       if timed
-         ##  pass along as is for now - why? why not
-         ##   note - Date is date_utc and
-         ##      LocalDate is date_local (also in utc BUT different HH:MM or possible day)
-         ## note - also in utc, that is, timezone is Z (not +03:00 or such!!!)
-
-         ## note - use datetime  - why? why not?
-         ##
-         ## note - cut-off/remove seconds
-         rec[:datetime_utc]   = dateTime.strftime( '%Y-%m-%dT%H:%MZ' )
-
-         ## note - use  20:30 UTC+1  or 20:30 UTC-3  for timezone format for now
-         rec[:datetime_local] = _fmt_date_local( dateTime, localDateTime )
-       else
-         rec[:date]      = dateTime.strftime( '%Y-%m-%d' )
-       end
-
-
-
-       if m['HomeTeam'] && m['AwayTeam']   ## assume match reports
-         team1 = build_team( m['HomeTeam'] )
-         team2 = build_team( m['AwayTeam'] )
-          ##  use full team details here (via lookup)
-         ##         when report (mode) - why? why not?
-         rec[:team1] = team1[:name]
-         rec[:team2] = team2[:name]
-       else
-         team1 =  build_team( m['Home'] )
-         team2 =  build_team( m['Away'] )
-         rec[:team1] = team1[:name]
-         rec[:team2] = team2[:name]
-       end
-
-
-
-  #####
-  #  handle score
-  ## m = (full) match hash incl.  IdMatch, etc.
-  ##  returns string e.g.  4-4  or 4-3 a.e.t etc
-
-     score = _parse_score( m )
-     rec[:score] = score      unless score.empty?
-
-
-       ## check - never in use?
-       rec[:home]  = true    if m['IsHome']
-
-
-       ## add country to stadium too - why? why not?
-       stadium = build_stadium( m['Stadium'] )
-
-
-       if m['HomeTeam'] && m['AwayTeam']   ## assume match reports
-         rec[:stadium] = {  name: stadium[:name],
-                            city: stadium[:city],
-                            street: stadium[:street],
-                            country: stadium[:country] }
-       else
-          rec[:stadium] = {  name:    stadium[:name],
-                              city:    stadium[:city] }
-       end
-
-       attendance = m['Attendance']
-       rec[:attendance] = attendance.to_i(10)   if attendance
-
-
-      rec
-end

data/lib/fifadat/pp/build_report.rb

@@ -1,135 +0,0 @@
-
-
-def _build_report_score( live, timeline=nil )
-
-    _scores = _build_score_from_goals( live )
-
-
-    score = nil
-
-     case live['ResultType']
-     when 1,4
-         ## 1 => 'REGULAR',
-         ## 4 => 'REGULAR/AGG',  ##  aggregate (1st/2nd leg) - regular
-        ## add ht
-        ##  assert ft match
-        score      = {  ht: _scores[:ht][:score],
-                         ft: _scores[:ft][:score]
-                      }
-     when 3,5,8
-       score       = {   ht: _scores[:ht][:score],
-                         ft: _scores[:ft][:score],
-                         et: _scores[:et][:score],
-                      }
-     when 2
-        ##  todo/fix - pull in timeline check too to check
-        ##     if any events recorded for extra time!!
-        score      = {   ht: _scores[:ht][:score],
-                         ft: _scores[:ft][:score],
-                      }
-
-        ## note - only incl. extra-time (et) if a goal scored in extra time
-        score[:et] = _scores[:et][:score]   unless _scores[:et][:minutes].empty?
-     end
-
-     score
-end
-
-
-
-def _build_report( live, timeline=nil )
-       rec = {}
-
-
-####
-##  add goals
-   players = Players.new
-   players.add( live['HomeTeam']['Players'] )
-   players.add( live['AwayTeam']['Players'] )
-
-   rec[:goals1] = build_goals( live['HomeTeam']['Goals'], players: players )
-   rec[:goals2] = build_goals( live['AwayTeam']['Goals'], players: players )
-
-
-      ##########
-      ##   add penalty kicks / penalties
-      if live['ResultType'] == 2   ## aet, win on pens
-         if timeline.nil?
-            ##
-            team1_code = live['HomeTeam']['Abbreviation']
-            team2_code = live['AwayTeam']['Abbreviation']
-            puts "!! ERROR - no timeline for match #{team1_code} v #{team2_code} with win on penalties!!"
-            exit 1
-         else
-            ### get timeline with penalty shoot-out details
-            ##     note - requires team1/2_ids!!!
-            team1_id = live['HomeTeam']['IdTeam']
-            team2_id = live['AwayTeam']['IdTeam']
-
-            pens = build_penalties( timeline['Event'],
-                                     players: players,
-                                     team1_id: team1_id,
-                                     team2_id: team2_id )
-            pp pens
-
-            rec[:penalties] = pens
-         end
-      end
-
-
-##
-##  add players by team1/team2
-   players1 = Players.new
-   players1.add( live['HomeTeam']['Players'] )
-
-   players2 = Players.new
-   players2.add( live['AwayTeam']['Players'] )
-
-
-   rec[:formation1] = live['HomeTeam']['Tactics']   ## e.g. "Tactics": "3-1-4-2"
-   rec[:lineup1] = players1.lineup   ## starter XI
-   rec[:bench1]  = players1.bench    ## substitutes
-
-   rec[:formation2] = live['AwayTeam']['Tactics']
-   rec[:lineup2] = players2.lineup
-   rec[:bench2]  = players2.bench
-
-
-#####
-## add bookings (yellow/red/red-yellow cards)
-   players1.add_bookings( live['HomeTeam']['Bookings'])
-   players2.add_bookings( live['AwayTeam']['Bookings'])
-
-
-   yellow1    = players1.yellowcards
-   red1       = players1.redcards
-   yellowred1 = players1.yellowredcards
-   rec[:yellow1]     = yellow1    unless yellow1.empty?
-   rec[:red1]        = red1       unless red1.empty?
-   rec[:yellowred1]  = yellowred1 unless yellowred1.empty?
-
-   yellow2    = players2.yellowcards
-   red2       = players2.redcards
-   yellowred2 = players2.yellowredcards
-   rec[:yellow2]     = yellow2    unless yellow2.empty?
-   rec[:red2]        = red2       unless red2.empty?
-   rec[:yellowred2]  = yellowred2 unless yellowred2.empty?
-
-
-
-## add substitutions (off/on - in/out)
-   rec[:subs1] = build_subs( live['HomeTeam']['Substitutions'], players: players1 )
-   rec[:subs2] = build_subs( live['AwayTeam']['Substitutions'], players: players2 )
-
-
-## add referees
-   officials = build_officials( live['Officials'], id: false )
-
-    if officials.empty?
-      ## puts "!! WARN no refs / officials found"
-    else
-         rec[:referees] = officials
-    end
-
-    rec
-end

data/lib/fifadat/pp/convert-reports.rb

@@ -1,114 +0,0 @@
-
-
-##
-##   read & build match report
-
-## use mk/build_report_basename - why? why not?
-##     fix-fix-fix - change to _match_basename !!!
-##        use by (match)report and (match)timeline !!!
-def _report_basename( m )
-      ### get match (live) details
-      team1_code = m['Home']['Abbreviation']
-      team2_code = m['Away']['Abbreviation']
-      localDateTime  = parse_date_utc( m['LocalDate'] )
-
-      ##  e.g.  2020-06-24_RAP-AUS__54545454
-      basename = String.new
-      basename += localDateTime.strftime('%Y-%m-%d')    ##   i) date
-      basename += "_#{team1_code}-#{team2_code}"        ##  ii) team1 v team2
-
-      basename
-end
-
-
-
-def _read_timeline( m, timeline_dir: )
-      return nil     if m['Home'].nil? || m['Away'].nil?
-
-      basename = _report_basename( m )
-      basename += "__#{m['IdMatch']}"
-
-      path = "#{timeline_dir}/#{basename}.json"
-
-      ## note - skip if no match report available!!!
-      if File.file?( path )
-         timeline = read_json_v2( path )
-         timeline
-      else
-         nil
-      end
-end
-
-def _read_report( m, report_dir: )
-      return nil     if m['Home'].nil? || m['Away'].nil?
-
-      ##  e.g.  2020-06-24_RAP-AUS__54545454
-      #   note - add match id for "raw" match reports!!!
-      basename = _report_basename( m )
-      basename += "__#{m['IdMatch']}"
-
-      ## #{indir}/#{slug}/matches/#{season.to_path}
-      path = "#{report_dir}/#{basename}.json"
-
-      ## note - skip if no match report available!!!
-      if File.file?( path )
-         live = read_json_v2( path )
-         live
-      else
-         nil
-      end
-end
-
-
-
-
-
-
-def convert_reports( slug:, season:,
-                         indir: '.',
-                         outdir: './tmp' )
-
-   season = Season(season)
-
-   data =  read_json_v2( "#{indir}/#{slug}/#{season.to_path}_matches.json" )
-   matches = data['Results']  ## only use results (match) array
-   puts "  #{matches.size} match(es) in season #{season}"
-
-
-   report_dir = "#{indir}/#{slug}/matches/#{season.to_path}"
-   timeline_dir = "#{indir}/#{slug}/timelines/#{season.to_path}"
-
-
-
-   matches.each_with_index do |m, i|
-      live     = _read_report( m, report_dir: report_dir )
-
-      ## no report found; continue
-      next  if live.nil?
-
-      ## check for optional timeline
-      timeline = _read_timeline( m, timeline_dir: timeline_dir )
-
-      rec = {
-               meta: {
-                  name: desc(live['SeasonName']),
-                  slug: slug,
-                  season: season.to_s,
-                  generated: Time.now.to_s,
-               }
-            }.merge( _build_match( live ),
-                     _build_report( live, timeline ))
-
-      ## try  update of score via goals from report
-      score_more =  _build_report_score( live, timeline )
-      if score_more
-           rec[:score] = rec[:score].merge( score_more )
-      end
-
-
-      ## build basename e.g  2026-07-15_ARG-ENG
-      basename = _report_basename( m )
-      outpath = "#{outdir}/#{season.to_path}/#{slug}/#{basename}.json"
-      write_json( outpath, rec )
-   end
-end