footballdata-api 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0556b03185d985c2f364151400a6dfe04ee9160e8560739e005e00a3e872b806
-  data.tar.gz: 17711037928d5c213a7915245a2d511e7fba6f4c47ff582357616c87a1ffd7cc
+  metadata.gz: 97e75a5cbf4b952cb018a40c4ff790a201c26cbd95af1027bae3e7ac2153d1b5
+  data.tar.gz: a4d0cfd2e6ff636f030cd6c4d4d949f2173763cc39352b28b3425ad9aa077796
 SHA512:
-  metadata.gz: d1bbeef48c5633b97e984e535857ba294a3326cddf1fd6d20ea426d33c95c0e0c7d6e9d12f9fa4a97a12291ba3c1d12e4751f57a5f0bfe3e736ebcf34be56f51
-  data.tar.gz: 2640f463715d6a0ff697502dfdd8af38e3c7cf0d6dafc0fb575d44360b548a692ff9c256d6e3ad4e9673dd108636969f372d7a2e153d872ee8c240b2e470e4c6
+  metadata.gz: d1c8650effbb80caec23410ee3fc739f379976359f044b29eff3a02d7bd82f23d76f7daffd6b2cfa76dfbdcbc6be53e178a04929b02401a30641f29cb3d0bd18
+  data.tar.gz: 39d810683288fc35703f19fd1643af8bb0b8332168ae4d4e819eb681444ea4c27e7c0b36daccf27fc97d02704aa6325696579a6d5b3941988cd6bef8f400d0ec

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.4.1
+### 0.4.2
 
 ### 0.0.1 / 2024-07-03
 

data/Manifest.txt

@@ -3,7 +3,7 @@ Manifest.txt
 README.md
 Rakefile
 bin/fbdat
-config/leagues.csv
+config/leagues_tier1.csv
 lib/footballdata.rb
 lib/footballdata/convert-score.rb
 lib/footballdata/convert.rb

data/bin/fbdat

@@ -16,14 +16,6 @@ Webcache.root =  if File.exist?( '/sports/cache' )
                      './cache'
                  end
 
-## 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)
-
-## change from 10 to 1 sec(s) for interactive use
-Webget.config.sleep  = 1
-
 
 Footballdata.config.convert.out_dir =  if File.exist?( '/sports/cache.api.fbdat' )
                                            puts "  setting convert out_dir to >/sports/cache.api.fbdat<"
@@ -43,6 +35,7 @@ def self.main( args=ARGV )
 opts = {
    cached:  false,
    convert: true,
+   file:    nil,
 }
 
 parser = OptionParser.new do |parser|
@@ -53,9 +46,20 @@ parser = OptionParser.new do |parser|
     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
+  parser.on( "--[no-]convert",
+               "turn on/off conversion to .csv in #{Footballdata.config.convert.out_dir} - default is (#{opts[:convert]})" ) do |convert|
+    opts[:convert] = convert
+  end
+
+  parser.on( "--print", "--pp",
+                 "pretty print cached data in #{Webcache.root}; no download & conversion") do |print|
+    opts[:cached] = true
+    opts[:convert] = false
+  end
+
+  parser.on( "-f FILE", "--file FILE",
+                "read leagues (and seasons) via .csv file") do |file|
+    opts[:file] = file
   end
 end
 parser.parse!( args )
@@ -68,6 +72,19 @@ puts "ARGV:"
 p args
 
 
