footballdata-api 0.3.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3350fb47d596e6d5b2e4d73582b2615020d56db38cf86d9545a10b1760494c1
-  data.tar.gz: d7ba6c51f3e12beed59df7b851e8d533a838de67e73c5b1d025ab7a1256caa7d
+  metadata.gz: 97e75a5cbf4b952cb018a40c4ff790a201c26cbd95af1027bae3e7ac2153d1b5
+  data.tar.gz: a4d0cfd2e6ff636f030cd6c4d4d949f2173763cc39352b28b3425ad9aa077796
 SHA512:
-  metadata.gz: 2943bcf6f2da49dfc1cab26da0933957d2bde2fb13749c7ce4d4896214484bac3edcea197e01ed9b2b63f92e2e74f560ac49189f63be7644522b7b24b7cbed73
-  data.tar.gz: 945cc2d0cb9346434c6f3875c33dd153867318b73e067c5574bc6e789f7b3b293d5c7f126c80221c676998eaa0e532647b7a25b960d082097209b6a1428f879e
+  metadata.gz: d1c8650effbb80caec23410ee3fc739f379976359f044b29eff3a02d7bd82f23d76f7daffd6b2cfa76dfbdcbc6be53e178a04929b02401a30641f29cb3d0bd18
+  data.tar.gz: 39d810683288fc35703f19fd1643af8bb0b8332168ae4d4e819eb681444ea4c27e7c0b36daccf27fc97d02704aa6325696579a6d5b3941988cd6bef8f400d0ec

data/CHANGELOG.md

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

data/Manifest.txt

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

@@ -18,10 +18,8 @@ Hoe.spec 'footballdata-api' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['tzinfo'],
-    ['season-formats'],
+    ['football-timezones'],
     ['webget'],
-    ['cocos'],  ## later pull in with sportsdb-writers
   ]
 
   self.licenses = ['Public Domain']

data/bin/fbdat

@@ -16,16 +16,13 @@ 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)
-Webget.config.sleep  = 10
-
-
-Footballdata.config.convert.out_dir = '/sports/cache.api.fbdat'   if File.exist?( '/sports/cache.api.fbdat' )
-
 
+Footballdata.config.convert.out_dir =  if File.exist?( '/sports/cache.api.fbdat' )
+                                           puts "  setting convert out_dir to >/sports/cache.api.fbdat<"
+                                           '/sports/cache.api.fbdat'
+                                       else
+                                           '.' ## use working dir
+                                       end
 
 
 require 'optparse'
@@ -38,6 +35,7 @@ def self.main( args=ARGV )
 opts = {
    cached:  false,
    convert: true,
+   file:    nil,
 }
 
 parser = OptionParser.new do |parser|
@@ -48,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 )
@@ -63,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',
@@ -113,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
@@ -165,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-score.rb

@@ -0,0 +1,44 @@
+
+module Footballdata
+
+def self.convert_score( score )
+  ## duration: REGULAR  · PENALTY_SHOOTOUT  · EXTRA_TIME
+  ft, ht, et, pen = ["","","",""]
+
+  if score['duration'] == 'REGULAR'
+    ft  = "#{score['fullTime']['home']}-#{score['fullTime']['away']}"
+    ht  = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
+  elsif score['duration'] == 'EXTRA_TIME'
+    et  =  "#{score['regularTime']['home']+score['extraTime']['home']}"
+    et << "-"
+    et << "#{score['regularTime']['away']+score['extraTime']['away']}"
+
+    ft =  "#{score['regularTime']['home']}-#{score['regularTime']['away']}"
+    ht =  "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
+  elsif score['duration'] == 'PENALTY_SHOOTOUT'
+    if score['extraTime']
+      ## quick & dirty hack - calc et via regulartime+extratime
+      pen = "#{score['penalties']['home']}-#{score['penalties']['away']}"
+      et  = "#{score['regularTime']['home']+score['extraTime']['home']}"
+      et << "-"
+      et << "#{score['regularTime']['away']+score['extraTime']['away']}"
+
+      ft = "#{score['regularTime']['home']}-#{score['regularTime']['away']}"
+      ht = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
+    else  ### south american-style (no extra time)
+        ## quick & dirty hacke - calc ft via fullTime-penalties
+        pen =  "#{score['penalties']['home']}-#{score['penalties']['away']}"
+        ft  =  "#{score['fullTime']['home']-score['penalties']['home']}"
+        ft << "-"
+        ft << "#{score['fullTime']['away']-score['penalties']['away']}"
+        ht  = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
+    end
+  else
+    puts "!! unknown score duration:"
+    pp score
+    exit 1
+  end
+
+  [ft,ht,et,pen]
+end
+end  # module Footballdata

data/lib/footballdata/convert.rb

@@ -1,63 +1,21 @@
 
 module Footballdata
 
