sportdb-readers 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b82ac613158881351d512a4ffc9e7d15f34b133
-  data.tar.gz: 52251959f919b175feec37cadcc51e56c70e5037
+  metadata.gz: 34f6b00e00c0ff63899b32ef86eefd077d54315a
+  data.tar.gz: 6da90ea9439ed32f442fb148ce79d3184bfa7e32
 SHA512:
-  metadata.gz: 32c7921845dd7db5c2771a5941ab7ca0b27839eb88c80d71703354f6f533ca1c2eb99b47671e2462cbddcddb443fab3d0e115a4991f3d6155185a081d500796e
-  data.tar.gz: 072a747031829fb495773946c13ec6a43627c7b6de4b21b752c40eb2d1962c1fb3a047982fe83f1257be0b9be3f9115d0eed0d798de1b3dae2f93518e2ac02d3
+  metadata.gz: 8ea4888386c7ae6c371d5145728a04516de88d6aa3d392feb1a141301215fd0268338e944415137ea7ded6e740ff37256da584ef53c411c6f0b2441eef96d9ee
+  data.tar.gz: f43c9e976a1ad41d5096bc7205799eb7371a980f8753dd6f5507e3e68ea46576e971cf41f347a0e369c83c4b4c2f52c6f7d430f1609343bc0a24213aedd2bb15

data/lib/sportdb/readers/conf_parser_auto.rb

@@ -5,6 +5,14 @@ module SportDb
 
 class AutoConfParser
 
+  def self.parse( lines, start: )
+    ##  todo/fix: add support for txt and lines
+    ##    check if lines_or_txt is an array or just a string
+    parser = new( lines, start )
+    parser.parse
+  end
+
+
   include LogUtils::Logging
 
   def initialize( lines, start )

data/lib/sportdb/readers/match_parser.rb

@@ -3,6 +3,16 @@
 module SportDb
 
 class MatchParserSimpleV2   ## simple match parser for club match schedules
+
+  def self.parse( lines, teams, start: )
+    ##  todo/fix: add support for txt and lines
+    ##    check if lines_or_txt is an array or just a string
+    ##   use teams: like start:  why? why not?
+    parser = new( lines, teams, start )
+    parser.parse
+  end
+
+
   include LogUtils::Logging
 
   def initialize( lines, teams, start )

data/lib/sportdb/readers/match_reader.rb

@@ -4,6 +4,10 @@ module SportDb
 
 class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why? why not?
 
+  def self.config()  Import.config; end
+
+
+
   def self.read( path, season: nil )   ## use - rename to read_file or from_file etc. - why? why not?
     txt = File.open( path, 'r:utf-8' ).read
     parse( txt, season: season )
@@ -14,12 +18,61 @@ class MatchReaderV2    ## todo/check: rename to MatchReaderV2 (use plural?) why?
     pp recs
 
     recs.each do |rec|
-      league = Sync::League.find!( rec[:league] )
-      season = Sync::Season.find!( rec[:season] )
+      league = Sync::League.find_or_create( rec[:league] )
+      season = Sync::Season.find_or_create( rec[:season] )
+
+      stage = nil
+      auto_conf_clubs = nil
+      if rec[:stage]
+        event  = Sync::Event.find_or_create( league: league, season: season )
+        stage  = Sync::Stage.find( rec[:stage], event: event )
+        if stage.nil?
+          ## fix: just use Stage.create
+          stage = Sync::Stage.find_or_create( rec[:stage], event: event )
+
+          auto_conf_clubs = AutoConfParser.parse( rec[:lines],
+                                                  start: event.start_at )
+        end
+      else
+        event  = Sync::Event.find( league: league, season: season )
+        if event.nil?
+          ## fix: just use Event.create
+          event  = Sync::Event.find_or_create( league: league, season: season )
+
+          auto_conf_clubs = AutoConfParser.parse( rec[:lines],
+                                                  start: event.start_at )
+        end
+      end
+
+
+      if auto_conf_clubs
+        ## step 1: map/find clubs
+        club_recs = []
+        ## note: loop over keys (holding the names); values hold the usage counter!! e.g. 'Arsenal' => 2, etc.
+        country = config.countries[ league.country.key ]  ## hack/fix: convert to Import::Country from Model::Country
+        ## todo: check is_a? Country check to respond_to? :key  in match in sportdb-clubs !!!!!
+        ##  todo/fix: just pass in league.country (and NOT key)
+        auto_conf_clubs.keys.each do |name|
+           club_rec = config.clubs.find_by!( name: name, country: country )
+           club_recs << club_rec
+        end
+
+        ## step 2: add to database
+        club_recs.each do |club_rec|
+          club = Sync::Club.find_or_create( club_rec )
+          ## add teams to event
+          ##   todo/fix: check if team is alreay included?
+          ##    or clear/destroy_all first!!!
+          if stage
+            stage.teams << club
+          else
+            event.teams << club
+          end
+        end
+      end
+
 
-      event  = Sync::Event.find!( league: league, season: season )
       if rec[:stage]
-        stage = Sync::Stage.find!( rec[:stage], event: event )
         teams = stage.teams
       else
         teams = event.teams

data/lib/sportdb/readers/version.rb

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

data/test/test_reader.rb

@@ -10,8 +10,55 @@ require 'helper'
 
 class TestReader < MiniTest::Test
 
-  def test_read
+  def test_read_i
+    SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
+    SportDb.create_all   ## build schema
+
+    ## turn on logging to console
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+txt =<<TXT
+= English Premier League 2017/18
+
+Matchday 1
+
+[Fri Aug/11]
+  Arsenal FC               4-3  Leicester City
+[Sat Aug/12]
+  Watford FC               3-3  Liverpool FC
+  Chelsea FC               2-3  Burnley FC
+  Crystal Palace           0-3  Huddersfield Town
+  Everton FC               1-0  Stoke City
+  Southampton FC           0-0  Swansea City
+  West Bromwich Albion     1-0  AFC Bournemouth
+  Brighton & Hove Albion   0-2  Manchester City
+[Sun Aug/13]
+  Newcastle United         0-2  Tottenham Hotspur
+  Manchester United        4-0  West Ham United
+
+
+Matchday 2
+
+[Sat Aug/19]
+  Swansea City             0-4  Manchester United
+  AFC Bournemouth          0-2  Watford FC
+  Burnley FC               0-1  West Bromwich Albion
+  Leicester City           2-0  Brighton & Hove Albion
+  Liverpool FC             1-0  Crystal Palace
+  Southampton FC           3-2  West Ham United
+  Stoke City               1-0  Arsenal FC
+[Sun Aug/20]
+  Huddersfield Town        1-0  Newcastle United
+  Tottenham Hotspur        1-2  Chelsea FC
+[Mon Aug/21]
+  Manchester City          1-1  Everton FC
+TXT
+
+    SportDb::MatchReaderV2.parse( txt )
+  end  # method test_read_i
+
 
+  def xxx_test_read_ii
     SportDb.connect( adapter: 'sqlite3', database: ':memory:' )
     SportDb.create_all   ## build schema
 
@@ -33,5 +80,5 @@ class TestReader < MiniTest::Test
     recs = SportDb::MatchReaderV2.read( path )
     # path = "../../../openfootball/england/2017-18/1-premierleague-ii.txt"
     #recs = SportDb::MatchReaderV2.read( path )
-  end  # method test_read
+  end  # method test_read_ii
 end  # class TestReader

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config