sportdb-writers 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4c4a35292a78b32475f88dc7d43246c1782dcd82c15afed36aec0b6e1143e94
-  data.tar.gz: 6ec7868264b09d86494f86b2a30c7577212e7e262901df415b36d2bd3c4d4d06
+  metadata.gz: 3483a7e2f321970a2e970ba30e272127892013b61c63be66431a318d32b52c3f
+  data.tar.gz: 4d213ad75e6973aa6ef95bee7fb39a62bca69cd3261fc18e2bfcfc9a6b913b87
 SHA512:
-  metadata.gz: 6ca5e6e0ec314d83328900e159d6f561869ba4f93d160628b012c1f16b571df3b2d7c92fb418b74fcf474bf3fd8451c03590e629318309b4cb93ee2eaee7c491
-  data.tar.gz: 4ed5b4c8538c9438532fb80432a7c7087f3b84c991a38d4026a4e74981759093fed3d475d9191b2f28d6c3ae776de87c3826e1f80f7531e00da28f6d4a009a3d
+  metadata.gz: b7b00a033d247555ca57acc503c88de73111605738998a9e5b3ea4e53f0353b08df19cfa1f9d5c84a5ad22b5528ddb632ba927b4f0b53fb5493f5391732d3d13
+  data.tar.gz: 23cec6ae8fa9b9ca04cf2242c86f8310de76a191b5a66bc4f2cab09aff7ea5c3e0a0d312bfe582dd2150d344302bdabab592c9b1944385bd75ae86de2367d207

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.1.1
+### 0.2.0
 
 ### 0.0.1 / 2020-11-15
 

data/Manifest.txt

@@ -4,18 +4,17 @@ README.md
 Rakefile
 bin/fbgen
 bin/fbtxt
-lib/sportdb/leagues/leagues_at.rb
-lib/sportdb/leagues/leagues_de.rb
-lib/sportdb/leagues/leagues_eng.rb
-lib/sportdb/leagues/leagues_es.rb
-lib/sportdb/leagues/leagues_europe.rb
-lib/sportdb/leagues/leagues_it.rb
-lib/sportdb/leagues/leagues_mx.rb
-lib/sportdb/leagues/leagues_south_america.rb
-lib/sportdb/leagues/leagues_world.rb
+config/leagues_america.csv
+config/leagues_europe.csv
+config/leagues_world.csv
+config/openfootball.csv
+lib/sportdb/fbgen/github.rb
+lib/sportdb/fbgen/github_config.rb
+lib/sportdb/fbgen/main.rb
+lib/sportdb/fbtxt/main.rb
 lib/sportdb/writers.rb
-lib/sportdb/writers/github.rb
 lib/sportdb/writers/goals.rb
+lib/sportdb/writers/league_config.rb
 lib/sportdb/writers/txt_writer.rb
 lib/sportdb/writers/version.rb
 lib/sportdb/writers/write.rb

data/bin/fbgen

@@ -6,94 +6,8 @@
 
 require 'sportdb/writers'
 
-require 'optparse'
 
-
-
-args=ARGV
-
-
-opts = {
-}
-
-parser = OptionParser.new do |parser|
-  parser.banner = "Usage: #{$PROGRAM_NAME} [options]"
-end
-parser.parse!( args )
-
-puts "OPTS:"
-p opts
-puts "ARGV:"
-p args
-
-
-### split args in datasets with leagues and seasons
-datasets = []
-
-
-args.each do |arg|
-   if arg =~ %r{^[0-9/-]+$}   ##  season
-       if datasets.empty?
-         puts "!! ERROR - league required before season arg; sorry"
-         exit 1
-       end
-
-       season = Season.parse( arg )  ## check season
-       datasets[-1][1] << season
-   else ## assume league key
-       key = arg.downcase
-       league_info = Writer::LEAGUES[ key ]
-
-       if league_info.nil?
-         puts "!! ERROR - no league found for >#{key}<; sorry"
-         exit 1
-       end
-
-       datasets << [key, []]
-   end
-end
-
-pp datasets
-
-
-datasets.each do |league_key, seasons|
-    seasons = [ Season('2024/25') ]   if seasons.empty?
-
-    puts "==> gen #{league_key} - #{seasons.size} seasons(s)..."
-
-    league_info = Writer::LEAGUES[ league_key ]
-    pp league_info
-
-    seasons.each do |season|
-      ### get matches
-      src_dir = "/sports/cache.wfb"
-      path = "#{src_dir}/#{season.to_path}/#{league_key}.csv"
-      puts "  ---> reading matches in #{path} ..."
-      matches = SportDb::CsvMatchParser.read( path )
-      puts "     #{matches.size} matches"
-
-      ## build
-      txt = SportDb::TxtMatchWriter.build( matches )
-      puts txt
-
-      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
-
-      buf = String.new
-      buf << "= #{league_name} #{season}\n\n"
-      buf << txt
-
-      ## note - repo_path moved!!!
-      ## repo_path    = league_info[ :path ]      # e.g. brazil or world/europe/portugal etc.
-      repo_path  = SportDb::GitHubSync::REPOS[ league_key ]
-
-      outpath = "./o/#{repo_path}/#{season.to_path}/#{basename}.txt"
-      write_text( outpath, buf )
-    end
-end
+Fbgen.main( ARGV )
 
 
 puts "bye"

