sportdb-formats 2.0.2 → 2.1.0

data/lib/sportdb/formats.rb

@@ -1,17 +1,15 @@
 ## 3rd party gems
-require 'sportdb/structs'
-require 'sportdb/parser'
-require 'date/formats'
+# require 'sportdb/structs'
+# require 'sportdb/parser'
+require 'sportdb/quick'
 
 
 require 'zip'     ## todo/check: if zip is alreay included in a required module
 
 
-## note -  add cocos (code commons)
-##
-##  pulls in read_csv & parse_csv etc.
-require 'cocos'
 
+## todo/check
+##  - logutils already added via quick!!
 
 require 'logutils'
 module SportDb
@@ -26,10 +24,8 @@ end
 # our own code
 require_relative 'formats/version' # let version always go first
 
-require_relative 'formats/datafile'
-require_relative 'formats/datafile_package'
 require_relative 'formats/package'
-
+require_relative 'formats/datafile_package'
 
 
 ## let's put test configuration in its own namespace / module
@@ -46,271 +42,16 @@ end   # module SportDb
 
 
 
-###
-# define search services apis  (move to its own gem later - why? why not?)
-
-module SportDb
-module Import
-
-class Configuration
-  def world()        @world ||= WorldSearch.new( countries: DummyCountrySearch.new ); end
-  def world=(world)  @world = world; end
-
-  ## todo/fix - add/move catalog here from   sportdb-catalogs!!!
-  ## def catalog()         @catalog ||= Catalog.new;  end
-  ## def catalog(catalog)  @catalog = catalog; end
-end # class Configuration
-
-  ##  e.g. use config.catalog  -- keep Import.catalog as a shortcut (for "read-only" access)
-  ## def self.catalog() config.catalog;  end
-  def self.world()   config.world;    end
-
-  ## lets you use
-  ##   SportDb::Import.configure do |config|
-  ##      config.catalog_path = './catalog.db'
-  ##   end
-def self.configure()  yield( config ); end
-def self.config()  @config ||= Configuration.new;  end
-end   # module Import
-end   # module SportDb
-
-
-require_relative 'formats/search/world'
-require_relative 'formats/search/sport'
-require_relative 'formats/search/structs'
-
-
-
-module Sports
-  ## note: just forward to SportDb::Import configuration!!!!!
-  ##  keep Sports module / namespace "clean" - why? why not?
-  ##    that is, only include data structures (e.g. Match,League,etc) for now - why? why not?
-  def self.configure()  yield( config ); end
-  def self.config()  SportDb::Import.config; end
-end   # module Sports
-
-
-###
-#  csv (tabular dataset) support / machinery
-require_relative 'formats/csv/match_status_parser'
-require_relative 'formats/csv/goal'
-require_relative 'formats/csv/goal_parser_csv'
-require_relative 'formats/csv/match_parser_csv'
-
-
-### add convenience shortcut helpers
-module Sports
-  class Match
-    def self.read_csv( path, headers: nil, filters: nil, converters: nil, sep: nil )
-       SportDb::CsvMatchParser.read( path,
-                                       headers:    headers,
-                                       filters:    filters,
-                                       converters: converters,
-                                       sep:        sep )
-    end
-
-    def self.parse_csv( txt, headers: nil, filters: nil, converters: nil, sep: nil )
-       SportDb::CsvMatchParser.parse( txt,
-                                        headers:    headers,
-                                        filters:    filters,
-                                        converters: converters,
-                                        sep:        sep )
-    end
-  end # class Match
-end # module Sports
-
-
-
-
-
-
-
-
-module SportDb
-  module Import
-    Season = ::Season   ## add a convenience alias for top-level Season class
-
-    ## add "old" convenience aliases for structs - why? why not?
-    ##   todo/check: just use include Sports !!!!
-    Country      = ::Sports::Country
-    League       = ::Sports::League
-    Group        = ::Sports::Group
-    Round        = ::Sports::Round
-    Match        = ::Sports::Match
-    Matchlist    = ::Sports::Matchlist
-    Goal         = ::Sports::Goal
-    Team         = ::Sports::Team
-    NationalTeam = ::Sports::NationalTeam
-    Club         = ::Sports::Club
-    Standings    = ::Sports::Standings
-    TeamUsage    = ::Sports::TeamUsage
-
-    Ground       = ::Sports::Ground
-
-    Player       = ::Sports::Player
-
-    EventInfo    = ::Sports::EventInfo
-
-
-    class Team
-      ## add convenience lookup helper / method for name by season for now
-      ##   use clubs history - for now kept separate from struct - why? why not?
-      def name_by_season( season )
-        ## note: returns / fallback to "regular" name if no records found in history
-        SportDb::Import.catalog.clubs_history.find_name_by( name: name, season: season ) || name
-      end
-    end  # class Team
-
-  end   # module Import
-end     # module SportDb
-
-
-require_relative 'formats/match/match_parser'
-require_relative 'formats/match/conf_parser'
-
-
-
-require_relative 'formats/country/country_reader'
-
-
-## add convenience helper
-module SportDb
-module Import
-class Country
-  def self.read( path )  CountryReader.read( path ); end
-  def self.parse( txt )  CountryReader.parse( txt ); end
-end   # class Country
-end   # module Import
-end   # module SportDb
-
-
-require_relative 'formats/league/league_reader'
-require_relative 'formats/league/league_outline_reader'
-
-##
-## add convenience helper / short-cuts
-module SportDb
-module Import
-class League
-  def self.read( path ) LeagueReader.read( path ); end
-  def self.parse( txt ) LeagueReader.parse( txt ); end
-end   # class League
-end   # module Import
-end   # module SportDb
-
-
-require_relative 'formats/team/club_reader'
-require_relative 'formats/team/club_reader_props'
-require_relative 'formats/team/wiki_reader'
-
-require_relative 'formats/team/club_reader_history'
-require_relative 'formats/team/club_index_history'
-
-
-###
-# add convenience helpers / shortcuts
-module SportDb
-  module Import
-
-class Club
-  def self.read( path )  ClubReader.read( path ); end
-  def self.parse( txt )  ClubReader.parse( txt ); end
-
-  def self.read_props( path )  ClubPropsReader.read( path ); end
-  def self.parse_props( txt )  ClubPropsReader.parse( txt ); end
-  ##  todo/check: use ClubProps.read and ClubProps.parse convenience alternate shortcuts - why? why not?
-end # class Club
-
-end   # module Import
-end   # module SportDb
-
-
-require_relative 'formats/event/event_reader'
-
-## add convenience helper
-module SportDb
-module Import
-class EventInfo
-  def self.read( path )  EventInfoReader.read( path ); end
-  def self.parse( txt )  EventInfoReader.parse( txt ); end
-end   # class EventInfo
-end   # module Import
-end   # module SportDb
-
-
-
-require_relative 'formats/ground/ground_reader'
+require_relative 'formats/quick_match_linter'
 
 
+# require_relative 'formats/team/club_reader_history'
+# require_relative 'formats/team/club_index_history'
 
 
 
 ### auto-configure builtin lookups via catalog.db(s)
