fbup 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d55ede42bbe3e933365193d25054464d9226d1a5743dc9b4919ce47760faa68d
-  data.tar.gz: 2c759f0719ceed561a02d25818141cb57625ef60ca99f1f294c5e80e0b185d05
+  metadata.gz: '07096715a38cb0bcd17cd41f5904203118e2d25c0cb3d55f9a693e7e5697ea4c'
+  data.tar.gz: dad822c19b93b47455443d4f46d08ba8a43fd0ea75e7562bab792ef412e89fd8
 SHA512:
-  metadata.gz: ea4c01a1e01290360ebe48028225745c6b33d6ad2196af66846f6287a1a0bd2c6713c7026127a281caade87d8b2488c27c09e0c61d54a7992322d0b334b33d12
-  data.tar.gz: 5b6afe253dcabb81e23918dbb257104dcb3c25446f3a5ffdcd3e12553fd5dcf69995018f4476903c3ae5844fc00e3969afb84c0634d390063b743011553d7419
+  metadata.gz: 17a84b2d10d04d66c98920cf522f650fd2821eb8655465383e22494903c34052ba7ed6559212b4561832f5afa653ac31012ebaeac943dd0739c61026755c8f22
+  data.tar.gz: 7ac5c17ac2f5f5471a0a311db84c404d9d3212937466085d9be4b6b1a4d6b89e73d872ae844818386552c10243d4c1f34d8f062bc0c3ae6c4fd1d0eb02173128

data/CHANGELOG.md

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

data/Rakefile