data/bin/fbtxt

@@ -9,44 +9,9 @@
 
 require 'sportdb/writers'
 
-require 'optparse'
 
+Fbtxt.main( ARGV )
 
 
-args=ARGV
-
-
-opts = {
-}
-
-parser = OptionParser.new do |parser|
-  parser.banner = "Usage: #{$PROGRAM_NAME} [options]"
-end
-parser.parse!( args )
-
-puts "OPTS:"
-p opts
-puts "ARGV:"
-p args
-
-
-matches = []
-
-## step 1 - get all matches via csv
-args.each do |arg|
-   path = arg
-   puts "==> reading matches in #{path} ..."
-   more_matches = SportDb::CsvMatchParser.read( path )
-   matches += more_matches
-end
-
-puts "#{matches.size} matches"
-puts
-
-
-txt = SportDb::TxtMatchWriter.build( matches )
-puts txt
-puts
-
 puts "bye"
 

data/config/leagues_america.csv

@@ -0,0 +1,6 @@
+key,     name,                      basename,       start_season, end_season, comments
+
+ar.1,    Argentina Primera Division, 1-primeradivision,,,
+br.1,    Brasileiro Série A,         1-seriea,,,
+
+mx.1,    Liga MX,                    1-ligamx,,,    ## note: basename gets overwritten by stages e.g. 1-apertura or 1-clausura

data/config/leagues_europe.csv

