fifadat-convert 0.0.1 → 0.1.0

data/lib/fifadat/convert/reader.rb

@@ -0,0 +1,55 @@
+## 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

data/lib/fifadat/convert/tool.rb

@@ -77,7 +77,7 @@ else
         idCompetition = h[:idCompetition]
         comp = Fifa::COMPETITIONS[idCompetition]
         seasons = comp.values.map { |c| c[:season] }
-        puts "  #{code}   (#{seasons.size}) #{seasons.join(',')}"
+        puts "  #{code}   (#{seasons.size}) #{seasons.join(' ')}"
     end
     exit 1
   end

data/lib/fifadat/convert/version.rb

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

data/lib/fifadat/convert.rb

@@ -3,6 +3,37 @@ $LOAD_PATH.unshift( '/sports/yorobot/fifadat/fifadat/lib' )
 require 'fifadat'
 
 
+# module JsonSerializable
+#  def to_json(*args)
+#    as_json.to_json(*args)
+#  end
+# end
+
+###
+##  add as_json  to Object/Array/Hash
+class Object
+  def as_json(*)
+    self
+  end
+end
+
+class Array
+  def as_json(*)
+    map { |v| v.as_json }
+  end
+end
+
+class Hash
+  def as_json(*)
+    each_with_object({}) do |(k, v), h|
+      h[k.to_s] = v.as_json
+    end
+  end
+end
+
+
+
+
 ## our own code
 require_relative 'convert/version'
 require_relative 'convert/tool'    ## fifadat command-line tool
@@ -11,20 +42,7 @@ require_relative 'convert/tool'    ## fifadat command-line tool
 require_relative 'convert/norm'
 require_relative 'convert/errata'
 
-require_relative 'convert/stages'
-require_relative 'convert/teams'
-require_relative 'convert/stadiums'
-require_relative 'convert/players'
-
-require_relative 'convert/officials'   ## aka referees
-require_relative 'convert/goals'
-require_relative 'convert/goals-calc_score'
-require_relative 'convert/penalties'
-require_relative 'convert/substitutions'
-
-
-require_relative 'convert/build_match'
-require_relative 'convert/build_report'
+require_relative 'convert/reader'
 require_relative 'convert/convert'
 require_relative 'convert/convert-reports'
 
@@ -34,4 +52,26 @@ require_relative 'convert/helper-minute'
 
 
 
+require_relative 'models/stage'
+require_relative 'models/team'
+require_relative 'models/stadium'
+require_relative 'models/match'
+require_relative 'models/match_report'
+require_relative 'models/goal'
+require_relative 'models/penalty'
+require_relative 'models/substitution'
+require_relative 'models/official'   ## aka referees
+require_relative 'models/player'   # note - is lineup player incl. starter/bench, position, etc.
+                                   #           (NOT squad player)
+
+
+
+require_relative 'tables/stages'
+require_relative 'tables/teams'
+require_relative 'tables/stadiums'
+require_relative 'tables/players'
+
+
+
+
 puts FifadatConvert.banner    ## say hello

data/lib/fifadat/{convert/goals.rb → models/goal.rb}

@@ -1,8 +1,29 @@
 
+class Goal
 
 
+## add alias _build_all or _build_collection or ?? - why? why not?
+def self._build_ary( recs, players:,
+                           penalties: false )
+
+    ## note - filter out penalties (from shoot-out)!!
+    ##    min > 120  (e.g. 121, etc.)
+    ##  note - use period (more reliable)
+    ##   period 11 is PENALTY_SHOOTOUT!!
+    if penalties == false
+       recs = recs.select { |rec| rec['Period'] != 11 }
+    end
+
+
+    recs = recs.map  { |h| build( h, players: players ) }
+
+    ## note - sort by minutes; goals may not be sorted
+    recs = recs.sort { |l,r| l.minute <=> r.minute }
+    recs
+end
 
-def build_goal( h, players: )
+
+def self.build( h, players: )
 
     ## split into minute
     ##  and offset (stoppage/injury time)
@@ -40,16 +61,15 @@ def build_goal( h, players: )
       idPlayer = h['IdPlayer']
 
       if idPlayer.nil?
-         puts "!! no idPlayer for goal!"
+         puts "!! no idPlayer for goal (live):"
          pp h
           ##exit 1
           ## use 'N.N.'
 
