fbtok 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 191b44113dea92aebe49fb5717146c9cd0038afb448ba34c4dd828e6daeb869e
-  data.tar.gz: 7367ad2ae027d158371ac63fcbbe53271da84f1dabbd4a4f2111ebd658d0c2c7
+  metadata.gz: b0cf5b4c14ed4e4466a769b2389e9aaf2add0fe631034010778cfc9a7671d088
+  data.tar.gz: 311e35505a4ec9b729784e4adf415888e64a855fda4a2bed3ab971a51c8ebb40
 SHA512:
-  metadata.gz: 85d8e883d5fbe0654a5188b3c0d46b1be2f694a96a6fe9d70a6b88ce36d7676200165f82e999ef2b77dd2fc6f453da0dfd30b06e8ed4cc0a622e5a20329cb61e
-  data.tar.gz: 947f91db38384711f3fa734f7ef52b51068f01d78b9ecd953ac17caa94afe61e748971341ceafb0bcddf6a120b2d30324d6820ff77a675ded8d494b354614b43
+  metadata.gz: d9d1a0b0b736368613f2cae07c69ecc9fec2ca41e3b40a77471e3790ce585a4a4fb5a4559c8005deb59dee2e56fa3f489c2025033b8281910ffec8e77ad94356
+  data.tar.gz: 692715563a64d828eea4bbef1528721773dea1b7c7f4a2103079a804991fcc683ae6afff9aa76dfbf116b5050a77771c85c2ae11f5c950b402391f2eec077d5b

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.2.1
+### 0.2.3
 ### 0.0.1 / 2025-01-02
 
 * Everything is new. First release.

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 
 
 Hoe.spec 'fbtok' do
-  self.version = '0.2.1'
+  self.version = '0.2.3'
 
   self.summary = "fbtok - football.txt lint tools incl. tokenizer, parser & more"
   self.description = summary
@@ -21,7 +21,7 @@ Hoe.spec 'fbtok' do
   self.extra_deps = [
      #  ['sportdb-structs', '>= 0.5.0'],
      #  ['logutils',        '>= 0.6.1'],
-     ['sportdb-parser',  '>= 0.5.1'],
+     ['sportdb-parser',  '>= 0.5.4'],
      ['sportdb-formats', '>= 2.1.2'],
   ]
 

data/bin/fbchk

@@ -9,6 +9,7 @@
 $LOAD_PATH.unshift( File.expand_path( '/sports/sportdb/sport.db/sportdb-structs/lib' ))
 $LOAD_PATH.unshift( File.expand_path( '/sports/sportdb/sport.db/sportdb-catalogs/lib' ))
 $LOAD_PATH.unshift( File.expand_path( '/sports/sportdb/sport.db/sportdb-search/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '/sports/sportdb/sport.db/sportdb-formats/lib' ))
 
 
 ## our own code

data/bin/fbtok

@@ -44,10 +44,17 @@ parser = OptionParser.new do |parser|
 end
 parser.parse!( args )
 
-puts "OPTS:"
-p opts
-puts "ARGV:"
-p args
+
+
+if opts[:debug]
+  puts "OPTS:"
+  p opts
+  puts "ARGV:"
+  p args
+
+  SportDb::Parser::Linter.debug = true    
+  SportDb::Parser::Opts.debug   = true
+end
 
 
 ## todo/check - use packs or projects or such
@@ -55,7 +62,8 @@ p args
 specs = []
 if opts[:file]
       recs = read_csv( opts[:file] )
-      pp recs
+      pp recs     if opts[:debug]
+
       ##  note - make pathspecs relative to passed in file arg!!!
       basedir = File.dirname( opts[:file] )
       recs.each do |rec|
@@ -65,8 +73,8 @@ if opts[:file]
 else
    paths = if args.empty?
              [
-               '../../../openfootball/euro/2021--europe/euro.txt',
-               '../../../openfootball/euro/2024--germany/euro.txt',
+               '/sports/openfootball/euro/2021--europe/euro.txt',
+               '/sports/openfootball/euro/2024--germany/euro.txt',
              ]
           else
             ## check for directories
@@ -77,7 +85,6 @@ else
 end
 
 
-SportDb::Parser::Linter.debug = true    if opts[:debug]
 
 linter = SportDb::Parser::Linter.new
 

data/bin/fbtree

@@ -27,18 +27,27 @@ parser = OptionParser.new do |parser|
 end
 parser.parse!( args )
 
-puts "OPTS:"
-p opts
-puts "ARGV:"
-p args
+
+if opts[:debug]
+  puts "OPTS:"
+  p opts
+  puts "ARGV:"
+  p args
+
+  SportDb::Parser::Linter.debug = true    
+  SportDb::Parser::Opts.debug   = true
+end
+
+
+
 
 
 ## todo/check - use packs or projects or such
 ##                instead of specs - why? why not?
    paths = if args.empty?
              [
-               '../../../openfootball/euro/2021--europe/euro.txt',
-               '../../../openfootball/euro/2024--germany/euro.txt',
+               '/sports/openfootball/euro/2021--europe/euro.txt',
+               '/sports/openfootball/euro/2024--germany/euro.txt',
              ]
           else
             ## check for directories
@@ -48,7 +57,23 @@ p args
 
 
 
-SportDb::Parser::Linter.debug = true    if opts[:debug]
+def dump_tree_stats( tree )
+  stats = Hash.new(0)  ## track counts only for now
+  tree.each do |node|
+     stats[ node.class ] += 1 
+  end
+
+  match_count  = stats[ RaccMatchParser::MatchLine ]
+  goal_count   = stats[ RaccMatchParser::GoalLine ]
+  lineup_count = stats[ RaccMatchParser::LineupLine ] 
+
+  puts "   #{match_count} MatchLine(s)"     if match_count > 0
+  puts "   #{goal_count} GoalLine(s)"       if goal_count > 0
+  puts "   #{lineup_count} LineupLine(s)"   if lineup_count > 0
+end
+
+
+
 
 linter = SportDb::Parser::Linter.new
 
@@ -57,7 +82,9 @@ paths.each_with_index do |path,i|
 
   puts "==> [#{i+1}/#{paths.size}] reading >#{path}<..."
 
-  linter.read( path, parse: true )
+  tree = linter.read( path, parse: true )
+
+  dump_tree_stats( tree )
 end
 
 

data/bin/fbx

@@ -70,12 +70,12 @@ paths =  if args.empty?
 
 
 
-
-
-
-
-SportDb::MatchParser.debug = true    if opts[:debug]
-
+if opts[:debug]
+  SportDb::MatchParser.debug = true    
+else
+  SportDb::MatchParser.debug = false    
+  LogUtils::Logger.root.level = :info
+end
 
 ## errors = []
 
@@ -84,16 +84,19 @@ paths.each_with_index do |path,i|
     puts "==> [#{i+1}/#{paths.size}] reading >#{path}<..."
 
     txt = read_text( path )
-    secs = SportDb::QuickLeagueOutlineReader.parse( txt )
-    ## pp secs
+    outline = SportDb::QuickLeagueOutline.parse( txt )
 
-    secs.each_with_index do |sec,j|   ## sec(tion)s
-      season = Season.parse( sec[:season] )   ## convert (str) to season obj!!!
-      league = sec[:league]
-      stage  = sec[:stage]
-      lines  = sec[:lines]
+    ##  todo/fix - add each_sec_with_index upstream
+    ##    add outline.secs.size - why? why not?
+    j = 0
+    secs_count = '?'
+    outline.each_sec do |sec|   ## sec(tion)s
+      season = Season.parse( sec.season )   ## convert (str) to season obj!!!
+      league = sec.league
+      stage  = sec.stage
+      lines  = sec.lines
 
-      puts "   section #{j+1}/#{secs.size} -   #{league} #{season}, #{stage}  -  #{lines.size} line(s)"
+      puts "   section #{j+1}/#{secs_count} -   #{league} #{season}, #{stage}  -  #{lines.size} line(s)"
 
       next if opts[:outline]
 
@@ -130,6 +133,8 @@ paths.each_with_index do |path,i|
       pp rounds
       puts ">>> #{groups.size} groups:"
       pp groups
+
+      j += 1
     end  # each secs
 end  # each paths
 

data/lib/fbtok/linter.rb

@@ -30,48 +30,19 @@ def read( path, parse: true )
   ## note: every (new) read call - resets errors list to empty
   @errors = []
 
-  nodes = OutlineReader.read( path )
+  @tree = []
 
-  ##  process nodes
-  h1 = nil
-  h2 = nil
-  orphans = 0    ## track paragraphs's with no heading
+  outline = QuickMatchOutline.read( path )
 
- 
-  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 = []
+  outline.each_para do |lines|
 
      if parse
-       ## flatten lines
-       txt  = []
-       lines.each_with_index do |line,i|
-          txt << line
-          txt << "\n"
-       end
-       txt = txt.join
+       ## flatten lines (array of strings) into all-in-one string
+       txt  = lines.reduce( String.new ) do |mem, line|
+                                            mem << line
+                                            mem << "\n"
+                                            mem
+                                        end
     
        if debug?
          puts "lines:"
@@ -79,9 +50,16 @@ def read( path, parse: true )
        end
  
        ## todo/fix -  add/track parse errors!!!!!!
+       ##   pass along debug flag to parser (& tokenizer)?
        parser = RaccMatchParser.new( txt )   ## use own parser instance (not shared) - why? why not?
        tree = parser.parse
-       pp tree  
+
+       if debug?
+         puts "parse tree:"
+         pp tree  
+       end
+
+       @tree += tree   ## add nodes
 
      else   ## process for tokenize only
        lines.each_with_index do |line,i|
@@ -104,37 +82,14 @@ def read( path, parse: true )
             end
          end
 
-          ## post-process tokens
-          ##  - check for round, group, etc.
-          t = t.map do |tok|
-            #############
-            ## pass 1
-            ##   replace all texts with keyword matches (e.g. group, round, leg, etc.)
-                if tok[0] == :TEXT
-                   text = tok[1]
-                    if @parser.is_group?( text )
-                           [:GROUP, text]
-                    elsif @parser.is_round?( text ) || @parser.is_leg?( text )
-                           [:ROUND, text]
-                    else
-                        tok  ## pass through as-is (1:1)
-                    end
-                else
-                   tok
-                end
-          end
- 
          pp t   if debug?
+       end  # each line
+      end   # parse? (or tokenize?) 
+   end  # each para (node)
 
-         tree << t
-       end
-      end
-    else
-        pp node
-        raise ArgumentError, "unsupported (node) type >#{type}<"
-    end
-  end  # each node
-end  # read
+   ## note - only returns pare tree for now; no tokens (on parse=false)
+   @tree   ## return parse tree 
+end  # method read
 end  # class Linter
 
 

data/lib/fbtok/opts.rb

@@ -7,6 +7,10 @@ class Parser
 ## note - Opts Helpers for now nested inside Parser - keep here? why? why not?
 class Opts
 
+  def self.debug=(value) @@debug = value; end
+  def self.debug?()      @@debug ||= false; end  ## note: default is FALSE
+  
+
     SEASON_RE = %r{ (?:
                        \d{4}-\d{2}
                      | \d{4}(--[a-z0-9_-]+)?
@@ -63,9 +67,11 @@ def self.expand_args( args )
         ## check if directory
         if Dir.exist?( arg )
             datafiles = find( arg )
-            puts
-            puts "  found #{datafiles.size} match txt datafiles in #{arg}"
-            pp datafiles
+            if debug?
+              puts
+              puts "  found #{datafiles.size} match txt datafiles in #{arg}"
+              pp datafiles
+            end
             paths += datafiles
         else
               ## assume it's a file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbtok
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: sportdb-formats
   requirement: !ruby/object:Gem::Requirement