@@ -0,0 +1,94 @@
+key,     name,                      basename,       start_season, end_season, comments
+
+at.1,     Österr. Bundesliga,        1-bundesliga,,,
+at.2,     Österr. 2. Liga,           2-liga2,        2018/19,,
+at.2,     Österr. Erste Liga,        2-liga1,               , 2017/18,
+at.3.o,   Österr. Regionalliga Ost,  3-regionalliga-ost,,,
+at.cup,   ÖFB Cup,                   cup,,,
+
+
+de.1,         Deutsche Bundesliga,           1-bundesliga,,,
+de.2,         Deutsche 2. Bundesliga,        2-bundesliga2,,,
+de.3,         Deutsche 3. Liga,              3-liga3,,,
+de.4.bayern,  Deutsche Regionalliga Bayern,  4-regionalliga-bayern,,,
+de.4.n,       Deutsche Regionalliga Nord,    4-regionalliga-nord,,,
+de.4.no,      Deutsche Regionalliga Nordost, 4-regionalliga-nordost,,,
+de.4.w,       Deutsche Regionalliga West,    4-regionalliga-west,,,
+de.4.sw,      Deutsche Regionalliga Südwest, 4-regionalliga-suedwest,,,
+de.cup,       DFB Pokal,                     cup,,,
+
+
+
+it.1,     Italian Serie A,           1-seriea,,,
+it.2,     Italian Serie B,           2-serieb,,,
+
+es.1,     Primera División de España,  1-liga,,,
+es.2,     Segunda División de España,  2-liga2,,,
+
+fr.1,     French Ligue 1,              1-ligue1,,,
+fr.2,     French Ligue 2,              2-ligue2,,,
+
+
+eng.1,    English Premier League,    1-premierleague,  1992/93,,
+eng.1,    English Division One,      1-division1,      1892/93,  1991/92,   ## start of division 1 & 2
+eng.1,    English Football League,   1-footballleague, 1888/89,  1891/92,   ## single league (no divisions)
+
+eng.2,    English Championship,      2-championship,   2004/05,,            ## rebranding divsion 1 => championship
+eng.2,    English Division One,      2-division1,      1992/93,  2003/04,   ## start of premier league
+eng.2,    English Division Two,      2-division2,      1892/93,  1991/92,   ## or use English Football League Second Division ???
+
+eng.3,    English League One,        3-league1,,,
+eng.4,    English League Two,        4-league2,,,
+eng.5,    English National League,   5-nationalleague,,,
+eng.cup,  English FA Cup,            facup,,,
+
+
+hu.1,     Hungarian NB I,             1-nbi,,,
+
+gr.1,     Super League Greece,        1-superleague,,,
+
+pt.1,     Portuguese Primeira Liga,   1-primeiraliga,,,
+pt.2,     Portuguese Segunda Liga,    2-segundaliga,,,
+
+ch.1,     Swiss Super League,         1-superleague,,,
+ch.2,     Swiss Challenge League,     2-challengeleague,,,
+ch.cup,   Swiss Cup,                  cup,,,
+
+
+tr.1,     Turkish Süper Lig,          1-superlig,,,
+tr.2,     Turkish 1. Lig,             2-lig1,,,
+
+is.1,     Iceland Urvalsdeild,        1-urvalsdeild,,,
+
+sco.1,    Scottish Premiership,       1-premiership,,,
+
+ie.1,     Irish Premier Division,     1-premierdivision,,,
+
+fi.1,     Finland Veikkausliiga,      1-veikkausliiga,,,
+
+se.1,     Sweden Allsvenskan,         1-allsvenskan,,,
+se.2,     Sweden Superettan,          2-superettan,,,
+
+no.1,     Norwegian Eliteserien,       1-eliteserien,,,
+dk.1,     Denmark Superligaen,         1-superligaen,,,
+
+lu.1,     Luxembourger First Division,   1-nationaldivision,,,
+
+be.1,     Belgian First Division A,   1-firstdivisiona,,,
+
+nl.1,     Dutch Eredivisie,    1-eredivisie,,,
+
+cz.1,    Czech First League,    1-firstleague,,,
+sk.1,    Slovakia First League,  1-superliga,,,
+hr.1,    Croatia 1. HNL,          1-hnl,,,
+
+pl.1,    Poland Ekstraklasa,    1-ekstraklasa,,,
+
+ro.1,    Romanian Liga 1,     1-liga1,,,
+
+ua.1,    Ukraine Premier League,  1-premierleague,,,
+
+ru.1,    Russian Premier League,   1-premierliga,,,
+ru.2,    Russian 1. Division,      2-division1,,,
+
+

data/config/leagues_world.csv

@@ -0,0 +1,4 @@
+key,     name,                      basename,       start_season, end_season, comments
+
+cn.1,    Chinese Super League,      1-superleague,,,
+jp.1,    Japan J1 League,           1-j1league,,,

data/config/openfootball.csv

@@ -0,0 +1,52 @@
+key,  path
+
+at,   austria
+
+de,   deutschland
+eng,  england
+es,   espana
+it,   italy
+
+fr,   europe/france
+
+hu, europe/hungary
+gr, europe/greece
+pt, europe/portugal
+
+ch, europe/switzerland
+
+tr, europe/turkey
+
+is,   europe/iceland
+sco,  europe/scotland
+ie,  europe/ireland
+
+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
+
+sk,   europe/slovakia
+hr,  europe/croatia
+pl,   europe/poland
+
+ro,  europe/romania
+
+ua,  europe/ukraine
+
+ru,  europe/russia
+
+
+mx, mexico
+
+ar, south-america/argentina
+br, south-america/brazil
+
+cn,  world/asia/china
+jp,  world/asia/japan
+

data/lib/sportdb/fbgen/github.rb