-          rec[ :name ] = 'N.N.'
+          rec[ :player ] = Player::PLAYER_NIL  ## 'N.N.'
 
       else
-        player = players.find!( idPlayer )
-        rec[ :name ] = player[ :name ]
+        rec[ :player ] = players.find!( idPlayer )
       end
 
      rec[ :minute] = minute
@@ -64,26 +84,37 @@ def build_goal( h, players: )
       rec[ :pen ] = true  if type == 1
       rec[ :og ]  = true  if type == 3
 
-      rec
+      new( **rec )
 end
 
 
 
 
-def build_goals( recs, players:,  penalties: false )
 
-    ## note - filter out penalties (from shoot-out)!!
-    ##    min > 120  (e.g. 121, etc.)
-    ##  note - use period (more reliable)
-    ##   period 11 is PENALTY_SHOOTOUT!!
-    if penalties == false
-       recs = recs.select { |rec| rec['Period'] != 11 }
-    end
+attr_reader :player, :minute,
+            :pen, :og
 
+def initialize(
+     player:,
+     minute:,
+     pen: false, og: false)
+  @player = player
+  @minute = minute
+  @pen    = pen
+  @og     = og
+end
 
-    recs = recs.map  { |h| build_goal( h, players: players ) }
 
-    ## note - sort by minutes; goals may not be sorted
-    recs = recs.sort { |l,r| l[:minute] <=> r[:minute] }
-    recs
+def as_json(*)
+      h = {
+            'name'     => player.name,
+            'minute'   => minute,
+          }
+
+       h['og']    = og   if og
+       h['pen']   = pen  if pen
+       h
 end
+
+
+end  # class Goal

data/lib/fifadat/models/match.rb