@@ -20,8 +20,9 @@ Hoe.spec 'fbup' do
   self.licenses = ['Public Domain']
 
   self.extra_deps = [
-       ['sportdb-writers', '>= 0.4.0'],
-       ['gitti', '>= 0.6.1'],
+       ['gitti',              '>= 0.6.1'],
+       ['sportdb-writers',    '>= 0.4.1'],
+       ['football-timezones', '>= 0.3.0'],
   ]
 
   self.spec_extras = {

data/bin/fbup

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

data/config/openfootball.csv

@@ -1,117 +1,153 @@
-key,  path
+key,  path,  flags
 
-at,   austria
+## note - flags - defaults for now are   v2 | flat
+##
+##  v2       - v2 format (football.txt)
+##  flat     -   add season to basename (no season directory) 
+##                       e.g.  2023-24_at1.txt
+##  classic  -   use season directory AND league slug for basename
+##                       e.g. 2023-24/1-bundesliga.txt
+##
+##
+##  add archive flag  for using archive style names before 2000 or such - why? why not?
 
-de,   deutschland
-eng,  england
-es,   espana
-it,   italy
 
-fr,   europe/france
+at,   austria,           classic
 
-hu, europe/hungary
-gr, europe/greece
-pt, europe/portugal
+de,   deutschland,       classic
+eng,  england,           classic
+es,   espana,            classic 
+it,   italy,             classic
 
-ch, europe/switzerland
 
-tr, europe/turkey
+## todo/fix - add aliases WITHOUT repeating conifg - why? why not?
+uefa.cl,      champions-league,    classic
+uefa.champs,  champions-league,    classic
+uefa.el,      champions-league,    classic
+uefa.europa,  champions-league,    classic
+uefa.conf,    champions-league,    classic
+uefa.con,     champions-league,    classic
 
-is,   europe/iceland
-sco,  europe/scotland
-ie,  europe/ireland
 
-fi,  europe/finland
-se,  europe/sweden
-no,  europe/norway
-dk,  europe/denmark
+fr,   europe/france, 
 
-lu,  europe/luxembourg
-be,  europe/belgium
-nl,  europe/netherlands
-cz,  europe/czech-republic
+hu, europe/hungary,
+gr, europe/greece,
+pt, europe/portugal,
 
-sk,   europe/slovakia
-hr,  europe/croatia
-pl,   europe/poland
+ch, europe/switzerland,
 
-ro,  europe/romania
+tr, europe/turkey,
 
-ua,  europe/ukraine
+is,   europe/iceland,
+sco,  europe/scotland,
+ie,  europe/ireland,
 
-ru,  europe/russia
+fi,  europe/finland,
+se,  europe/sweden,
+no,  europe/norway,
+dk,  europe/denmark,
 
+lu,  europe/luxembourg,
+be,  europe/belgium,
+nl,  europe/netherlands,
+cz,  europe/czech-republic,
 
-al,  europe/albania
-ad,  europe/andorra
-by,  europe/belarus
-ba,  europe/bosnia-herzegovina   ## use bosnia-n-herzegovina ??
-bg,  europe/bulgaria
-cy,  europe/cyprus
-ee,  europe/estonia
-lv,  europe/latvia
-li,  europe/liechtenstein
-lt,  europe/lithuania
-mk,  europe/north-macedonia
-mt,  europe/malta
-md,  europe/moldova
-me,  europe/montenegro
+sk,   europe/slovakia,
+hr,  europe/croatia,
+pl,   europe/poland,
 
-sm,  europe/san-marino
-rs,  europe/serbia
-si,  europe/slovenia
+ro,  europe/romania,
 
-xk,  europe/kosovo
-kos, europe/kosovo
+ua,  europe/ukraine,
 
-am,  europe/armenia
-az,  europe/azerbaijan
-ge,  europe/georgia
-fo,  europe/faroe-islands
-gi,  europe/gibraltar
+ru,  europe/russia,
 
-wal, europe/wales
-nir, europe/northern-ireland
 
+al,  europe/albania,
+ad,  europe/andorra,
+by,  europe/belarus,
+ba,  europe/bosnia-herzegovina,      ## use bosnia-n-herzegovina ??
+bg,  europe/bulgaria,
+cy,  europe/cyprus,
+ee,  europe/estonia,
+lv,  europe/latvia,
+li,  europe/liechtenstein,
+lt,  europe/lithuania,
+mk,  europe/north-macedonia,
+mt,  europe/malta,
+md,  europe/moldova,
+me,  europe/montenegro,
 
+sm,  europe/san-marino,
+rs,  europe/serbia,
+si,  europe/slovenia,
 
-uefa.cl,      champions-league
-uefa.champs,  champions-league
-uefa.el,      champions-league
-uefa.europa,  champions-league
-uefa.conf,    champions-league
-uefa.con,     champions-league
 
-euro,       euro
+xk,  europe/kosovo,
+kos, europe/kosovo,
 
+am,  europe/armenia,
+az,  europe/azerbaijan,
+ge,  europe/georgia,
+fo,  europe/faroe-islands,
+gi,  europe/gibraltar,
 
+wal, europe/wales,
+nir, europe/northern-ireland,
 
-mx, mexico
 
 
-ar, south-america/argentina
-br, south-america/brazil
-co, south-america/colombia
+euro,       euro,
 
-copa.l,  south-america/copa-libertadores
-copa.s,  south-america/copa-libertadores
 
 
-eg,         africa/egypt
-ma,         africa/morocco
-dz,         africa/algeria
-afl,        africa/african-football-league
-caf.cl,     africa/champions-league
-caf.champs, africa/champions-league
 
 
-cn,  world/asia/china
-jp,  world/asia/japan
+ar, south-america/argentina,
+br, south-america/brazil,
+co, south-america/colombia,
 
-kz,  world/asia/kazakhstan
+copa.l,  south-america/copa-libertadores,
+copa.s,  south-america/copa-libertadores,
 
-il,  world/middle-east/israel
 
 
+###
+# world repo
 
-world,   worldcup
+eg,         world/africa/egypt,
+ma,         world/africa/morocco,
+dz,         world/africa/algeria,
+
+afl,        world/africa/african-football-league,
+caf.cl,     world/africa/champions-league,
+caf.champs, world/africa/champions-league,
+
+
+cn,  world/asia/china,
+jp,  world/asia/japan,
+
+kz,  world/asia/kazakhstan,
+
+il,  world/middle-east/israel,
+
+
+mls,  world/north-america/major-league-soccer,
+
+
+mx,                world/north-america/mexico,
+##  todo/check - why mx config is not enough?
+## mx.2.expansion,    world/north-america/mexico
+
+
+## fix/change concacaf.cl to concacaf.champs !!!
+concacaf.cl,     world/north-america/champions-league,
+concacaf.champs, world/north-america/champions-league,
+
+
+
+au,   world/pacific/australia,
+
+
+world,   worldcup,

data/lib/fbup/github_config.rb

@@ -55,7 +55,16 @@ def add( recs )
                               'name'  => name,  ## (required)
                               'path'  => path   ## extra/inner/inside/local path (optional)
                             }
+
+    ## check for/add flags
+      flags = rec['flags'].split( /[ ]*[|][ ]*/ )
+      ## generte hash
+      ##    e.g.   v2 | flat   => { 'v2' => true, 'flat' => true } etc.
+      flags = flags.map { |flag| [flag, true] }.to_h   
+      @table[ rec['key'] ]['flags'] = flags      if flags.size > 0
   end
