sportdb-quick 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee93b658f2f6fce94a131931ea37908a2edbfa19a182ec20072447b57ffc847
-  data.tar.gz: f5fa5ab664d71ea9a2ab8c62e1bd30d42fa678e0b2a7564124623dc5d7cd2963
+  metadata.gz: dc074126897237cd4cdb59c160e6dd41fa5b9e1ec3581472eeb68f520e486a61
+  data.tar.gz: 32112335ee74977ebd243e4ead540dabb49b291d837933315d57f7d3d86a47b4
 SHA512:
-  metadata.gz: b0df0b970600ee24a88d09ddffec1caa8ef94cfa75561569638da954357cec2d97ffc7ea566f03e42ec814a5998c99da79f861c54a863a439f1778a3f0426ab0
-  data.tar.gz: 01e1ad205c4d271a68136784a17b8f1b7987bdfa5e9b4ba5f395b42f6b488a53747525ecd7bea1e2c188012219529d7611e7d35f49ec4e5e7d499cc791e4e80a
+  metadata.gz: d0e23a4e07fa3e811c82eed4215d4229bc548e130d7e8bac70a85f8307928e50b28862e14b9a70c887166282c4efdb937d9533c1bfe0b1fddaced7b6b77d6729
+  data.tar.gz: dd442c2ae016aad05d5aa5e21dcd4420bb45808bdc18cf5759e97a37849527dcd1a9ab89da7a8ecb48a5d5a52956d7f36ae1b506a170dae138234e61925520a1

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.1.1
+### 0.2.0
 
 ### 0.0.1 / 2024-08-27
 

data/Manifest.txt

@@ -3,13 +3,13 @@ Manifest.txt
 README.md
 Rakefile
 bin/fbt
+bin/fbtxt2json
 lib/sportdb/quick.rb
 lib/sportdb/quick/csv/goal.rb
 lib/sportdb/quick/csv/goal_parser_csv.rb
 lib/sportdb/quick/csv/match_parser_csv.rb
 lib/sportdb/quick/csv/match_status_parser.rb
 lib/sportdb/quick/match_parser.rb
-lib/sportdb/quick/opts.rb
 lib/sportdb/quick/quick_league_outline_reader.rb
 lib/sportdb/quick/quick_match_reader.rb
 lib/sportdb/quick/version.rb

data/bin/fbt

@@ -26,8 +26,9 @@ require 'optparse'
 
  args = ARGV
  opts = { debug: false,
-          metal: false,
-          quick: true }
+          json:  false,
+          file:  nil,
+        }
 
  parser = OptionParser.new do |parser|
   parser.banner = "Usage: #{$PROGRAM_NAME} [options]"
@@ -35,24 +36,26 @@ require 'optparse'
 ##
 ## check if git has a offline option?? (use same)
 ##             check for other tools - why? why not?
+    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( "-j", "--json",
+                 "print out in .json - default is (#{opts[:json]})" ) do |json|
+      opts[:json] = true
+    end
+
+    parser.on( "-f FILE", "--file FILE",
+                    "read datafiles (pathspecs) via .csv file") do |file|
+      opts[:file] = file
+    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( "--quick",
-                "use quick match reader; output matches in json"+
-                   " (default: #{opts[:quick]})" ) do |quick|
-     opts[:quick] = true
-  end
 end
 parser.parse!( args )
 
@@ -62,58 +65,117 @@ 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
+
+
+if opts[:debug]
+   SportDb::QuickMatchReader.debug = true
+   SportDb::MatchParser.debug      = true
+else
+   SportDb::QuickMatchReader.debug = false
+   SportDb::MatchParser.debug      = false
+   LogUtils::Logger.root.level = :info
+end
 
 
+  specs.each_with_index do |(paths, rec),i|
+    errors = []
+    paths.each_with_index do |path,j|
+      puts "==> [#{j+1}/#{paths.size}] reading >#{path}<..."
+      quick = SportDb::QuickMatchReader.new( read_text( path ) )
+      matches = quick.parse
+
+      if quick.errors?
+        puts "!! #{quick.errors.size} error(s):"
+        pp quick.errors
+
+        quick.errors.each do |err|
+          errors << [ path, *err ]   # note: use splat (*) to add extra values (starting with msg)
+        end
+      end
+
+      ## pp matches
+      ##  try json for matches
+      if opts[:json]
+        data = matches.map {|match| match.as_json }
+        pp data
+      end
+      puts "  #{matches.size} match(es)"
+    end
+
+    if errors.size > 0
+      puts
+      puts "!! #{errors.size} PARSE ERRORS in #{paths.size} datafile(s)"
+      pp errors
+    else
+      puts
+      puts "  OK - no parse errors in #{paths.size} datafile(s)"
+    end
+
+     ## add errors to rec via rec['errors'] to allow
+     ##   for further processing/reporting
+     rec['errors'] = errors
+  end
 
