sportdb-parser 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eadc79627364072a1d05801fec096aca27e914f214639c4bbe6bbffca2acab0d
-  data.tar.gz: f052a6d668246082d9fbcc5b90c71b440048080dc423f9428a4560591e797080
+  metadata.gz: 820e285e928c8a4067faeee17a31201059e1a8c507430731c79fb7a2772d90a8
+  data.tar.gz: c7f83fcc6170f1b73280b175e95f2ebd6b262c3e6f6ec7615109bad554ed3c19
 SHA512:
-  metadata.gz: 394f74c596ad1a624d626757972911eee7e0b009df66d5cac7ed1508cb3b056ece6f7fbc1d3c310468d5d065ae22ba18a28d7f8992f333767f20279eb5ce2f78
-  data.tar.gz: ecaa4a25b3552e69013dea0cc9c87a91b3409cd02e86302f4387e658de6cdfadba2c82c7c31935d4f7c62aaab187a25ce6e85f9dc4239faa346838f5be8dce7b
+  metadata.gz: 2d0c8adc9e7406dcdfa9b96e1e9c5c9167cf7ba633830842775923f059bdf1b1bf833901020bb4e63eb786470cef2828265224e2a81bd8de090668d86b34d8ea
+  data.tar.gz: e591914f764fa0f2d27e00eda67673fc673734291b88f992bb8d1fe933974536536dde3ccf475522040f7ba9a2e257e8d70776796cf7a44e2ad8cf690ce50961

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.3.8
+### 0.4.0
 
 ### 0.0.1 / 2024-07-12
 

data/Manifest.txt

@@ -2,17 +2,13 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
-bin/fbtok
 config/rounds_de.txt
 config/rounds_en.txt
 config/rounds_es.txt
 config/rounds_misc.txt
 config/rounds_pt.txt
 lib/sportdb/parser.rb
-lib/sportdb/parser/fbtok/main.rb
 lib/sportdb/parser/lang.rb
-lib/sportdb/parser/linter.rb
-lib/sportdb/parser/opts.rb
 lib/sportdb/parser/outline_reader.rb
 lib/sportdb/parser/parser.rb
 lib/sportdb/parser/token-date.rb

data/config/rounds_de.txt

@@ -10,17 +10,32 @@ Spiele            # in 2017/uy.1.txt -- double check if missing something
                   # in 1960-61/it.1.txt
 
 
+10. Runde
+
+
 Zwischenrunde
 
 Sechzehntelfinale
 Platzierungsspiel
 
 Qualifikation
+Qualifikation Copa Lib.
 Qual. 3. Runde
 
+
 2. Aufstieg Halbfinale
 2. Aufstieg Finale
 
+
+Halbfinale Gruppe A
+Halbfinale Gruppe B
+
+Entscheidungsspiele Abstieg
+
+Trostrunde Finale
+Trostrunde Halbfinale
+
+
 Playoff-Runde
 Relegation
 Aufstieg
@@ -43,6 +58,7 @@ Direkter Abstieg
 7. Platz
 9. Platz
 11. Platz
+13. Platz
 
 5.-8. Platz Playoffs
 9.-12. Platz Playoffs
@@ -53,11 +69,27 @@ Entscheidung 1. Runde
 Entscheidung 2. Runde
 
 
-Zwischenrunde Gr. B        ## move to group_de - why? why not?
 1. Runde Gruppe 1
 1. Runde Gruppe 2
 
 
+Zwischenrunde Gr. A   ## move to group_de - why? why not?
+Zwischenrunde Gr. B
+Zwischenrunde Gr. C
+Zwischenrunde Gr. D
+
+
+Vorrunde Gr. A
+Vorrunde Gr. B
+Vorrunde Gr. C
+Vorrunde Gr. D
+Vorrunde Gr. E
+Vorrunde Gr. F
+Vorrunde Gr. G
+Vorrunde Gr. H
+
+
+
 ### todo/fix
 ###   move to group - why? why not?
 Gruppe 1

data/config/rounds_en.txt

@@ -13,3 +13,10 @@ Wildcard
 Elimination Final
 Quadrangular
 
+Major Semi-Final
+Minor Semi-Final
+
+
+## keep weirdo matchday ??
+Matchday 0    ## in 2003-04/az.1.txt
+

data/config/rounds_es.txt