@@ -0,0 +1,83 @@
+
+module Fbgen
+
+###
+## todo/fix:
+##   add -i/--interactive flag
+##     will prompt yes/no  before git operations (with consequences)!!!
+
+
+
+class GitHubSync
+
+########
+##  (auto)default to Writer.config.out_dir - why? why not?
+##
+##    note - is monotree (that is, requires openfootball/england etc.
+##                  for repo pathspecs)
+def self.root()  @root || "/sports"; end
+def self.root=( dir ) @root = dir; end
+## use root_dir (alias) - why? why not?
+
+
+def initialize( repos )
+    @repos = repos
+end
+
+
+def git_push_if_changes
+   message = "auto-update week #{Date.today.cweek}"  ## add /#{Date.today.cday - why? why not?
+   puts message
+
+   @repos.each do |pathspec|
+       _git_push_if_changes( pathspec, message: message )
+   end
+end
+
+def git_fast_forward_if_clean
+    @repos.each do |pathspec|
+      _git_fast_forward_if_clean( pathspec )
+    end
+end
+
+
+
+## todo/fix: rename to something like
+##    git_(auto_)commit_and_push_if_changes/if_dirty()
+
+def _git_push_if_changes( pathspec, message: )
+    path = "#{self.class.root}/#{pathspec}"
+
+    Gitti::GitProject.open( path ) do |proj|
+      puts ''
+      puts "###########################################"
+      puts "## trying to commit & push repo in path >#{path}<"
+      puts "Dir.getwd: #{Dir.getwd}"
+      output = proj.changes
+      if output.empty?
+        puts "no changes found; skipping commit & push"
+      else
+        proj.add( '.' )
+        proj.commit( message )
+        proj.push
+      end
+    end
+end
+
+
+def _git_fast_forward_if_clean( pathspec )
+    path = "#{self.class.root}/#{pathspec}"
+
+    Gitti::GitProject.open( path ) do |proj|
+      output = proj.changes
+      unless  output.empty?
+        puts "FAIL - cannot git pull (fast-forward) - working tree has changes:"
+        puts output
+        exit 1
+      end
+
+      proj.fast_forward
+    end
+end
+end  # class GitHub
+end  # module Fbgen

data/lib/sportdb/fbgen/github_config.rb

@@ -0,0 +1,97 @@
+
+module Fbgen
+class GitHubConfig
+
+  ## map leagues to repo+path
+  ##  e.g.   fr.1   => europe/france
+  ##         eng..1 => england
+  ##
+  ##  for other than openfootball (default)
+  ## use @
+  ##   e.g.    myorg@austria
+  ##           austria@myorg ??
+  ##
+  ##           myorg@europe/france
+  ##            europe/france@myorg
+
+
+def self.read( path )
+    recs = read_csv( path )
+    new( recs )
+end
+
+def initialize( recs=nil )
+    @table = {}
+    add( recs )  if recs
+end
+
+
+def add( recs )
+  recs.each do |rec|
+    path = rec['path']  ## use pathspec - why? why not?
+                        ##  or repospec or such
+
+    ## auto-expand to openfootball as default org if no @ specified
+    owner, path = if path.index( '@')
+                      path.split( '@', 2 )
+                  else
+                      ['openfootball', path ]
+                  end
+    name, path = path.split( '/', 2 )
+
+
+    ## openfootball@europe/france
+    ##    =>
+    ##    owner: openfootball
+    ##    name:  europe
+    ##    path:  france
+    ##
+    ## openfootball@austria
+    ##    =>
+    ##    owner: openfootball
+    ##    name:  austria
+    ##    path:  nil
+    @table[ rec['key'] ] = {  'owner' => owner, ## (required)
+                              'name'  => name,  ## (required)
+                              'path'  => path   ## extra/inner/inside/local path (optional)
+                            }
+  end
+end
+
+
+##
+## todo/fix:
+##   make key lookup more flexible
+##    auto-add more variants!!!
+##       e.g. at.1  AT1, AT or such
+##
+
+## find (full) record by key
+def find( key )
+  key = key.to_s.downcase
+
+  ## first check for 1:1 match
+  rec = @table[key]
+  if rec.nil?
+     ## try match by (country / first) code
+     ##   split by .
+     key, _ = key.split( '.' )
+     rec = @table[key]
+  end
+
+  rec
+end
+alias_method :[], :find  ## keep alias - why? why not?
+
+
+def find_repo( key )
+   rec = _find( key )
+
+   rec ? "#{rec['owner']}/#{rec['name']}" : nil
+end
+
+end # class GitHubConfig
+end # module Fbgen
+
+
+