+
+  
 end
 
 

data/lib/fbup/main.rb

@@ -1,5 +1,23 @@
 
 module Fbup
+
+LEAGUE_NAMES_V2 = {
+  'jp.1' => 'Japan | J1 League',
+  'cn.1' => 'China | Super League', 
+  'kz.1' => 'Kazakhstan | Premier League', 
+  'eg.1' => 'Egypt | Premiership',
+  'ma.1' => 'Morocco | Botola Pro 1',
+  'dz.1' => 'Algeria | Ligue 1', 
+  'il.1' => 'Israel | Premier League',
+  'au.1' => 'Australia | A-League',  
+############
+## international 
+##    note - will fetch team pages one-by-one too to get country (codes)
+  'afl'    =>  'African Football League',
+  'caf.cl' =>  'CAF Champions League', 
+} 
+
+
 def self.main( args=ARGV )
 
 opts = {
@@ -11,9 +29,15 @@ opts = {
   debug:    true,
   file:     nil,
   test_dir:  './o',
+
+  v1:       false,
+  classic:  false,
+  ## v2:       false,   ## v2 Football.TXT generation fromat
+  ## flat:     false,   ##  use "flat" naming convention for datafile
 }
 
 
+
 parser = OptionParser.new do |parser|
   parser.banner = "Usage: #{$PROGRAM_NAME} [options] [args]"
 
@@ -47,6 +71,18 @@ parser = OptionParser.new do |parser|
       opts[:debug] = false
     end
 
+    parser.on( "--v1",
+               "v1 text format - default is (#{opts[:v1]})" ) do |v1|
+      opts[:v1] = true
+    end
+
+    parser.on( "--classic",
+               "classic names; use season in directory NOT basename - default is (#{opts[:classic]})" ) do |classic|
+      opts[:classic] = true
+    end
+
+
+
     parser.on( "-I DIR", "--include DIR",
                 "add directory to (source) search path - default is (#{opts[:source_path].join(',')})") do |dir|
       opts[:source_path] += path
@@ -115,7 +151,6 @@ sync.git_fast_forward_if_clean    if opts[:ffwd]
 datasets.validate!( source_path: source_path )
 
 
-
 datasets.each do |league_key, seasons|
     puts "==> gen #{league_key} - #{seasons.size} seasons(s)..."
 
@@ -131,25 +166,61 @@ datasets.each do |league_key, seasons|
       matches = SportDb::CsvMatchParser.read( path )
       puts "     #{matches.size} matches"
 
+
+      ## get repo config for flags and more
+      repo  = GitHubSync::REPOS[ league_key ]
+      flags = repo['flags'] || {}
+      classic_flag = flags['classic'] || false
+
+
       ## build
-      txt = SportDb::TxtMatchWriter.build( matches )
+      txt =  if classic_flag || opts[:v1]
+               SportDb::TxtMatchWriter.build( matches )
+             else 
+               SportDb::TxtMatchWriter.build_v2( matches )
+             end
+
       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
 
+
+      if classic_flag || opts[:classic]
+         ## do nothing 
+      else 
+         ## add quick fix for new league name overwrites
+         league_name = LEAGUE_NAMES_V2[league_key] || league_name
+      end
+
+
+
       buf = String.new
       buf << "= #{league_name} #{season}\n\n"
       buf << txt
-
-      repo  = GitHubSync::REPOS[ league_key ]
+    
       repo_path = "#{repo['owner']}/#{repo['name']}"
       repo_path << "/#{repo['path']}"    if repo['path']  ## note: do NOT forget to add optional extra path!!!
 
-      outpath = "#{root_dir}/#{repo_path}/#{season.to_path}/#{basename}.txt"
+    
+      outpath = "#{root_dir}/#{repo_path}"
+
+
+      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( '.', '' )
+                     "/#{season.to_path}_#{basename}.txt"
+                  end
+
 
       if opts[:dry]
         puts "   (dry) writing to >#{outpath}<..."

data/lib/fbup/version.rb

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

data/lib/fbup.rb

@@ -1,5 +1,6 @@
 
 require 'sportdb/writers'
+require 'football/timezones'   ## pulls-in find_league_info, etc.
 
 
 require 'optparse'    ## command-line processing; check if included updstream?

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: fbup
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-29 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gitti
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: sportdb-writers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: gitti
+  name: football-timezones
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement