rsssf 0.2.0 → 0.3.0

data/lib/rsssf/reports/schedule.rb

@@ -2,7 +2,7 @@
 
 module Rsssf
 
-  
+
 ScheduleStat = Struct.new(
     :path,     ## path to .txt file
     :errors   ## array or nil
@@ -17,32 +17,21 @@ class ScheduleReport
 ##
 ##  quick hack?  pass along (optional) patch
 
-def self.build( files, title:, 
+
+def self.build( files, title:,
                        patch: nil )
-  linter = Parser::Linter.new
 
   stats = []
   files.each_with_index do |file,i|
 
-    puts "==> [#{i+1}/#{files.size}] reading >#{file}<..."  
+    puts "==> [#{i+1}/#{files.size}] reading >#{file}<..."
 
     txt = read_text( file )
 
-    if patch && patch.respond_to?(:on_parse)
-      season_dir = File.basename(File.dirname(file)) 
-      season     = Season( season_dir )
-      basename   = File.basename(file, File.extname(file)) 
-      puts "  [debug] before  patch.on_parse #{basename}, #{season}"
-      txt = patch.on_parse( txt, basename, season )
-    end
-  
-    linter.parse( txt, parse: true,
-                       path:  file  )   ## todo/fix - change path to file/filename - why? why not?
-    
     stat = ScheduleStat.new
     stat.path   = file
-    stat.errors = linter.errors
-     
+    stat.errors = []
+
     stats << stat
   end
 
@@ -53,7 +42,7 @@ end
 attr_reader :title
 
 def initialize( stats,  title: )
-  @stats = stats 
+  @stats = stats
   @title = title
 end
 
@@ -62,7 +51,7 @@ def save( path ) write_text( path, build_summary ); end
 
 
 def build_summary
-  ## sort start 1) by season (latest first) than 
+  ## sort start 1) by season (latest first) than
   ##            2) by name (e.g. 1-bundesliga, cup, etc.)
   stats = @stats.sort do |l,r|
     v =  File.basename(File.dirname(r.path)) <=> File.basename(File.dirname(l.path))
@@ -70,63 +59,48 @@ def build_summary
     v
   end
 
-  header =<<EOS
+  header =<<TXT
 
 # #{title}
 
 football.db RSSSF (Rec.Sport.Soccer Statistics Foundation) Archive Data for
 #{title}
 
-EOS
-
-## no longer add last update
-## _Last Update: #{Time.now}_
-##
+TXT
 
 
-=begin
-  footer =<<EOS
-
-## Questions? Comments?
-
-Send them along to the
-[Open Sports & Friends Forum](http://groups.google.com/group/opensport).
-Thanks!
-EOS
-=end
-
 
   errors = []
 
 
   txt = String.new
   txt << header
-  
+
   txt << "| Season | League, Cup | Errors |\n"
   txt << "| :----- | :---------- | -----: |\n"
 
-  
+
   stats.each_with_index do |stat,i|
- 
+
       path = stat.path
       season_dir = File.basename(File.dirname( path ))
       filename   = File.basename( path ) ## incl. extension !!
 
       season = Season( season_dir )
       ## note - use archive_dir_for_season for archive path
-      
+
 
       txt << "| #{season_dir} "
       txt << "| [#{filename}](#{archive_dir_for_season(season)}/#{filename}) "
-    
+
       txt <<   if stat.errors.size > 0
                  "|  **!! #{stat.errors.size}**  "
                else
                  "|  OK  "
                end
       txt << "|\n"
-  
-      errors += stat.errors  if stat.errors.size > 0 
+
+      errors += stat.errors  if stat.errors.size > 0
   end
 
    if errors.size > 0
@@ -137,27 +111,16 @@ EOS
      errors.each do |path, msg, line|
         season_dir = File.basename(File.dirname( path ))
         filename   = File.basename( path ) ## incl. extension !!
-  
+
         txt <<"#{season_dir}/#{filename} -- #{msg}\n"
         txt << "     in line >#{line}<\n"    unless line.empty?
      end
      txt << "```\n"
    end
 
-=begin
-  stats.each do |stat|
-    txt << "| #{stat.season} "
-    txt << "| [#{stat.filename}](#{stat.path}/#{stat.filename}) "
-    txt << "| #{stat.rounds} "
-    txt << "|\n"
-  end
-=end
 
- 
-  ## txt << footer
   txt
 end  # method build_summary
 
 end  ## class ScheduleReport
 end  ## module Rsssf
-

data/lib/rsssf/utils.rb

@@ -6,30 +6,42 @@ module Utils
 ## move to Page - why? why not?
 
 def year_from_file( path )
-  extname  = File.extname( path )
-  basename = File.basename( path, extname )  ## e.g. duit92.txt or duit92.html => duit92
+  ## e.g. duit92.txt or duit92.html => duit92
+  basename = File.basename( path, File.extname( path ))
   year_from_name( basename )
 end
 
 
+
+
+##  note - add lookbehind and lookahead for boundary NOT A NUMBER!!
+##     other will match 4 digits in 5 digits number etc.
+##                 or 2 digits in 3 digits number etc.
+
+YEAR_FROM_NAME_RE = %r{ (?<! \d)       ## note - no digit before allowed
+                        (?:  \d{4}
+                           | \d{2} )
+                      (?! \d)        ## no digit after allowed
+                    }x
+
 def year_from_name( name )
-  if name =~ /(\d+)/
-    digits = $1.to_s
-    num    = digits.to_i
+  ## note - make sure it works for special case like:
+  ##             mex2-2010  !!!
+  ##   only match  two digits (YY) or four digits (YYYY)
+
+  if m=YEAR_FROM_NAME_RE.match( name )
+    digits = m[0].to_s
+    num    = digits.to_i(10)
 
     if digits.size == 4   ## e.g. 1980 or 2011 etc.
-      num
-    elsif digits.size == 2  ## e.g. 00, 20 or 99 etc.
-      if num <= 16  ## assume 20xx for now from 00..16
-        2000+num
-      else               ## assume 19xx for now
-        1900+num
-      end
-    else
-      fail( "no year found in name #{name}; expected two or four digits")
+         num
+    else ##  digits.size == 2  ## e.g. 00, 20 or 99 etc.
+        ## assume 20xx for now from 00..09
+        ## assume 19xx for 10..99
+        num <= 9 ?  2000+num : 1900+num
     end
   else
-    fail( "no year found in name #{name}")
+    fail( "no year found in name #{name}; expected two or four digits")
   end
 end  # method year_from_name
 
@@ -38,7 +50,7 @@ end  # method year_from_name
 def archive_dir_for_season( season )
   season = Season( season )
 
-  if season < Season('2010')   # e.g. season 2009-10 
+  if season < Season('2010')   # e.g. season 2009-10
     ## use archive folder (w/ 1980s etc)
     ## get decade folder
     decade  = season.start_year     ## 1999/2000 2000
@@ -53,4 +65,3 @@ end
 
 end  # module Utils
 end  # module Rsssf
-

data/lib/rsssf/version.rb

@@ -2,7 +2,7 @@
 module Rsssf
 
   MAJOR = 0
-  MINOR = 2
+  MINOR = 3
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
@@ -18,5 +18,8 @@ module Rsssf
      File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )
   end
 
-end # module Rsssf
+  def self.config_dir
+    "#{root}/config"
+  end
 
+end # module Rsssf

data/lib/rsssf.rb

@@ -1,38 +1,79 @@
+$LOAD_PATH.unshift( '/sports/rubycocos/webclient/webclient/lib' )
+$LOAD_PATH.unshift( '/sports/rubycocos/webclient/webget/lib' )
+
 
 ## 3rd party (our own)
 require 'season/formats'   ## add season support
 require 'webget'           ## incl. webget, webcache, webclient, etc.
 
 require 'cocos'
+require_relative '_cocos_'    ## move/add to upstream!!!
 
 
-## (old) 3rd party libs
-##  require 'textutils'      ## used for File.read_utf8 etc.
-## require 'fetcher'        ## used for Fetcher::Worker.new.fetch etc.
 
+## our own code
+require_relative 'rsssf/version'    # note: let version always go first
 
-#######
-##   add RsssfParser too
-require 'rsssf/parser'    ## from rsssf-parser gem
+require_relative 'rsssf/utils'      # include Utils - goes first
 
+require_relative 'rsssf/download'
 
+require_relative 'rsssf/convert/convert'
+require_relative 'rsssf/convert/html_entities'
+require_relative 'rsssf/convert/html_to_txt'
+require_relative 'rsssf/convert/errata'
+require_relative 'rsssf/convert/html_to_txt/replace_heading'
+require_relative 'rsssf/convert/html_to_txt/replace_a_name'
+require_relative 'rsssf/convert/html_to_txt/replace_a_href'
+require_relative 'rsssf/convert/html_to_txt/replace_hr'
+require_relative 'rsssf/convert/html_to_txt/remove_emails'
+require_relative 'rsssf/convert/html_to_txt/beautify_anchors'
+require_relative 'rsssf/convert/html_to_txt/make_heading'
 
 
-## our own code
-require_relative 'rsssf/version'    # note: let version always go first
+require_relative 'rsssf/prepare/download'
+require_relative 'rsssf/prepare/convert'
+require_relative 'rsssf/prepare/convert-meta'
+require_relative 'rsssf/prepare/convert-links'
+require_relative 'rsssf/prepare/convert-postproc'
+require_relative 'rsssf/prepare/convert-navlines'
 
-require_relative 'rsssf/utils'      # include Utils - goes first
 
-require_relative 'rsssf/download'
 
-require_relative 'rsssf/convert'
 require_relative 'rsssf/page'
+require_relative 'rsssf/page-meta'                  # e.g. Page.parse_meta( txt )
+require_relative 'rsssf/page-find_schedule.rb'
+
 require_relative 'rsssf/schedule'
 
 require_relative 'rsssf/reports/schedule'
 require_relative 'rsssf/reports/page'
 
-require_relative 'rsssf/repo'
+require_relative 'rsssf/project'   ### replace with projct
+
+require_relative 'rsssf/parse_schedules'
+
+
+
+###
+# fmtfix machinery
+
+
+require_relative 'rsssf/fmtfix/rounds'
+require_relative 'rsssf/fmtfix/dates_helpers'
+require_relative 'rsssf/fmtfix/dates'
+require_relative 'rsssf/fmtfix/headers'
+
+require_relative 'rsssf/fmtfix/fmtfix-base'
+require_relative 'rsssf/fmtfix/fmtfix'
+require_relative 'rsssf/fmtfix/errata'
+require_relative 'rsssf/fmtfix/score'
+require_relative 'rsssf/fmtfix/goals'
+require_relative 'rsssf/fmtfix/topscorers'
+require_relative 'rsssf/fmtfix/tables'
+require_relative 'rsssf/fmtfix/outline'
+require_relative 'rsssf/fmtfix/patch_headings'  ## or use outline_patch or such - why? why not?
+
 
 
 
@@ -48,7 +89,6 @@ RsssfSchedule       = Rsssf::Schedule
 RsssfScheduleStat   = Rsssf::ScheduleStat
 RsssfScheduleReport = Rsssf::ScheduleReport
 
-RsssfRepo           = Rsssf::Repo
 RsssfUtils          = Rsssf::Utils
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsssf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2026-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rsssf-parser
+  name: webget
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -78,14 +78,14 @@ 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: rsssf - tools 'n' scripts for RSSSF (Rec.Sport.Soccer Statistics Foundation)
   archive data
 email: gerald.bauer@gmail.com
@@ -95,22 +95,63 @@ extra_rdoc_files:
 - CHANGELOG.md
 - Manifest.txt
 - README.md
+- config/groups_en.txt
+- config/rounds_en.txt
+- config/rounds_es.txt
+- config/rounds_misc.txt
 files:
 - CHANGELOG.md
 - Manifest.txt
 - README.md
 - Rakefile
+- config/groups_en.txt
+- config/rounds_en.txt
+- config/rounds_es.txt
+- config/rounds_misc.txt
+- lib/_cocos_.rb
 - lib/rsssf.rb
-- lib/rsssf/convert.rb
+- lib/rsssf/convert/convert.rb
+- lib/rsssf/convert/errata.rb
+- lib/rsssf/convert/html_entities.rb
+- lib/rsssf/convert/html_to_txt.rb
+- lib/rsssf/convert/html_to_txt/beautify_anchors.rb
+- lib/rsssf/convert/html_to_txt/make_heading.rb
+- lib/rsssf/convert/html_to_txt/remove_emails.rb
+- lib/rsssf/convert/html_to_txt/replace_a_href.rb
+- lib/rsssf/convert/html_to_txt/replace_a_name.rb
+- lib/rsssf/convert/html_to_txt/replace_heading.rb
+- lib/rsssf/convert/html_to_txt/replace_hr.rb
 - lib/rsssf/download.rb
+- lib/rsssf/fmtfix/dates.rb
+- lib/rsssf/fmtfix/dates_helpers.rb
+- lib/rsssf/fmtfix/errata.rb
+- lib/rsssf/fmtfix/fmtfix-base.rb
+- lib/rsssf/fmtfix/fmtfix.rb
+- lib/rsssf/fmtfix/goals.rb
+- lib/rsssf/fmtfix/headers.rb
+- lib/rsssf/fmtfix/outline.rb
+- lib/rsssf/fmtfix/patch_headings.rb
+- lib/rsssf/fmtfix/rounds.rb
+- lib/rsssf/fmtfix/score.rb
+- lib/rsssf/fmtfix/tables.rb
+- lib/rsssf/fmtfix/topscorers.rb
+- lib/rsssf/page-find_schedule.rb
+- lib/rsssf/page-meta.rb
 - lib/rsssf/page.rb
-- lib/rsssf/repo.rb
+- lib/rsssf/parse_schedules.rb
+- lib/rsssf/prepare/convert-links.rb
+- lib/rsssf/prepare/convert-meta.rb
+- lib/rsssf/prepare/convert-navlines.rb
+- lib/rsssf/prepare/convert-postproc.rb
+- lib/rsssf/prepare/convert.rb
+- lib/rsssf/prepare/download.rb
+- lib/rsssf/project.rb
 - lib/rsssf/reports/page.rb
 - lib/rsssf/reports/schedule.rb
 - lib/rsssf/schedule.rb
 - lib/rsssf/utils.rb
 - lib/rsssf/version.rb
-homepage: https://github.com/sportdb/sport.db.sources
+homepage: https://github.com/rsssf/scripts
 licenses:
 - Public Domain
 metadata: {}
@@ -131,7 +172,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: rsssf - tools 'n' scripts for RSSSF (Rec.Sport.Soccer Statistics Foundation)