fbup 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d115aef45d2af98f2e9888dec2ac6efc7dac781eb4caf5066b31ab6dbfd0f391
-  data.tar.gz: 1c435a5430e5966b96783c0c0dc24825fc299cb293b4fb207c1c38185865d1db
+  metadata.gz: c0cc7c6bdb92fe41bd89ddf67258bf59ce8feb70ad16c9b1908fdda37f165c03
+  data.tar.gz: 3d7cc168bd623108f549e4c531738350065a1c7743ffd42ab0a7d7e66d89c8d1
 SHA512:
-  metadata.gz: 0e4ab909468866bab66ccbc20cdabe583068712b97a24358b57d91188c6e962dfadae7ec75cf405b261786fbc2349a0ea944f00f1270638f7c280e5b601bb844
-  data.tar.gz: edc46e659a27cfdfb00ef71c22ea2957690c2a441549984a1e2f8df81792279ac3d448071057718b2c2abac0fc62f3d2da43b448e5ce37c09e6e48357e59adff
+  metadata.gz: 4851fcc456089aa461f5fa01f2866c414acfa5ed75e921e58e28224fa2a23e8190e581627d36637732d4065a7a01d06f1d7c0843b26f9e7d5e3154dc1041f1c4
+  data.tar.gz: 5c38c8ea0aa370ad42e1f9a7be5b2df211bd0989af16d14efe7a634ec5ffe07c10884a4ff672035ae396a8ce8dd0ded746ee136c8bacf63806ccda4dc27ca856

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.1.3
+### 0.2.1
 ### 0.0.1 / 2024-12-29
 
 * Everything is new. First release.

data/Manifest.txt

@@ -3,9 +3,11 @@ Manifest.txt
 README.md
 Rakefile
 bin/fbup
+config/leagues.csv
 config/openfootball.csv
 lib/fbup.rb
 lib/fbup/github.rb
 lib/fbup/github_config.rb
+lib/fbup/league_config.rb
 lib/fbup/main.rb
 lib/fbup/version.rb

data/Rakefile