+## 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)
+
+## change from 10 to 1 sec(s) for interactive use
+##   assume --file/-f as non-interactive/batch use for now
+Webget.config.sleep  =    opts[:file] ?  10 : 1
+
+
+
+
+
 ## try special args
 
 if ['plan', 'plans',
@@ -118,11 +135,13 @@ 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
         elsif ['t', 'tomorrow', 't+1', '1', '+1'].include?( args[0] )
             Date.today+1
-        elsif ['m', 'match', 'matches', 'today'].include?( args[0] || 'today' )  ## make default - why? why not?
+        elsif ['m', 'match', 'matches', 'today'].include?( args[0] )
             Date.today
         else
             nil
@@ -170,51 +189,81 @@ end
 ##
 ## note - only use "generic" uniform league codes for now!!
 
-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
-metal_league_code = find_league!( league_code )
 
-
-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 [metal_league_code, season_start_year]
-
-if opts[:cached]
-    ## do nothing
-else
-    ## download dataset(s)
-    ## try download
-    ##   note:  include teams (for convert) for now too!!
-    Metal.teams( metal_league_code, season_start_year )
-    Metal.matches( metal_league_code, season_start_year )
+datasets = if opts[:file]
+              read_datasets( opts[:file] )
+           else
+              parse_datasets_args( args )
+           end
+
+
+## step 0 - validate and fill-up seasons etc.
+datasets.each do |dataset|
+  league_key, seasons = dataset
+
+  ##  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
+  metal_league_code = find_league!( league_key )
+
+  ## note - default to latest season of league
+  ##              might be 2024/25 or 2024 or
+  #                 for world cup 2022 or such
+  if seasons.empty?
+     seasons = case league_key
+               when  'world'          then [Season('2022')]
+               when  'euro'           then [Season('2024')]
+               when  'br.1', 'copa.l' then [Season('2024')]
+               else                        [Season('2024/25')]
+               end
+    dataset[1] = seasons
+  end
 end
 
-url = Metal.competition_matches_url( metal_league_code,
-                                      season_start_year )
-pp url
-#=> "http://api.football-data.org/v4/competitions/EC/matches?season=2024"
+## step 1 - download
+datasets.each do |league_key, seasons|
+  ##  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
+  metal_league_code = find_league!( league_key )
+  seasons.each do |season|
+     season_start_year  = season.start_year   ## use year - why? why not?
+     pp [metal_league_code, season_start_year]
+
+     if opts[:cached]
+        ## do nothing
+     else
+        ## download dataset(s)
+        ## try download
+        ##   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( metal_league_code,
+                                          season_start_year )
+     pp url
+     #=> "http://api.football-data.org/v4/competitions/EC/matches?season=2024"
 
-data = Webcache.read_json( url )
-## pp data
+     data = Webcache.read_json( url )
+     ## pp data
 
-pp_matches( data )
+     pp_matches( data )
+   end  # each season
+end  # each dataset
 
 
 if opts[:convert]
-  puts "==> converting to .csv"
-  convert( league: league_code, season: season )
+   puts "==> converting to .csv"
+   datasets.each do |league_key, seasons|
+      seasons.each do |season|
+         convert( league: league_key, season: season )
+      end
+   end
 end
 
-
 end  # def self.main
 end  # module Footballdata
 

data/config/leagues_tier1.csv

@@ -0,0 +1,44 @@
+key, code, seasons
+
+eng.1,    PL,    2024/25 2023/24 2022/23 2021/22 2020/21
+    # incl. team(s) from wales
+eng.2,    ELC,    2024/25 2023/24 2022/23 2021/22 2020/21
+     #  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
+
+es.1,    PD,    2024/25 2023/24 2022/23 2021/22 2020/21
+    # PD  - Primera Division, Spain          27 seasons | 2019-08-16 - 2020-07-19 / matchday 31
+
+pt.1,     PPL,    2024/25 2023/24 2022/23 2021/22 2020/21
+    # PPL - Primeira Liga, Portugal        9 seasons | 2019-08-10 - 2020-07-26 / matchday 28
+
+de.1,     BL1,    2024/25 2023/24 2022/23 2021/22 2020/21
+    # BL1 - Bundesliga, Germany        24 seasons | 2019-08-16 - 2020-06-27 / matchday 34
+
+nl.1,     DED,    2024/25 2023/24 2022/23 2021/22 2020/21
+    # DED - Eredivisie, Netherlands    10 seasons | 2019-08-09 - 2020-03-08 / matchday 34
+
+fr.1,     FL1,    2024/25 2023/24 2022/23 2021/22 2020/21
+    # incl. team(s) monaco
+
+it.1,      SA,    2024/25 2023/24 2022/23 2021/22 2020/21
+    # SA  - Serie A, Italy          15 seasons | 2019-08-24 - 2020-08-02 / matchday 27
+
+br.1,       BSA,     2024 2023 2022 2021 2020
+
+
+########
+## int'l cups
+uefa.cl,    CL,    2024/25 2023/24 2022/23 2021/22 2020/21
+    ## 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,    2024 2023 2022 2021
+   ## Copa Libertadores
+
+
+############
+## national teams
+euro,       EC,   2024 2021
+world,      WC,   2022