-
-def self.convert_score( score )
-  ## duration: REGULAR  · PENALTY_SHOOTOUT  · EXTRA_TIME
-  ft, ht, et, pen = ["","","",""]
-
-  if score['duration'] == 'REGULAR'
-    ft  = "#{score['fullTime']['home']}-#{score['fullTime']['away']}"
-    ht  = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
-  elsif score['duration'] == 'EXTRA_TIME'
-    et  =  "#{score['regularTime']['home']+score['extraTime']['home']}"
-    et << "-"
-    et << "#{score['regularTime']['away']+score['extraTime']['away']}"
-
-    ft =  "#{score['regularTime']['home']}-#{score['regularTime']['away']}"
-    ht =  "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
-  elsif score['duration'] == 'PENALTY_SHOOTOUT'
-    if score['extraTime']
-      ## quick & dirty hack - calc et via regulartime+extratime
-      pen = "#{score['penalties']['home']}-#{score['penalties']['away']}"
-      et  = "#{score['regularTime']['home']+score['extraTime']['home']}"
-      et << "-"
-      et << "#{score['regularTime']['away']+score['extraTime']['away']}"
-
-      ft = "#{score['regularTime']['home']}-#{score['regularTime']['away']}"
-      ht = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
-    else  ### south american-style (no extra time)
-        ## quick & dirty hacke - calc ft via fullTime-penalties
-        pen =  "#{score['penalties']['home']}-#{score['penalties']['away']}"
-        ft  =  "#{score['fullTime']['home']-score['penalties']['home']}"
-        ft << "-"
-        ft << "#{score['fullTime']['away']-score['penalties']['away']}"
-        ht  = "#{score['halfTime']['home']}-#{score['halfTime']['away']}"
-    end
-  else
-    puts "!! unknown score duration:"
-    pp score
-    exit 1
-  end
-
-  [ft,ht,et,pen]
-end
-
-
 #######
 ##  map round-like to higher-level stages
 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'],
@@ -72,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'],
 }
 
@@ -80,13 +39,6 @@ STAGES = {
 
 def self.convert( league:, season: )
 
-  ### note/fix: cl (champions league for now is a "special" case)
-  # if league.downcase == 'cl'
-  #   convert_cl( league: league,
-  #              season: season )
-  #  return
-  # end
-
   season = Season( season )   ## cast (ensure) season class (NOT string, integer, etc.)
 
   league_code = find_league!( league )
@@ -145,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}<"
@@ -165,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
 
@@ -214,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 << ' (*)'
@@ -237,22 +206,16 @@ matches.each do |m|
     end
 
 
-    ##
-    ##  add time, timezone(tz)
-    ##    2023-08-18T18:30:00Z
-    ## e.g. "utcDate": "2020-05-09T00:00:00Z",
-    ##      "utcDate": "2023-08-18T18:30:00Z",
-
-    ## -- 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 = UTC.strptime( m['utcDate'], '%Y-%m-%dT%H:%M:%SZ' )
     assert( utc.strftime( '%Y-%m-%dT%H:%M:%SZ' ) == m['utcDate'], 'utc time mismatch' )
 
 
+    ## do NOT add time if status is SCHEDULED
+    ##                        or POSTPONED for now
+    ##   otherwise assume time always present - why? why not?
+    ##
     ## 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' )
@@ -262,17 +225,20 @@ 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' )
-    end
 
+      ## 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
 
-    ## do NOT add time if status is SCHEDULED
-    ##                        or POSTPONED for now
-    ##   otherwise assume time always present - why? why not?
-
+      timezone =  if tz_abbr =~ /^[+-][0-9]+$/   ## only digits (no abbrev.)
+                     tz_offset
+                  else
+                      "#{tz_abbr}/#{tz_offset}"
+                  end
+    end
 
 
-    ## todo/fix: assert matchday is a number e.g. 1,2,3, etc.!!!
     recs << [stage,
              group,
              matchday,

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

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

data/lib/footballdata.rb

@@ -1,14 +1,8 @@
 ## 3rd party (our own)
-require 'season/formats'   ## add season support
+require 'football/timezones'  # note - pulls in season/formats, cocos & tzinfo
 require 'webget'           ## incl. webget, webcache, webclient, etc.
 
 
-require 'cocos'   ## check if webget incl. cocos ??
-
-
-require 'tzinfo'
-
-
 module Footballdata
   class Configuration
     #########
@@ -36,13 +30,13 @@ 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'
 
 require_relative 'footballdata/mods'
 require_relative 'footballdata/convert'
+require_relative 'footballdata/convert-score'
 require_relative 'footballdata/teams'
 
 

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: footballdata-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: season-formats
+  name: football-timezones
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cocos
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -116,9 +88,9 @@ files:
 - README.md
 - Rakefile
 - bin/fbdat
-- config/leagues.csv
-- config/timezones.csv
+- config/leagues_tier1.csv
 - lib/footballdata.rb
+- lib/footballdata/convert-score.rb
 - lib/footballdata/convert.rb
 - lib/footballdata/download.rb
 - lib/footballdata/leagues.rb
@@ -126,7 +98,6 @@ 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:

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

data/config/timezones.csv

@@ -1,27 +0,0 @@
-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/timezones.rb

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