@@ -11,9 +11,13 @@ Final Segunda Ronda
 Gran Final
 
 Interzone
-Zone A
+Zona A
 Zona B
 
 Final de Grupos
 Repechaje
 
+Copa Libertadores
+Copa Sudamericana
+
+

data/config/rounds_misc.txt

@@ -16,3 +16,10 @@ Replay 1e ronde
 Replay 2e ronde
 Replay halve finale
 Replay finale
+
+Beslissingswedstrijd
+Groep 15
+Groep 17
+Groep 18
+Groep 19
+Groep 20

data/lib/sportdb/parser/version.rb

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

data/lib/sportdb/parser.rb

@@ -3,9 +3,6 @@ require 'cocos'
 require 'season/formats'  # e.g. Season() support machinery
 
 
-## more stdlibs
-require 'optparse'   ## check - already auto-required in cocos? keep? why? why not?
-
 
 
 ####
@@ -35,10 +32,6 @@ require_relative 'parser/parser'
 require_relative 'parser/outline_reader'
 
 
-require_relative 'parser/opts'
-require_relative 'parser/linter'
-require_relative 'parser/fbtok/main'
-
 
 ###
 #  make parser api (easily) available - why? why not?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-parser
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-13 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos
@@ -64,18 +64,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 description: sportdb-parser - football.txt match parser (& tokenizer)
 email: gerald.bauer@gmail.com
-executables:
-- fbtok
+executables: []
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -91,17 +90,13 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- bin/fbtok
 - config/rounds_de.txt
 - config/rounds_en.txt
 - config/rounds_es.txt
 - config/rounds_misc.txt
 - config/rounds_pt.txt
 - lib/sportdb/parser.rb
-- lib/sportdb/parser/fbtok/main.rb
 - lib/sportdb/parser/lang.rb
-- lib/sportdb/parser/linter.rb
-- lib/sportdb/parser/opts.rb
 - lib/sportdb/parser/outline_reader.rb
 - lib/sportdb/parser/parser.rb
 - lib/sportdb/parser/token-date.rb
@@ -131,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: sportdb-parser - football.txt match parser (& tokenizer)

data/bin/fbtok

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-## tip: to test run:
-##   ruby -I ./lib bin/fbtok
-
-require 'sportdb/parser'
-
-
-Fbtok.main( ARGV )
-
-
-puts "bye"
-

data/lib/sportdb/parser/fbtok/main.rb