@@ -21,8 +21,8 @@ Hoe.spec 'fbup' do
 
   self.extra_deps = [
        ['gitti',              '>= 0.6.1'],
-       ['sportdb-writers',    '>= 0.4.1'],
-       ['football-timezones', '>= 0.3.0'],
+       ['sportdb-writers',    '>= 0.4.3'],
+       ['leagues',            '>= 0.2.1'],
   ]
 
   self.spec_extras = {

data/bin/fbup

@@ -7,7 +7,7 @@
 
 
 ## note - quick hack - auto-add local football timezones
-$LOAD_PATH.unshift( '/sports/sportdb/sport.db/timezones/lib' )
+$LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
 $LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
 require 'fbup'
 

data/config/leagues.csv

@@ -0,0 +1,111 @@
+code,basename,start_season,end_season
+
+########
+### use a "custom" basename for "classic" leagues
+
+
+####
+##  /austria
+at.1,1-bundesliga,,
+## -- add new name - Erste Liga  => 2. Liga 
+at.2,2-liga2,2018/19,
+at.2,2-liga1,,2017/18
+at.3.o,3-regionalliga-ost,,
+at.3.m,3-regionalliga-mitte,,
+at.3.w,3-regionalliga-west,,
+at.3.sbg,3-regionalliga-salzburg,,
+at.3.t,3-regionalliga-tirol,,
+at.3.v,3-regionalliga-vorarlberg,,
+at.cup,cup,,
+
+####
+##  /deutschland
+de.1,1-bundesliga,,
+de.2,2-bundesliga2,,
+de.3,3-liga3,,
+de.cup,cup,,
+de.super,super,,
+de.4.nord,4-regionalliga-nord,,
+de.4.nordost,4-regionalliga-nordost,,
+de.4.west,4-regionalliga-west,,
+de.4.suedwest,4-regionalliga-suedwest,,
+de.4.bayern,4-regionalliga-bayern,,
+# -- add alternate keys for de.4
+#   todo/fix - find a way to add alternate keys (WITHOUT repeating basename) !!!
+de.4.n,4-regionalliga-nord,,
+de.4.no,4-regionalliga-nordost,,
+de.4.w,4-regionalliga-west,,
+de.4.sw,4-regionalliga-suedwest,,
+
+################
+##  /england
+eng.2,2-championship,2004/05,
+eng.3,3-league1,2004/05,
+eng.4,4-league2,2004/05,
+
+eng.1,1-premierleague,1992/93,
+eng.2,2-division1,1992/93,2003/04
+eng.3,3-division2,1992/93,2003/04
+eng.4,4-division3,1992/93,2003/04
+eng.5,5-nationalleague,1992/93,
+
+eng.1,1-division1,1892/93,1991/92
+eng.2,2-division2,1892/93,1991/92
+eng.3,3-division3,,1991/92
+eng.3.a,3-division3-north,,
+eng.3.b,3-division3-south,,
+eng.1,1-footballleague,1888/89,1891/92
+
+
+###
+##  fix - always use fa.cup and efl.cup - why? why not?
+eng.cup,facup,,     ## FA CuP
+eng.super,super,,    ## FA Community Shield
+eng.cup.l,eflcup,,   ## EFL Cup
+eng.cup.t,efltrophy,,  ## EFL Trophy
+eng.cup.t.ii,fatrophy,,  ## FA Trophy
+
+## -- add alternate codes / keys
+eng.fa.cup,facup,,    ## FA Cup
+eng.efl.cup,eflcup,,  ## EFL Cup
+
+
+#######
+## /espana
+es.1,1-liga,,
+es.2,2-liga2,,
+es.3,3-liga2b,,    ## Segunda División B
+es.cup,cup,,
+es.super,supercopa,,        ## check - use only super - why? why not?
+
+
+#####
+## /italy  
+it.1,1-seriea,,
+it.2,2-serieb,,
+it.3.a,3-seriec_a,,  ## North & Central West
+it.3.b,3-seriec_b,,  ## North & Central East
+it.3.c,3-seriec_c,,  ## South
+it.cup,cup,,
+it.super,super,,
+## it.cup.c    -- Italian Coppa Italia Serie C  
+
+
+#####
+##  /champions-league    - uefa incl. europa & conference
+uefa.cl,      cl,,
+uefa.champs,  cl,,
+uefa.el,      el,,
+uefa.europa,  el,,
+uefa.conf,    conf,,
+uefa.con,     conf,,
+
+#####
+##  /club-worldcup
+world.clubs,  clubworldcup,,
+world.club,   clubworldcup,,     
+##  - use world.clubs or club ??
+
+
+
+

data/config/openfootball.csv

@@ -131,12 +131,13 @@ jp,  world/asia/japan,
 kz,  world/asia/kazakhstan,
 
 il,  world/middle-east/israel,
+sa,  world/middle-east/saudi-arabia,
 
 
 mls,  world/north-america/major-league-soccer,
 
 
-mx,                world/north-america/mexico,
+mx,   world/north-america/mexico,
 
 
 ## fix/change concacaf.cl to concacaf.champs !!!
@@ -148,4 +149,11 @@ concacaf.champs, world/north-america/champions-league,
 au,   world/pacific/australia,
 
 
-world,   worldcup,      ## add custom  flag - why? why not?
+## use world.clubs or club ??
+world.clubs,  club-worldcup,   classic     ## use classic setup for now - why? why not?
+world.club,   club-worldcup,   classic   
+
+
+
+world,   worldcup,      ## add custom  flag - why? why not?
+

data/lib/fbup/github.rb

@@ -1,5 +1,5 @@
 
-module Fbup
+module Fbup   ### rename module to Up - why? why not?
 
 ###
 ## todo/fix:

data/lib/fbup/league_config.rb

@@ -0,0 +1,99 @@
+module Fbup
+
+####
+### check - rename to ExtraLeagueConfig or such - why? why not?
+
+class LeagueConfig 
+    
+def self.find_by( code:, season: )
+    ## return league code record/item or nil
+    builtin.find_by( code: code, season: season )
+end
+
+
+#####
+## (static) helpers
+def self.builtin
+   ## get builtin league code index (build on demand)
+   @leagues ||= begin
+        leagues = LeagueConfig.new
+        ['leagues',
+        ].each do |name|
+           recs = read_csv( "#{SportDb::Module::Fbup.root}/config/#{name}.csv" )
+           leagues.add( recs )
+        end
+        leagues
+   end
+   @leagues
+end
+
+
+def self.norm( code )      ## use norm_(league)code - why? why not?
+  ## norm league code
+  ##   downcase
+  ##   and remove all non-letters/digits e.g. at.1 => at1, at 1 => at1 etc.
+  ##                                            ö.1 => ö1
+  ##   note - allow unicode letters!!! 
+  ##    note - assume downcase works for unicode too e.g. Ö=>ö
+  ##           for now no need to use our own downcase - why? why not?
+
+  code.downcase.gsub( /[^\p{Ll}0-9]/, '' )
+end
+
+
+
+
+def initialize
+    @leagues = {}
+end    
+
+
+def add( recs )
+  recs.each do |rec|
+    key = LeagueConfig.norm( rec['code'] )
+    @leagues[ key ] ||= []
+
+    ## note: auto-change seasons to season object or nil
+    @leagues[ key ] << {  'code'         => rec['code'],
+                          'basename'     => rec['basename'],
+                          'start_season' => rec['start_season'].empty? ? nil : Season.parse( rec['start_season'] ),
+                          'end_season'   => rec['end_season'].empty?   ? nil : Season.parse( rec['end_season'] ),
+                       }
+  end
+end
+
+
+def find_by( code:, season: )
+  raise ArgumentError, "league code as string|symbol expected"  unless code.is_a?(String) || code.is_a?(Symbol)
+
+  ## return league code record/item or nil
+  ## check for alt code first
+  season = Season( season )
+  key    = LeagueCodes.norm( code )
+  rec    = nil
+
+  recs = @leagues[ key ] 
+
+  if recs
+    rec =  _find_by_season( recs, season )
+  end
+
+  rec   ## return nil if no code record/item found
+end
+
+
+def _find_by_season( recs, season )
+  recs.each do |rec|
+      start_season = rec['start_season']
+      end_season   = rec['end_season']
+      return rec  if (start_season.nil? || start_season <= season) &&
+                     (end_season.nil? || end_season >= season)
+  end
+  nil
+end
+
+
+end # class LeagueConfig
+
+
+end # module Fbup

data/lib/fbup/main.rb

@@ -115,17 +115,27 @@ puts "ARGV:"
 p args
 
 
+
+source_path = opts[:source_path]
+
+### get latest season with autofiller
+##     todo use new LeaguesetAutofiller class - why? why not?
+##    or move code of autofiller here - why? why not?
+##
+autofiller = ->(league_query) {           
+  Leagueset.autofiller( league_query, source_path: source_path )
+} 
+
 datasets =   if opts[:file]
-                  read_leagueset( opts[:file] )
+                  read_leagueset( opts[:file], autofill: autofiller )
              else
-                  parse_leagueset_args( args )
+                  parse_leagueset_args( args, autofill: autofiller )
              end
 
 puts "datasets:"
 pp datasets
 
 
-source_path = opts[:source_path]
 
 root_dir =  if opts[:test]
                opts[:test_dir]
@@ -147,18 +157,37 @@ pp sync
 
 sync.git_fast_forward_if_clean    if opts[:ffwd]
 
+
 ### step 0 - validate and fill-in seasons etc.
+##
+##  todo/fix - remove fill-in seasons from validate!!
+##                 use new autofill on init!!!
 datasets.validate!( source_path: source_path )
 
 
-datasets.each do |league_key, seasons|
-    puts "==> gen #{league_key} - #{seasons.size} seasons(s)..."
+##
+## note - use league_query (or league_qkey or _querykey) or such
+##                for user supplied key to compute/find the canoncial league code
+
+datasets.each do |league_query, seasons|
+    puts "==> gen #{league_query} - #{seasons.size} seasons(s)..."
 
-    league_info = find_league_info( league_key )
-    pp league_info
 
     seasons.each do |season|
-      filename = "#{season.to_path}/#{league_key}.csv"
+      ## note - league info requires season 
+      ##          PLUS use (canoncial) league code from info!!!
+      league_info = LeagueCodes.find_by( code: league_query, season: season )
+      pp league_info
+
+      league_code  = league_info[ 'code' ]
+      league_name  = league_info[ 'name' ]       # e.g. Brasileiro Série A
+
+      ### todo/fix - move basename out of league_info
+      ###               make it github/openfootball "legacy" code
+      ## basename     = league_info[ 'basename' ]   #.e.g  1-seriea
+  
+    
+      filename = "#{season.to_path}/#{league_code}.csv"
       path = find_file( filename, path: source_path )
 
       ### get matches
@@ -168,7 +197,7 @@ datasets.each do |league_key, seasons|
 
 
       ## get repo config for flags and more
-      repo  = GitHubSync::REPOS[ league_key ]
+      repo  = GitHubSync::REPOS[ league_code ]
       flags = repo['flags'] || {}
       classic_flag = flags['classic'] || false
 
@@ -184,18 +213,22 @@ datasets.each do |league_key, seasons|
       puts txt   if opts[:debug]
 
 
-      league_name  = league_info[ :name ]      # e.g. Brasileiro Série A
-      basename     = league_info[ :basename]   #.e.g  1-seriea
-
-      league_name =  league_name.call( season )   if league_name.is_a?( Proc )  ## is proc/func - name depends on season
-      basename    =  basename.call( season )      if basename.is_a?( Proc )  ## is proc/func - name depends on season
-
-
+   
+      basename = nil
       if classic_flag || opts[:classic]
-         ## do nothing 
+         league_config = LeagueConfig.find_by( code: league_query, season: season )
+         if league_config.nil?
+            puts "!! ERROR - basename league config required for classic format; no config found for #{league_query} #{season}; sorry"
+            exit 1
+         end
+         basename  = league_config['basename']        
       else 
-         ## add quick fix for new league name overwrites
-         league_name = LEAGUE_NAMES_V2[league_key] || league_name
+         ## change base name to league key
+         ##   todo - fix - make gsub smarter
+         ##    change at.cup to at_cup - why? why not?
+         basename = league_code.gsub( '.', '' )
+         ## bonus - add quick fix for new league name overwrites
+         league_name = LEAGUE_NAMES_V2[league_code] || league_name
       end
 
 
@@ -214,11 +247,7 @@ datasets.each do |league_key, seasons|
       outpath +=  if classic_flag || opts[:classic]
                      "/#{season.to_path}/#{basename}.txt"
                   else
-                     ## add season "inline" (to basename) or use dir
-                     ## change base name to league key
-                     ##   todo - fix - make gsub smarter
-                     ##    change at.cup to at_cup - why? why not?
-                     basename = league_key.gsub( '.', '' )
+                     ## note - add season "inline" (to basename) or use dir
                      "/#{season.to_path}_#{basename}.txt"
                   end
 

data/lib/fbup/version.rb

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

data/lib/fbup.rb

@@ -1,6 +1,6 @@
 
 require 'sportdb/writers'
-require 'football/timezones'   ## pulls-in find_league_info, etc.
+require 'leagues'   ## pulls-in find_league_info, etc.
 
 
 require 'optparse'    ## command-line processing; check if included updstream?
@@ -18,6 +18,7 @@ require_relative 'fbup/version'
 require_relative 'fbup/github_config'
 require_relative 'fbup/github'   ## github helpers/update machinery
 
+require_relative 'fbup/league_config'   ## for "classic" custom basenames e.g. eng.1 => 1-premierleague etc.
 
 require_relative 'fbup/main'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbup
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-26 00:00:00.000000000 Z
+date: 2025-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitti
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
-  name: football-timezones
+  name: leagues
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -103,10 +103,12 @@ files:
 - README.md
 - Rakefile
 - bin/fbup
+- config/leagues.csv
 - config/openfootball.csv
 - lib/fbup.rb
 - lib/fbup/github.rb
 - lib/fbup/github_config.rb
+- lib/fbup/league_config.rb
 - lib/fbup/main.rb
 - lib/fbup/version.rb
 homepage: https://github.com/sportdb/sport.db