sportdb-writers 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd53f29e4c9fc243e9a5c5ba34f0e603931317de512fd5e6c397525e49c5b773
-  data.tar.gz: 5d1a596224394e46ec4ad8b8466e925c1a916f5aeb4bc29fba1db55cd5bb7822
+  metadata.gz: 7e6c426324cdb4d759fd741cc287435dc10a16f7aabbaf699295132c0f38a6e1
+  data.tar.gz: 70b7dc48369a7b822cd2b800dcb9dc05f1188cf18559bb43a5654d3fd63dc304
 SHA512:
-  metadata.gz: c22afc771f1dc08681bb6a201c870b5e9688cf132a2b8d7d789fcefa1748569fdc6701e1f6b2d83f1da8c55c23bc6b7a0ba56903c2e881a65087a99f493181bb
-  data.tar.gz: ee81dcb5964247503b0d484889b12a122416fb3d0fd8f42cb712065d75501bf1cd18715e3d4b57b202a31a0ec9f6f5624a536b45552d3a64b29e9baffd65d9db
+  metadata.gz: 9f78877c0169b086b0e3b8d0e5357b0b24a729a12f294a5344d7797ffe6f7be29eb0d4ed7557181429c07b959c4ddce7528bbdeb272e7e8da4396a5d037c17f0
+  data.tar.gz: 24502014e49eb97679ab177b893f44a375f796185155da9ee4a5e7d705d5d3e43e171b14a6c494ef3cb3087961f769fc09aa646e4e48a50cc6b426d961839789

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.1.0
+### 0.1.2
 
 ### 0.0.1 / 2020-11-15
 

data/Manifest.txt

@@ -2,18 +2,17 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
-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
+bin/fbgen
+bin/fbtxt
+config/leagues_america.csv
+config/leagues_europe.csv
+config/leagues_world.csv
+config/openfootball.csv
 lib/sportdb/writers.rb
 lib/sportdb/writers/github.rb
+lib/sportdb/writers/github_config.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/Rakefile

@@ -18,15 +18,13 @@ Hoe.spec 'sportdb-writers' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['sportdb-formats'],    # , '>= 1.0.0'],
+    ['sportdb-quick'],
     ['gitti'],
-    ['cocos'],   ### fix - move upstream (incl. in sportdb-format)
   ]
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   required_ruby_version: '>= 2.2.2'
+   required_ruby_version: '>= 3.1.0'
   }
-
 end

data/bin/fbgen

