fbup 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68ab9d496c98e7322a20c75e1b7b351bff26cb684aa15f0e7150879183e0d6a2
-  data.tar.gz: '08e0a215cd0007e324f01da26a78c615ba44ce889a3da48bc62def771c1b0c90'
+  metadata.gz: c0cc7c6bdb92fe41bd89ddf67258bf59ce8feb70ad16c9b1908fdda37f165c03
+  data.tar.gz: 3d7cc168bd623108f549e4c531738350065a1c7743ffd42ab0a7d7e66d89c8d1
 SHA512:
-  metadata.gz: d9e1f3e2171f973847bab5f8b703da05fe94726b0be5b48510b9f04cd878baada565ef1345d163a1daa56f25195149592f67046c700ad6c96294118a52423a2a
-  data.tar.gz: 75d415e44856d90707a22ec178dc0c550a976ee450bb8eac64ffd938929a4927576659aad59a9d3facda7ccc3ecf8a0e05bffb7b789473b046ce2179df73a0d8
+  metadata.gz: 4851fcc456089aa461f5fa01f2866c414acfa5ed75e921e58e28224fa2a23e8190e581627d36637732d4065a7a01d06f1d7c0843b26f9e7d5e3154dc1041f1c4
+  data.tar.gz: 5c38c8ea0aa370ad42e1f9a7be5b2df211bd0989af16d14efe7a634ec5ffe07c10884a4ff672035ae396a8ce8dd0ded746ee136c8bacf63806ccda4dc27ca856

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.2.0
+### 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'],
-       ['leagues',            '>= 0.1.1'],
+       ['sportdb-writers',    '>= 0.4.3'],
+       ['leagues',            '>= 0.2.1'],
   ]
 
   self.spec_extras = {

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 !!!

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

@@ -159,6 +159,9 @@ 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 )
 
 
@@ -181,7 +184,7 @@ datasets.each do |league_query, seasons|
 
       ### todo/fix - move basename out of league_info
       ###               make it github/openfootball "legacy" code
-      basename     = league_info[ 'basename' ]   #.e.g  1-seriea
+      ## basename     = league_info[ 'basename' ]   #.e.g  1-seriea
   
     
       filename = "#{season.to_path}/#{league_code}.csv"
@@ -211,11 +214,20 @@ datasets.each do |league_query, seasons|
 
 
    
-
+      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
+         ## 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
 
@@ -235,11 +247,7 @@ datasets.each do |league_query, 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_code.gsub( '.', '' )
+                     ## note - add season "inline" (to basename) or use dir
                      "/#{season.to_path}_#{basename}.txt"
                   end
 

data/lib/fbup/version.rb

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

data/lib/fbup.rb

@@ -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.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-02 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: leagues
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        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