-require 'sportdb/catalogs'
-
-
-module SportDb
-module Import
-
-class Configuration
-  ## note: add more configs (open class), see sportdb-structs for original config!!!
-
-  ###
-  #  find a better name for setting - why? why not?
-  #     how about catalogdb or ???
-  attr_reader   :catalog_path
-  def catalog_path=(path)
-      @catalog_path = path
-      ########
-      # reset database here to new path
-      CatalogDb::Metal::Record.database = path
-
-      ##  plus automagically set world search too (to use CatalogDb)
-      self.world = WorldSearch.new(
-                          countries: CatalogDb::Metal::Country,
-                          cities:    CatalogDb::Metal::City,
-                        )
-
-      @catalog_path
-  end
-
-  def catalog
-       @catalog ||= SportSearch.new(
-                           leagues:        CatalogDb::Metal::League,
-                           national_teams: CatalogDb::Metal::NationalTeam,
-                           clubs:          CatalogDb::Metal::Club,
-                           grounds:        CatalogDb::Metal::Ground,
-                           events:         CatalogDb::Metal::EventInfo,
-                           players:        CatalogDb::Metal::Player,    # note - via players.db !!!
-                        )
-  end
-
-  ###
-  #  find a better name for setting - why? why not?
-  #     how about playersdb or ???
-  attr_reader   :players_path
-  def players_path=(path)
-      @players_path = path
-      ########
-      # reset database here to new path
-      CatalogDb::Metal::PlayerRecord.database = path
-
-      @players_path
-  end
-end # class Configuration
-
-
-  ##  e.g. use config.catalog  -- keep Import.catalog as a shortcut (for "read-only" access)
-  def self.catalog() config.catalog;  end
-end   # module Import
-end   # module SportDb
-
-
-###
-## add default/built-in catalog here - why? why not?
-##  todo/fix  - set catalog_path on demand
-##   note:  for now required for world search setup etc.
-SportDb::Import.config.catalog_path = "#{FootballDb::Data.data_dir}/catalog.db"
+require 'sportdb/search'
 
 
 

metadata