@@ -0,0 +1,183 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib bin/fbgen
+
+
+require 'sportdb/writers'
+
+require 'optparse'
+
+
+
+args=ARGV
+
+
+opts = {
+  source_path: [],
+  push:     false,
+  dry:      false,  ## dry run (no write)
+  debug:    true,
+}
+
+
+
+parser = OptionParser.new do |parser|
+  parser.banner = "Usage: #{$PROGRAM_NAME} [options] [args]"
+
+    parser.on( "-p", "--push",
+               "fast forward sync and commit & push changes to git repo - default is (#{opts[:push]})" ) do |push|
+      opts[:push] = push
+    end
+    parser.on( "--dry",
+                "dry run; do NOT write - default is (#{opts[:dry]})" ) do |dry|
+      opts[:dry] = dry
+    end
+    parser.on( "-q", "--quiet",
+               "less debug output/messages - default is (#{!opts[:debug]})" ) do |debug|
+      opts[:debug] = !debug
+    end
+end
+parser.parse!( args )
+
+
+
+if opts[:source_path].empty? &&
+  File.exist?( '/sports/cache.api.fbdat')  &&
+  File.exist?( '/sports/cache.wfb' )
+ opts[:source_path] << '/sports/cache.api.fbdat'
+ opts[:source_path] << '/sports/cache.wfb'
+end
+
+
+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
+
+
+
+def find_file( filename, path: )
+   path.each do |src_dir|
+      path = "#{src_dir}/#{filename}"
+      return path   if File.exist?( path )
+   end
+
+   ##  fix - raise file not found error!!!
+   nil  ## not found - raise filenot found error - why? why not?
+end
+
+
+source_path = opts[:source_path]
+source_path = ['.']    if source_path.empty?  ## use ./ as default
+
+
+root_dir =  if opts[:push]
+               SportDb::GitHubSync.root   # e.g. "/sports"
+            else
+               './o'
+            end
+
+
+puts "  (output) root_dir: >#{root_dir}<"
+
+
+sync  = if opts[:push]
+             repos = SportDb::GitHubSync.find_repos( datasets )
+             puts "  #{repos.size} repo(s):"
+             pp repos
+             SportDb::GitHubSync.new( repos )
+        else
+              nil
+        end
+puts "  sync:"
+pp sync
+
+sync.git_fast_forward_if_clean      if sync
+
+
+
+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
+
+      filename = "#{season.to_path}/#{league_key}.csv"
+      path = find_file( filename, path: source_path )
+
+      if path.nil?
+        puts "!! no source found for #{filename}; sorry"
+        exit 1
+      end
+
+      puts "  ---> reading matches in #{path} ..."
+      matches = SportDb::CsvMatchParser.read( path )
+      puts "     #{matches.size} matches"
+
+      ## build
+      txt = SportDb::TxtMatchWriter.build( matches )
+      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
+
+      buf = String.new
+      buf << "= #{league_name} #{season}\n\n"
+      buf << txt
+
+      repo  = SportDb::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"
+      if opts[:dry]
+        puts "   (dry) writing to >#{outpath}<..."
+      else
+        write_text( outpath, buf )
+      end
+    end
+end
+
+
+sync.git_push_if_changes   if sync
+
+
+puts "bye"

data/bin/fbtxt

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib bin/fbtxt
+
+# $LOAD_PATH.unshift( '../../../sportdb/sport.db/parser/lib' )
+# $LOAD_PATH.unshift( '../../../sportdb/sport.db/sportdb-structs/lib' )
+# $LOAD_PATH.unshift( '../../../sportdb/sport.db/quick/lib' )
+
+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
+
+
+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,85 @@
+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.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,,,
+
+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/writers/github.rb

@@ -6,118 +6,47 @@ module SportDb
 ##   add -i/--interactive flag
 ##     will prompt yes/no  before git operations (with consequences)!!!
 
+
+
 class GitHubSync
 
-  ## map leagues to repo+path
-  ##  e.g.   fr.1   => europe/france
-  ##         eng..1 => england
-REPOS = {
-  'at.1' =>  'austria',
-  'at.2' =>  'austria',
-  'at.3.o' =>   'austria',
-  'at.cup' =>   'austria',
-
-  'de.1' =>  'deutschland',
-  'de.2' =>  'deutschland',
-  'de.3' =>  'deutschland',
-  'de.cup' => 'deutschland',
-
-  'eng.1' =>  'england',
-'eng.2' =>  'england',
-'eng.3' =>  'england',
-'eng.4' =>  'england',
-'eng.5' =>  'england',
-'eng.cup' => 'england',   # English FA Cup
- 
-'es.1' => 'espana',
-'es.2' => 'espana',
-
-  'fr.1' =>  'europe/france',
-  'fr.2' =>  'europe/france',
-  
-  'hu.1' => 'europe/hungary',
-  'gr.1' => 'europe/greece',
-  'pt.1' => 'europe/portugal',
-  'pt.2' => 'europe/portugal',
-  
-  'ch.1' => 'europe/switzerland',
-  'ch.2' => 'europe/switzerland',
-
-  'tr.1' => 'europe/turkey',
-  'tr.2' => 'europe/turkey',
-  
-  'is.1' => 'europe/iceland',
-  'sco.1' =>  'europe/scotland',
-  'ie.1' => 'europe/ireland',
-
-  'fi.1' =>  'europe/finland',
-   'se.1'  =>  'europe/sweden',
-   'se.2'  =>  'europe/sweden',
-   'no.1'  =>  'europe/norway',
-   'dk.1'  =>  'europe/denmark',
-   
-   'lu.1'  =>  'europe/luxembourg',
-   'be.1'  =>  'europe/belgium',
-    'nl.1' =>  'europe/netherlands',
-    'cz.1' =>  'europe/czech-republic',
-               
-  'sk.1' =>   'europe/slovakia',
-  'hr.1'  =>  'europe/croatia',
-  'pl.1' =>   'europe/poland',
-  
-  'ro.1' =>  'europe/romania',
-  
-  'ua.1' =>  'europe/ukraine',
-
-   'ru.1' =>  'europe/russia',
-    'ru.2' => 'europe/russia',
-
-    'it.1' =>  'italy',
-    'it.2' =>  'italy',
-
-    'mx.1' => 'mexico',
-
-    'ar.1' => 'south-america/argentina',
-    'br.1' => 'south-america/brazil',
-
-    'cn.1' =>  'world/asia/china',
-    'jp.1' =>  'world/asia/japan',
-}
-
-
-
-######## 
+########
 ##  (auto)default to Writer.config.out_dir - why? why not?
 ##