@@ -0,0 +1,218 @@
+
+
+class Match
+
+
+def self.build( m, teams:, stadiums:, stages: )   ## use _fill/build_match_basics() or such ???
+    rec = {}
+
+       ## 0 =>   FINISHED/complete (OK)
+       ## 1 =>   SCHEDULED/not yet played
+       status = m['MatchStatus']
+       timed  = m['TimeDefined']
+       rec[:timed] = timed    ### note - keep timed flag too - why? why not?
+
+
+       if status == 1 && timed    ## note: use TIMED (instead of SCHEDULED)
+          rec[:status] = 'TIMED'
+       else
+          rec[:status] = MATCH_STATUS[ status ] || "#{status}-???"
+       end
+
+
+
+       rec[:stage]  = stages.find!( 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
+
+
+## e.g. if timed == false  (in at)
+##     "Date":      "2027-02-27T00:00:00Z",
+##     "LocalDate": "2027-02-27T01:00:00Z",
+
+       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[:date_local] = localDateTime.strftime( '%Y-%m-%d' )
+         rec[:time_local] = _fmt_time_local( dateTime, localDateTime )
+       else
+         ## note - uses
+         ## todo/fix - assert  that utc  hour/minute is 00:00 e.g.
+         ##   "2027-02-27T00:00:00Z"
+         rec[:date_local] = dateTime.strftime( '%Y-%m-%d' )
+       end
+
+
+
+       if m['HomeTeam'] && m['AwayTeam']   ## assume match reports (json-style)
+         team1 = teams.find!( m['HomeTeam'] )
+         team2 = teams.find!( m['AwayTeam'] )
+       else
+         team1 =  teams.find!( m['Home'] )
+         team2 =  teams.find!( m['Away'] )
+       end
+
+       rec[:team1] = team1
+       rec[:team2] = team2
+
+  #####
+  #  handle score
+  ## m = (full) match hash incl.  IdMatch, etc.
+  ##  returns string e.g.  4-4  or 4-3 a.e.t etc
+
+   ##
+   ## fix-fix-fix
+   ##   use a score class!!!
+   ##   see openliga etc.
+
+     score = _parse_score( m )
+
+
+      rec[:score] = score
+
+       ## check - never in use?
+       rec[:home]  = true    if m['IsHome']
+
+
+       ## add country to stadium too - why? why not?
+       rec[:stadium] = stadiums.find!( m['Stadium'] )
+
+
+       attendance = m['Attendance']
+       rec[:attendance] = attendance.to_i(10)   if attendance
+
+
+      new( **rec )
+end
+
+
+attr_reader :status,
+            :team1, :team2,
+            :stage, :group, :matchday, :num,
+            :datetime_utc,
+            :date_local,
+            :time_local, :timed,
+            :stadium, :home, :attendance
+
+attr_accessor :score,
+              :goals1, :goals2,
+              :penalties,
+              :sentoff1, :sentoff2,
+              :officials
+
+
+def initialize(
+      status:,
+      team1:,
+      team2:,
+      score: nil,
+
+      stage: nil,
+      group: nil,
+      matchday: nil,
+      num: nil,
+
+      datetime_utc: nil,
+      date_local: nil,
+      time_local: nil,
+      timed: nil,
+
+      stadium: nil,
+      home: nil,
+      attendance: nil)
+  @status = status
+  @team1 = team1
+  @team2 = team2
+  @score = score
+
+  @stage    = stage
+  @group    = group
+  @matchday = matchday
+  @num      = num
+
+  @datetime_utc = datetime_utc
+  @date_local = date_local
+  @time_local = time_local
+  @timed = timed
+
+  @stadium = stadium
+  @home = home
+  @attendance = attendance
+end
+
+
+
+def as_json(*)
+      h = {
+            'status'    => status,
+            'stage'     => stage.name,
+          }
+
+       h['matchday']  = matchday     if matchday
+       h['num']       = num          if num
+       h['group']     = group        if group
+
+       if timed
+          h['datetime_utc'] = datetime_utc
+          h['date_local'] = date_local
+          h['time_local'] = time_local
+       else
+          h['date_local'] = date_local
+       end
+
+       h['team1']  = team1.name
+       h['team2']  = team2.name
+
+       h['score'] = score     if score && !score.empty?
+
+
+       if stadium
+         h['stadium'] = { 'name' => stadium.name,
+                          'city' => stadium.city }
+       end
+
+       h['attendance']  if attendance
+
+
+
+       if goals1 || goals2
+         h['goals1']  = (goals1 || []).as_json
+         h['goals2']  = (goals2 || []).as_json
+       end
+
+       h['penalities'] = penalties.as_json    if penalties
+
+       if sentoff1 || sentoff2
+         h['sentoff1']  = (sentoff1 || []).as_json
+         h['sentoff2']  = (sentoff2 || []).as_json
+       end
+
+
+       h['referees'] = officials.as_json    if officials
+    h
+end
+
+end  # class Match

data/lib/fifadat/models/match_report.rb

@@ -0,0 +1,205 @@
+
+
+##
+##  holds details of match (kind of match sheet/report)
+##
+
+##  fix-fix-fix  move to tables - yes or rename MatchReportBuilder ?
+## move to tables - why? why not?
+
+##
+##  fix-fix-fix rename to MatchDetails !!!
+##     keep MatchReport/Sheet reserved for later
+
+
+class MatchReport
+
+
+def self.build( live, timeline=nil )
+      _players1 = Player._build_ary( live['HomeTeam']['Players'] )
+      _players2 = Player._build_ary( live['AwayTeam']['Players'] )
+
+      players  = Players.new      ## lookup all players (team1+team2)
+      players.add( _players1 )
+      players.add( _players2 )
+
+      players1 = Players.new      ## lookup players by team1/team2 only
+      players1.add( _players1 )
+      players2 = Players.new
+      players2.add( _players2 )
+
+
+      o = new
+      ###
+      ##  add goals
+      o.goals1 = Goal._build_ary( live['HomeTeam']['Goals'], players: players )
+      o.goals2 = Goal._build_ary( live['AwayTeam']['Goals'], players: players )
+
+
+      ##########
+      ##   add penalty kicks / penalties
+      ##     note - requires timeline  !!!
+      if live['ResultType'] == 2     ## 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 = Penalty._build_ary( timeline['Event'],
+                                         players: players,
+                                         team1_id: team1_id,
+                                         team2_id: team2_id )
+            ## pp pens
+
+            o.penalties = pens
+         end
+      end
+
+
+      #######
+      ##  add lineup/bench
+      o.formation1 = live['HomeTeam']['Tactics']   ## e.g. "Tactics": "3-1-4-2"
+      o.lineup1    = players1.lineup   ## starter XI (only excludes bench)
+      o.bench1     = players1.bench    ## substitutes
+
+      o.formation2 = live['AwayTeam']['Tactics']
+      o.lineup2    = players2.lineup
+      o.bench2     = players2.bench
+
+
+      #####
+      ## add bookings (yellow/red/red-yellow cards)
+      players1.add_bookings( live['HomeTeam']['Bookings'])
+      players2.add_bookings( live['AwayTeam']['Bookings'])
+
+
+
+      ##
+      ##  maybe collect cards on demand (not ahead of time) - why? why not?
+      yellow1    = players1.yellowcards
+      red1       = players1.redcards
+      yellowred1 = players1.yellowredcards
+
+      o.yellow1     = yellow1    unless yellow1.empty?
+      o.red1        = red1       unless red1.empty?
+      o.yellowred1  = yellowred1 unless yellowred1.empty?
+
+      yellow2    = players2.yellowcards
+      red2       = players2.redcards
+      yellowred2 = players2.yellowredcards
+
+      o.yellow2     = yellow2    unless yellow2.empty?
+      o.red2        = red2       unless red2.empty?
+      o.yellowred2  = yellowred2 unless yellowred2.empty?
+
+
+      ## add substitutions (off/on - in/out)
+      o.subs1   =  Sub._build_ary( live['HomeTeam']['Substitutions'], players: players1 )
+      o.subs2   =  Sub._build_ary( live['AwayTeam']['Substitutions'], players: players2 )
+
+
+      ## add referees
+      officials = Official._build_ary( live['Officials'] )
+
+      if officials.empty?
+         puts "!! WARN no refs / officials found"
+      else
+         o.officials = officials
+      end
+
+      o
+end
+
+
+
+    attr_accessor :goals1,     :goals2,
+                  :penalties,
+                  :lineup1,    :lineup2,
+                  :bench1,     :bench2,
+                  :formation1, :formation2,
+                  :yellow1,    :yellow2,
+                  :yellowred1, :yellowred2,
+                  :red1,       :red2,
+                  :subs1,      :subs2,
+                  :officials   # aka referees
+
+
+   def initialize
+     @goals1 =  [], @goals2 = []
+     @penalties = nil   ## or use [] - why? why not?
+
+     @lineup1 = [], @lineup2 = []
+     @bench1  = [], @bench2  = []
+
+     @formation1 = nil, @formation2 = nil
+
+     @yellow1  = []
+     @yellow2  = []
+     @yellowred1 = []
+     @yellowred2  = []
+     @red1  = []
+     @red2  = []
+
+     @subs1  = [],       @subs2  = []
+
+     @officials = nil
+ end
+
+
+  def sentoff1
+     ## pp self
+     sentoff1 =  (red1||[]) + (yellowred1||[])
+     ## pp red1
+     ## pp yellowred1
+     ## pp sentoff1
+     sentoff1.sort { |l,r|  l.minute <=> r.minute }  ## sort by minute
+  end
+  def sentoff2
+     sentoff2 =  (red2||[]) + (yellowred2||[])
+     sentoff2.sort { |l,r|  l.minute <=> r.minute }  ## sort by minute
+  end
+
+
+
+def as_json(*)
+      h = {}
+
+       if goals1 || goals2
+         h['goals1']  = (goals1 || []).as_json
+         h['goals2']  = (goals2 || []).as_json
+       end
+
+       h['penalities'] = penalties.as_json    if penalties
+
+       h['formation1'] = formation1    if formation1
+       h['lineup1']    = lineup1.as_json
+       h['bench1']     = bench1.as_json
+
+       h['formation2'] = formation2    if formation2
+       h['lineup2']    = lineup2.as_json
+       h['bench2']     = bench2.as_json
+
+       h['yellow1']     = yellow1.as_json    if yellow1 && !yellow1.empty?
+       h['yellow2']     = yellow2.as_json    if yellow2 && !yellow2.empty?
+       h['yellowred1']  = yellowred1.as_json   if yellowred1 && !yellowred1.empty?
+       h['yellowred2']  = yellowred2.as_json   if yellowred2 && !yellowred2.empty?
+       h['red1']        = red1.as_json          if red1 && !red1.empty?
+       h['red2']        = red2.as_json          if red2 && !red2.empty?
+
+       h['subs1']     = subs1.as_json
+       h['subs2']     = subs2.as_json
+
+       h['referees'] = officials.as_json    if  officials
+
+       h
+end
+
+
+end  ## class MatchReport