-paths =  if args.empty?
-            [
-              '../../../openfootball/euro/2021--europe/euro.txt',
-              '../../../openfootball/euro/2024--germany/euro.txt',
-            ]
-         else
-            ## check for directories
-            ##   and auto-expand
-
-            SportDb::Quick::Opts.expand_args( args )
-         end
 
 
-if opts[:quick]
+###
+## generate a report if --file option used
+if opts[:file]
 
-  paths.each_with_index do |path,i|
-    puts "==> [#{i+1}/#{paths.size}] reading >#{path}<..."
+  buf = String.new
 
-    matches = SportDb::QuickMatchReader.read( path )
-    ## pp matches
-    ##  try json for matches
-    data = matches.map {|match| match.as_json }
-    pp data
-    puts
-    puts "  #{data.size} match(es)"
-  end
-else
-  SportDb::Parser::Linter.debug = true    if opts[:debug]
+  buf << "# fbt summary report - #{specs.size} dataset(s)\n\n"
 
-  linter = SportDb::Parser::Linter.new
+  specs.each_with_index do |(paths, rec),i|
+     errors = rec['errors']
 
-  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"
 
-  paths.each_with_index do |path,i|
-    puts "==> [#{i+1}/#{paths.size}] reading >#{path}<..."
-    linter.read( path, parse: !opts[:metal] )
+     if errors.size > 0
+         buf << errors.pretty_inspect
+         buf << "\n"
+     end
+ end
 
-    errors += linter.errors    if linter.errors?
-  end
+  puts
+  puts "SUMMARY:"
+  puts buf
 
-  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
+  #  maybe write out in the future?
+  # basedir  = File.dirname( opts[:file] )
+  # basename = File.basename( opts[:file], File.extname( opts[:file] ))
 end
 
 

data/bin/fbtxt2json

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib bin/fbtxt2json
+
+
+## our own code
+require 'sportdb/quick'
+
+
+
+require 'optparse'
+
+
+
+ args = ARGV
+ opts = { debug: false,
+        }
+
+ parser = OptionParser.new do |parser|
+  parser.banner = "Usage: #{$PROGRAM_NAME} [options]"
+
+##
+## check if git has a offline option?? (use same)
+##             check for other tools - why? why not?
+    parser.on( "-q", "--quiet",
+                 "less debug output/messages - default is (#{!opts[:debug]})" ) do |debug|
+      opts[:debug] = false
+    end
+end
+parser.parse!( args )
+
+puts "OPTS:"
+p opts
+puts "ARGV:"
+p args
+
+
+path = if args.empty?
+          '../../../openfootball/euro/2021--europe/euro.txt'
+       elsif args.size == 1
+           args[0]
+       else
+          puts "!! wrong number of args, got #{args.size} - #{args.inspect} - only one arg supported/expected"
+          exit 1
+       end
+
+
+if opts[:debug]
+   SportDb::QuickMatchReader.debug = true
+   SportDb::MatchParser.debug      = true
+else
+   SportDb::QuickMatchReader.debug = false
+   SportDb::MatchParser.debug      = false
+   LogUtils::Logger.root.level = :info
+end
+
+
+      puts "==> reading >#{path}<..."
+      quick = SportDb::QuickMatchReader.new( read_text( path ) )
+      matches = quick.parse
+
+      data = matches.map {|match| match.as_json }
+      pp data
+      puts
+      puts "  #{matches.size} match(es)"
+
+      if quick.errors?
+        puts "!! #{quick.errors.size} parse error(s):"
+        pp quick.errors
+      end
+
+
+puts "bye"
+