-##    note - is root for org (NOT monotree for now - why?`why not?)
-def self.root()  @root || "/sports/openfootball"; end
-def self.root=( dir ) @root = dir; end  
+##    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( datasets )
-    @repos = _find_repos( datasets )
+def initialize( repos )
+    @repos = repos
 end
 
 
-def git_push_if_changes 
-    _git_push_if_changes( @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
-   _git_fast_forward_if_clean( @repos )
+    @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( names )   ## optenfootball repo names e.g. world, england, etc.
-  message = "auto-update week #{Date.today.cweek}"  ## add /#{Date.today.cday - why? why not?
-  puts message
-
-  names.each do |name|
-    path = "#{self.class.root}/#{name}"
+def _git_push_if_changes( pathspec, message: )
+    path = "#{self.class.root}/#{pathspec}"
 
     Gitti::GitProject.open( path ) do |proj|
       puts ''
@@ -133,13 +62,11 @@ def _git_push_if_changes( names )   ## optenfootball repo names e.g. world, engl
         proj.push
       end
     end
-  end
 end
 
 
-def _git_fast_forward_if_clean( names )
-  names.each do |name|
-    path = "#{self.class.root}/#{name}"
+def _git_fast_forward_if_clean( pathspec )
+    path = "#{self.class.root}/#{pathspec}"
 
     Gitti::GitProject.open( path ) do |proj|
       output = proj.changes
@@ -151,45 +78,6 @@ def _git_fast_forward_if_clean( names )
 
       proj.fast_forward
     end
-  end
 end
-
-
-## todo/check: find a better name for helper?
-## note: datasets of format
-##  
-## DATASETS = [
-##   ['it.1',    %w[2020/21 2019/20]],
-##  ['it.2',    %w[2019/20]],
-##  ['es.1',    %w[2019/20]],
-##  ['es.2',    %w[2019/20]],
-## ]
-
-
-def _find_repos( datasets )
-    repos = []
-    datasets.each do |dataset|
-      league_key = dataset[0]
-      path  = REPOS[ league_key ]
-      ## pp path
-      if path.nil?
-         puts "!! ERROR - no repo path found for league >#{league_key}<; sorry"
-         exit 1
-      end
-  
-      ## auto-add
-      ##   openfootball/ org here 
-      ##  and keep root "generic" to monoroot - why? why not?
-
-      ## use only first part e.g. europe/belgium => europe
-      repos << path.split( '/' )[0]
-    end
-    pp repos
-    repos.uniq   ## note: remove duplicates (e.g. europe or world or such)
-end
-  
-
-  
-
 end  # class GitHub
 end  # module SportDb