@@ -1,99 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-formats
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
+date: 2024-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sportdb-structs
+  name: sportdb-search
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: sportdb-parser
+  name: sportdb-quick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
-- !ruby/object:Gem::Dependency
-  name: sportdb-catalogs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.2
-- !ruby/object:Gem::Dependency
-  name: date-formats
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: cocos
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +89,7 @@ dependencies:
 description: sportdb-formats - sport.db format and text utilities
 email: gerald.bauer@gmail.com
 executables:
-- fbx
+- fbchk
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -156,30 +100,12 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- bin/fbx
+- bin/fbchk
 - lib/sportdb/formats.rb
-- lib/sportdb/formats/country/country_reader.rb
-- lib/sportdb/formats/csv/goal.rb
-- lib/sportdb/formats/csv/goal_parser_csv.rb
-- lib/sportdb/formats/csv/match_parser_csv.rb
-- lib/sportdb/formats/csv/match_status_parser.rb
-- lib/sportdb/formats/datafile.rb
 - lib/sportdb/formats/datafile_package.rb
-- lib/sportdb/formats/event/event_reader.rb
-- lib/sportdb/formats/ground/ground_reader.rb
-- lib/sportdb/formats/league/league_outline_reader.rb
-- lib/sportdb/formats/league/league_reader.rb
-- lib/sportdb/formats/match/conf_parser.rb
-- lib/sportdb/formats/match/match_parser.rb
 - lib/sportdb/formats/package.rb
-- lib/sportdb/formats/search/sport.rb
-- lib/sportdb/formats/search/structs.rb
-- lib/sportdb/formats/search/world.rb
+- lib/sportdb/formats/quick_match_linter.rb
 - lib/sportdb/formats/team/club_index_history.rb
-- lib/sportdb/formats/team/club_reader.rb
-- lib/sportdb/formats/team/club_reader_history.rb
-- lib/sportdb/formats/team/club_reader_props.rb
-- lib/sportdb/formats/team/wiki_reader.rb
 - lib/sportdb/formats/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:

data/bin/fbx

@@ -1,146 +0,0 @@
-#!/usr/bin/env ruby
-
-## tip: to test run:
-##   ruby -I ./lib -I ../parser/lib bin/fbx
-
-
-## our own code
-require 'sportdb/formats'
-
-
-
-require 'optparse'
-
-##
-## read textfile
-##   and dump match parse results
-##
-##   fbt  ../openfootball/.../euro.txt
-
-
-
-
- args = ARGV
- opts = { debug: false,
-          outline: 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( "--verbose", "--debug",
-               "turn on verbose / debug output (default: #{opts[:debug]})" ) do |debug|
-    opts[:debug] = debug
-  end
-
-  parser.on( "--outline",
-                "turn on outline (only) output (default: #{opts[:outline]})" ) do |outline|
-    opts[:outline] = outline
-  end
-end
-parser.parse!( args )
-
-puts "OPTS:"
-p opts
-puts "ARGV:"
-p args
-
-
-
-
-
-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
-
-
-
-
-
-
-
-SportDb::MatchParser.debug = true    if opts[:debug]
-
-
-## errors = []
-
-
-paths.each_with_index do |path,i|
-    puts "==> [#{i+1}/#{paths.size}] reading >#{path}<..."
-
-    txt = read_text( path )
-    secs = SportDb::LeagueOutlineReader.parse( txt )
-    ## pp secs
-
-    secs.each_with_index do |sec,j|   ## sec(tion)s
-      season = sec[:season]
-      league = sec[:league]
-      stage  = sec[:stage]
-      lines  = sec[:lines]
-
-      puts "   section #{j+1}/#{secs.size} -   #{league.name} #{season}, #{stage}  -  #{lines.size} line(s)"
-
-      next if opts[:outline]
-
-=begin
-    ### check if event info availabe - use start_date;
-      ##    otherwise we have to guess (use a "synthetic" start_date)
-      event_info = catalog.events.find_by( season: season,
-                                           league: league )
-
-      start = if event_info && event_info.start_date
-                  puts "event info found:"
-                  puts "  using start date from event: "
-                  pp event_info
-                  pp event_info.start_date
-                  event_info.start_date
-              else
-=end
-     start  =   if season.year?
-                  Date.new( season.start_year, 1, 1 )
-                else
-                  Date.new( season.start_year, 7, 1 )
-                end
-
-      parser = SportDb::MatchParser.new( lines,
-                                         start )   ## note: keep season start_at date for now (no need for more specific stage date need for now)
-
-      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
-    end  # each secs
-end  # each paths
-
-=begin
-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
-=end
-
-puts "bye"
-