data/lib/sportdb/quick/match_parser.rb

@@ -3,6 +3,12 @@ module SportDb
 
 class MatchParser    ## simple match parser for team match schedules
 
+  def self.debug=(value) @@debug = value; end
+  def self.debug?() @@debug ||= false; end  ## note: default is FALSE
+  def debug?()  self.class.debug?; end
+
+  include Logging         ## e.g. logger#debug, logger#info, etc.
+
 
   def self.parse( lines, start: )
     ##  todo/fix: add support for txt and lines
@@ -13,11 +19,7 @@ class MatchParser    ## simple match parser for team match schedules
   end
 
 
-  include Logging         ## e.g. logger#debug, logger#info, etc.
 
-  def self.debug=(value) @@debug = value; end
-  def self.debug?() @@debug ||= false; end  ## note: default is FALSE
-  def debug?()  self.class.debug?; end
 
   def _read_lines( txt )   ## todo/check:  add alias preproc_lines or build_lines or prep_lines etc. - why? why not?
     ## returns an array of lines with comments and empty lines striped / removed
@@ -70,10 +72,17 @@ class MatchParser    ## simple match parser for team match schedules
                     _read_lines( lines ) : lines
 
     @start        = start
+    @errors = []
   end
 
 
+  attr_reader :errors
+  def errors?() @errors.size > 0; end
+
   def parse
+    ## note: every (new) read call - resets errors list to empty
+    @errors = []
+
     @last_date    = nil
     @last_time    = nil
     @last_round   = nil
@@ -92,8 +101,6 @@ class MatchParser    ## simple match parser for team match schedules
 
 
     @parser = Parser.new
-
-    @errors = []
     @tree   = []
 
     attrib_found = false
@@ -509,7 +516,7 @@ class MatchParser    ## simple match parser for team match schedules
         end
     end
 
-    pp [goals1,goals2]
+    pp [goals1,goals2]     if debug?
 
 ## wrap in struct andd add/append to match
 =begin
@@ -547,7 +554,7 @@ class GoalStruct
       goals << goal
     end
 
-    pp goals
+    pp goals   if debug?
 
     ## quick & dirty - auto add goals to last match
     ##   note - for hacky (quick& dirty) multi-line support
@@ -566,12 +573,13 @@ class GoalStruct
     logger.debug( "parse match: >#{nodes}<" )
 
     ## collect (possible) nodes by type
-    num   = nil
-    date  = nil
-    time  = nil
-    teams = []
-    score = nil
-    more  = []
+    num    = nil
+    date   = nil
+    time   = nil
+    teams  = []
+    score  = nil
+    more   = []
+    status = nil
 
     while !nodes.empty?
         node = nodes.shift
@@ -608,6 +616,8 @@ class GoalStruct
 
              score = Score.new( *values )
              ## pp score
+        elsif node_type == :status  # e.g. awarded, canceled, postponed, etc.
+             status = node[1]
         elsif node_type == :vs
            ## skip; do nothing
 ##
@@ -626,7 +636,9 @@ class GoalStruct
         else
             puts "!! PARSE ERROR - unexpected node type #{node_type} in match line; got:"
             pp node
-            exit 1
+            ## exit 1
+            @errors << ["PARSE ERROR - unexpected node type #{node_type} in match line; got: #{node.inspect}"]
+            return
         end
     end
 
@@ -634,7 +646,9 @@ class GoalStruct
     if teams.size != 2
       puts "!! PARSE ERROR - expected two teams; got #{teams.size}:"
       pp teams
-      exit 1
+      ## exit 1
+      @errors << ["PARSE ERROR - expected two teams; got #{teams.size}: #{teams.inspect}"]
+      return
     end
 
     team1 = teams[0]
@@ -711,7 +725,6 @@ class GoalStruct
     time_str = time    if date && time
 
 