@@ -1,141 +0,0 @@
-
-module Fbtok
-def self.main( args=ARGV )
-
-    opts = {
-        debug: true,
-        metal: false,
-        file:  nil,
-    }
-
-    parser = OptionParser.new do |parser|
-      parser.banner = "Usage: #{$PROGRAM_NAME} [options] PATH"
-
-
-      parser.on( "-q", "--quiet",
-                 "less debug output/messages - default is (#{!opts[:debug]})" ) do |debug|
-        opts[:debug] = false
-      end
-      parser.on( "--verbose", "--debug",
-                   "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
-        opts[:debug] = true
-      end
-
-      parser.on( "--metal",
-                     "turn off typed parse tree; show to the metal tokens"+
-                       " (default: #{opts[:metal]})" ) do |metal|
-        opts[:metal] = true
-      end
-
-      parser.on( "-f FILE", "--file FILE",
-                    "read datafiles (pathspecs) via .csv file") do |file|
-        opts[:file] = file
-        ## note: for batch (massive) processing auto-set debug (verbose output) to false (as default)
-        opts[:debug] = false
-      end
-    end
-    parser.parse!( args )
-
-    puts "OPTS:"
-    p opts
-    puts "ARGV:"
-    p args
-
-
-    ## todo/check - use packs or projects or such
-    ##                instead of specs - why? why not?
-    specs = []
-    if opts[:file]
-          recs = read_csv( opts[:file] )
-          pp recs
-          ##  note - make pathspecs relative to passed in file arg!!!
-          basedir = File.dirname( opts[:file] )
-          recs.each do |rec|
-             paths = SportDb::Parser::Opts.find( rec['path'], dir: basedir )
-             specs << [paths, rec]
-          end
-    else
-       paths = if args.empty?
-                 [
-                   '../../../openfootball/euro/2021--europe/euro.txt',
-                   '../../../openfootball/euro/2024--germany/euro.txt',
-                 ]
-              else
-                ## check for directories
-                ##   and auto-expand
-                SportDb::Parser::Opts.expand_args( args )
-              end
-        specs << [paths, {}]
-    end
-
-
-    SportDb::Parser::Linter.debug = true    if opts[:debug]
-
-    linter = SportDb::Parser::Linter.new
-
-
-    specs.each_with_index do |(paths, rec),i|
-       errors = []
-
-       paths.each_with_index do |path,j|
-          puts "==> [#{j+1}/#{paths.size}] reading >#{path}<..."
-          linter.read( path, parse: !opts[:metal] )
-
-          errors += linter.errors    if linter.errors?
-       end
-
-       if errors.size > 0
-          puts
-          pp errors
-          puts
-          puts "!!   #{errors.size} parse error(s) in #{paths.size} datafiles(s)"
-       else
-          puts
-          puts "OK   no parse errors found in #{paths.size} datafile(s)"
-       end
-
-       ## add errors to rec via rec['errors'] to allow
-       ##   for further processing/reporting
-       rec['errors'] = errors
-    end
-
-
-###
-## generate a report if --file option used
-if opts[:file]
-
-  buf = String.new
-
-  buf << "# fbtok summary report - #{specs.size} dataset(s)\n\n"
-
-  specs.each_with_index do |(paths, rec),i|
-     errors = rec['errors']
-
-     if errors.size > 0
-       buf << "!! #{errors.size} ERROR(S)  "
-     else
-       buf << "   OK          "
-     end
-     buf << "%-20s" % rec['path']
-     buf << " - #{paths.size} datafile(s)"
-     buf << "\n"
-
-     if errors.size > 0
-         buf << errors.pretty_inspect
-         buf << "\n"
-     end
- end
-
-  puts
-  puts "SUMMARY:"
-  puts buf
-
-  #  maybe write out in the future?
-  # basedir  = File.dirname( opts[:file] )
-  # basename = File.basename( opts[:file], File.extname( opts[:file] ))
-end
-
-
-
-end  # method self.main
-end  #  module Fbtok

data/lib/sportdb/parser/linter.rb

@@ -1,156 +0,0 @@
-
-module SportDb
-class Parser
-
-###
-## note - Linter for now nested inside Parser - keep? why? why not?
-class Linter
-
-def self.debug=(value) @@debug = value; end
-def self.debug?() @@debug ||= false; end  ## note: default is FALSE
-def debug?()  self.class.debug?; end
-
-
-
-attr_reader :errors
-
-def initialize
-  @errors = []
-  @parser = Parser.new   ## use own parser instance (not shared) - why? why not?
-end
-
-
-def errors?() @errors.size > 0; end
-
-
-
-  ## note:  colon (:) MUST be followed by one (or more) spaces
-  ##      make sure mon feb 12 18:10 will not match
-  ##        allow 1. FC Köln etc.
-  ##               Mainz 05:
-  ##           limit to 30 chars max
-  ##          only allow  chars incl. intl buut (NOT ()[]/;)
-  ##
-  ##   Group A:
-  ##   Group B:   - remove colon
-  ##    or lookup first
-
-  ATTRIB_RE = %r{^
-                   [ ]*?     # slurp leading spaces
-                (?<key>[^:|\]\[()\/; -]
-                       [^:|\]\[()\/;]{0,30}
-                 )
-                   [ ]*?     # slurp trailing spaces
-                   :[ ]+
-                (?<value>.+)
-                    [ ]*?   # slurp trailing spaces
-                   $
-                }ix
-
-
-#########
-## parse - false (default) - tokenize (only)
-##       - true            - tokenize & parse
-def read( path, parse: false )
-  ## note: every (new) read call - resets errors list to empty
-  @errors = []
-
-  nodes = OutlineReader.read( path )
-
-  ##  process nodes
-  h1 = nil
-  h2 = nil
-  orphans = 0    ## track paragraphs's with no heading
-
-  attrib_found = false
-
-
-  nodes.each do |node|
-    type = node[0]
-
-    if type == :h1
-        h1 = node[1]  ## get heading text
-        puts "  = Heading 1 >#{node[1]}<"
-    elsif type == :h2
-        if h1.nil?
-          puts "!! WARN - no heading for subheading; skipping parse"
-          next
-        end
-        h2 = node[1]  ## get heading text
-        puts "  == Heading 2 >#{node[1]}<"
-    elsif type == :p
-
-       if h1.nil?
-         orphans += 1    ## only warn once
-         puts "!! WARN - no heading for #{orphans} text paragraph(s); skipping parse"
-         next
-       end
-
-       lines = node[1]
-
-       tree = []
-       lines.each_with_index do |line,i|
-
-        if debug?
-         puts
-         puts "line >#{line}<"
-        end
-
-
-        ## skip new (experimental attrib syntax)
-        if attrib_found == false &&
-            ATTRIB_RE.match?( line )
-          ## note: check attrib regex AFTER group def e.g.:
-          ##         Group A:
-          ##         Group B:  etc.
-          ##     todo/fix - change Group A: to Group A etc.
-          ##                       Group B: to Group B
-           attrib_found = true
-           ## logger.debug "skipping key/value line - >#{line}<"
-           next
-        end
-
-        if attrib_found
-          ## check if line ends with dot
-          ##  if not slurp up lines to the next do!!!
-          ## logger.debug "skipping key/value line - >#{line}<"
-          attrib_found = false   if line.end_with?( '.' )
-              # logger.debug "skipping key/value line (cont.) - >#{line}<"
-              next
-        end
-
-        t, error_messages  =  if parse
-                                  @parser.parse_with_errors( line )
-                              else
-                                  @parser.tokenize_with_errors( line )
-                              end
-
-
-         if error_messages.size > 0
-            ## add to "global" error list
-            ##   make a triplet tuple (file / msg / line text)
-            error_messages.each do |msg|
-                @errors << [ path,
-                             msg,
-                             line
-                           ]
-            end
-         end
-
-         pp t   if debug?
-
-         tree << t
-       end
-
-       ## pp tree
-    else
-        pp node
-        raise ArgumentError, "unsupported (node) type >#{type}<"
-    end
-  end  # each node
-end  # read
-end  # class Linter
-
-
-end   # class Parser
-end   # module SportDb

data/lib/sportdb/parser/opts.rb

@@ -1,81 +0,0 @@
-
-module SportDb
-class Parser
-
-
-###
-## note - Opts Helpers for now nested inside Parser - keep here? why? why not?
-class Opts
-
-    SEASON_RE = %r{ (?:
-                       \d{4}-\d{2}
-                     | \d{4}(--[a-z0-9_-]+)?
-                    )
-                  }x
-    SEASON = SEASON_RE.source    ## "inline" helper for embedding in other regexes - keep? why? why not?
-
-
-    ## note: if pattern includes directory add here
-    ##     (otherwise move to more "generic" datafile) - why? why not?
-    ##   update - note include/allow dot (.) too
-    ##               e.g. 2024-25/at.1.txt
-    ##                        change to at_1 or uefa_cl or such - why? why not?
-    MATCH_RE = %r{ (?: ^|/ )      # beginning (^) or beginning of path (/)
-                       #{SEASON}
-                     /[a-z0-9_.-]+\.txt$  ## txt e.g /1-premierleague.txt
-                }x
-
-
-def self.find( path, dir: nil )
-    ## check - rename dir
-    ##          use root_dir or work_dir or cd or such - why? why not?
-
-    datafiles = []
-
-    ## note: normalize path - use File.expand_path ??
-    ##    change all backslash to slash for now
-    ## path = path.gsub( "\\", '/' )
-    path =  if dir
-              File.expand_path( path, File.expand_path( dir ))
-            else
-              File.expand_path( path )
-            end
-
-    ## check all txt files
-    ## note: incl. files starting with dot (.)) as candidates
-    ##     (normally excluded with just *)
-    candidates = Dir.glob( "#{path}/**/{*,.*}.txt" )
-    ## pp candidates
-    candidates.each do |candidate|
-      datafiles << candidate    if MATCH_RE.match( candidate )
-    end
-
-    ## pp datafiles
-    datafiles
-end
-
-
-def self.expand_args( args )
-    paths = []
-
-    args.each do |arg|
-        ## check if directory
-        if Dir.exist?( arg )
-            datafiles = find( arg )
-            puts
-            puts "  found #{datafiles.size} match txt datafiles in #{arg}"
-            pp datafiles
-            paths += datafiles
-        else
-              ## assume it's a file
-            paths << arg
-        end
-    end
-
-    paths
-end
-end  # class Opts
-
-
-end   # class Parser
-end   # module SportDb