data/lib/footballdata/convert.rb

@@ -6,15 +6,16 @@ module Footballdata
 STAGES = {
   'REGULAR_SEASON'          => ['Regular'],
 
+  'QUALIFICATION'           => ['Qualifying'],
   'PRELIMINARY_ROUND'       => ['Qualifying', 'Preliminary Round' ],
   'PRELIMINARY_SEMI_FINALS' => ['Qualifying', 'Preliminary Semifinals' ],
   'PRELIMINARY_FINAL'       => ['Qualifying', 'Preliminary Final' ],
-  '1ST_QUALIFYING_ROUND'    => ['Qualifying', 'Qual. Round 1' ],
-  '2ND_QUALIFYING_ROUND'    => ['Qualifying', 'Qual. Round 2' ],
-  '3RD_QUALIFYING_ROUND'    => ['Qualifying', 'Qual. Round 3' ],
-  'QUALIFICATION_ROUND_1'   => ['Qualifying', 'Qual. Round 1' ],
-  'QUALIFICATION_ROUND_2'   => ['Qualifying', 'Qual. Round 2' ],
-  'QUALIFICATION_ROUND_3'   => ['Qualifying', 'Qual. Round 3' ],
+  '1ST_QUALIFYING_ROUND'    => ['Qualifying', 'Round 1' ],
+  '2ND_QUALIFYING_ROUND'    => ['Qualifying', 'Round 2' ],
+  '3RD_QUALIFYING_ROUND'    => ['Qualifying', 'Round 3' ],
+  'QUALIFICATION_ROUND_1'   => ['Qualifying', 'Round 1' ],
+  'QUALIFICATION_ROUND_2'   => ['Qualifying', 'Round 2' ],
+  'QUALIFICATION_ROUND_3'   => ['Qualifying', 'Round 3' ],
   'ROUND_1'                 => ['Qualifying', 'Round 1'],    ##  use Qual. Round 1 - why? why not?
   'ROUND_2'                 => ['Qualifying', 'Round 2'],
   'ROUND_3'                 => ['Qualifying', 'Round 3'],
@@ -29,6 +30,7 @@ STAGES = {
   'LAST_16'                 => ['Finals',     'Round of 16'],  ## use Last 16 - why? why not?
   'QUARTER_FINALS'          => ['Finals',     'Quarterfinals'],
   'SEMI_FINALS'             => ['Finals',     'Semifinals'],
+  'THIRD_PLACE'             => ['Finals',     'Third place play-off'],
   'FINAL'                   => ['Finals',     'Final'],
 }
 
@@ -95,12 +97,40 @@ matches.each do |m|
   score = m['score']
 
 
-  stage_key = m['stage']
 
+  group = m['group']
+  ## GROUP_A
+  ##  shorten group to A|B|C etc.
+  if group && group =~ /^(GROUP_|Group )/
+        group =  group.sub( /^(GROUP_|Group )/, '' )
+  else
+      if group.nil?
+          group = ''
+      else
+          puts "!! WARN - group defined with NON GROUP!? >#{group}< reset to empty"
+          puts "            and matchday to >#{m['matchday']}<"
+          ## reset group to empty
+          group = ''
+      end
+  end
+
+
+  stage_key = m['stage']
   stats['stage'][ stage_key ] += 1   ## track stage counts
 
-  ## map stage to stage + round
-  stage, stage_round  =  STAGES[ stage_key ]
+
+  stage, stage_round =  if group.empty?
+                          ## map stage to stage + round
+                          STAGES[ stage_key ]
+                        else
+                          ## if group defined ignore stage
+                          ##   hard-core always to group for now
+                           if stage_key != 'GROUP_STAGE'
+                              puts "!! WARN - group defined BUT stage set to >#{stage_key}<"
+                              puts "            and matchday to >#{m['matchday']}<"
+                           end
+                          ['Group', nil]
+                        end
 
   if stage.nil?
       puts "!! ERROR - no stage mapping found for stage >#{stage_key}<"
@@ -115,23 +145,12 @@ matches.each do |m|
      ##   matchday 1, 2 etc.
      matchday = matchday_num.to_s
   else
-    ## note - if matchday defined; assume leg e.g. 1|2
-    ##     skip if different than one or two for now
-    matchday = String.new
-    matchday << stage_round
-    matchday << " | Leg #{matchday_num}"  if matchday_num &&
-                                         (matchday_num == 1 || matchday_num == 2)
+    ## note - if matchday/round defined, use it
+    ##        note - ignore possible leg in matchday for now
+    matchday =  stage_round
   end
 
 
-
-  group = m['group'] || ''
-  ## GROUP_A
-  ##  shorten group to A|B|C etc.
-  group = group.sub( /^GROUP_/, '' )
-
-
-
     teams[ team1 ] += 1
     teams[ team2 ] += 1
 
@@ -164,7 +183,7 @@ matches.each do |m|
       ht = ''
     when 'FINISHED'
       ft, ht, et, pen = convert_score( score )
-    when 'AWARDED'
+    when 'AWARDED'   # AWARDED
       assert( score['duration'] == 'REGULAR', 'score.duration REGULAR expected' )
       ft = "#{score['fullTime']['home']}-#{score['fullTime']['away']}"
       ft << ' (*)'
@@ -206,7 +225,17 @@ matches.each do |m|
       local    = tz.to_local( utc )
       date     = local.strftime( '%Y-%m-%d' )
       time     = local.strftime( '%H:%M' )
-      timezone = local.strftime( '%Z/%z' )
+
+      ## pretty print timezone
+      ###   todo/fix - bundle into fmt_timezone method or such for reuse
+      tz_abbr   =  local.strftime( '%Z' )   ## e.g. EEST or if not available +03 or such
+      tz_offset =  local.strftime( '%z' )   ##  e.g. +0300
+
+      timezone =  if tz_abbr =~ /^[+-][0-9]+$/   ## only digits (no abbrev.)
+                     tz_offset
+                  else
+                      "#{tz_abbr}/#{tz_offset}"
+                  end
     end
 
 

data/lib/footballdata/leagues.rb

@@ -2,7 +2,7 @@ module Footballdata
 
   def self.find_league!( league )
      @leagues ||= begin
-                     recs = read_csv( "#{FootballdataApi.root}/config/leagues.csv" )
+                     recs = read_csv( "#{FootballdataApi.root}/config/leagues_tier1.csv" )
                      leagues = {}
                      recs.each do |rec|
                         leagues[ rec['key'] ] = rec['code']

data/lib/footballdata/prettyprint.rb

@@ -39,6 +39,7 @@ def self.fmt_match( rec )
                 TIMED
                 FINISHED
                 POSTPONED
+                AWARDED
                 IN_PLAY
                ].include?( status ), "unknown status - #{status}" )
 
@@ -89,7 +90,11 @@ def self.fmt_match( rec )
        score << "#{et} a.e.t. "
        score << "(#{ft}, #{ht})"
      else
-       score << "#{ft} (#{ht})"
+      if !ht.empty?
+         score << "#{ft} (#{ht})"
+      else
+         score << "#{ft}"
+      end
      end
 
      buf << score

data/lib/footballdata/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: footballdata-api
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: football-timezones
@@ -88,7 +88,7 @@ files:
 - README.md
 - Rakefile
 - bin/fbdat
-- config/leagues.csv
+- config/leagues_tier1.csv
 - lib/footballdata.rb
 - lib/footballdata/convert-score.rb
 - lib/footballdata/convert.rb

data/config/leagues.csv

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