-    status = nil
     ground = nil
 
     @matches << Import::Match.new( num:     num,

data/lib/sportdb/quick/quick_match_reader.rb

@@ -4,6 +4,12 @@
 module SportDb
 class QuickMatchReader
 
+  def self.debug=(value) @@debug = value; end
+  def self.debug?() @@debug ||= false; end  ## note: default is FALSE
+  def debug?()  self.class.debug?; end
+
+
+
   def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
     txt = File.open( path, 'r:utf-8' ) {|f| f.read }
     parse( txt )
@@ -17,16 +23,23 @@ class QuickMatchReader
   include Logging
 
   def initialize( txt )
+    @errors = []
     @txt = txt
   end
 
+  attr_reader :errors
+  def errors?() @errors.size > 0; end
+
   def parse
+    ## note: every (new) read call - resets errors list to empty
+    @errors = []
+
     data = {}   # return data hash with leagues
                 #    and seasons
                 #   for now merge stage into matches
 
     secs = QuickLeagueOutlineReader.parse( @txt )
-    pp secs
+    pp secs    if debug?
 
     secs.each do |sec|   ## sec(tion)s
       season = Season.parse( sec[:season] )   ## convert (str) to season obj!!!
@@ -46,14 +59,20 @@ class QuickMatchReader
 
       auto_conf_teams,  matches, rounds, groups = parser.parse
 
-      puts ">>> #{auto_conf_teams.size} teams:"
-      pp auto_conf_teams
-      puts ">>> #{matches.size} matches:"
-      ## pp matches
-      puts ">>> #{rounds.size} rounds:"
-      pp rounds
-      puts ">>> #{groups.size} groups:"
-      pp groups
+      ## auto-add "upstream" errors from parser
+      @errors += parser.errors  if parser.errors?
+
+
+      if debug?
+        puts ">>> #{auto_conf_teams.size} teams:"
+        pp auto_conf_teams
+        puts ">>> #{matches.size} matches:"
+        ## pp matches
+        puts ">>> #{rounds.size} rounds:"
+        pp rounds
+        puts ">>> #{groups.size} groups:"
+        pp groups
+      end
 
       ## note: pass along stage (if present): stage  - optional from heading!!!!
       if stage

data/lib/sportdb/quick/version.rb

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

data/lib/sportdb/quick.rb

@@ -16,8 +16,8 @@ end
 
 ## our own code
 require_relative 'quick/version'
-require_relative 'quick/opts'
 
+# require_relative 'quick/opts'
 # require_relative 'quick/linter'
 # require_relative 'quick/outline_reader'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-quick
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser
@@ -90,6 +90,7 @@ description: sportdb-quick - football.txt (quick) match readers and more
 email: gerald.bauer@gmail.com
 executables:
 - fbt
+- fbtxt2json
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -101,13 +102,13 @@ files:
 - README.md
 - Rakefile
 - bin/fbt
+- bin/fbtxt2json
 - lib/sportdb/quick.rb
 - lib/sportdb/quick/csv/goal.rb
 - lib/sportdb/quick/csv/goal_parser_csv.rb
 - lib/sportdb/quick/csv/match_parser_csv.rb
 - lib/sportdb/quick/csv/match_status_parser.rb
 - lib/sportdb/quick/match_parser.rb
-- lib/sportdb/quick/opts.rb
 - lib/sportdb/quick/quick_league_outline_reader.rb
 - lib/sportdb/quick/quick_match_reader.rb
 - lib/sportdb/quick/version.rb

data/lib/sportdb/quick/opts.rb

@@ -1,70 +0,0 @@
-
-module SportDb
-module Quick
-
-###
-## 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?
-    MATCH_RE = %r{ (?: ^|/ )      # beginning (^) or beginning of path (/)
-                       #{SEASON}
-                     /[a-z0-9_-]+\.txt$  ## txt e.g /1-premierleague.txt
-                }x
-
-
-def self.find( path )
-    datafiles = []
-
-    ## note: normalize path - use File.expand_path ??
-    ##    change all backslash to slash for now
-    ## path = path.gsub( "\\", '/' )
-    path = File.expand_path( path )
-
-    ## 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   # module Quick
-end   # module SportDb