sportdb-readers 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d2044ec2c7a67046c429f4f52fa78a02d64f42b
-  data.tar.gz: 4e4e0102a368e5f9b53d8d40681470017fbc8579
+  metadata.gz: 4299b02180313d31b3706a9248032471ffff4b23
+  data.tar.gz: b11257f793ff6292ad4bb201f3326e719c791360
 SHA512:
-  metadata.gz: bf9db195f63e40f376a5bf9a63a7c73c79a6fcaf8dc42bbcc2fd6e18813ec275ccdab4ba5209ff52adba42b98ca7c211e2b172ac844fe2c721c349ceaf3685d7
-  data.tar.gz: afe05f74d798eb1a0ea04d0d2ed207f858f1d3135a7bfd27eeefadbc55dc8afd8d7eb290dd2652f01394f4a9af335bbc83a7b7f715467e681b2618a86b8c3fca
+  metadata.gz: 1e73305335ddcc20ffcfbd064770edb6469b4b3ab62c3c574e76fbdcb3522f42256f3f337e9a07bef5ffb7ed15786f96fd9c04c5267281aa2cba34283e6284fb
+  data.tar.gz: e0b4d66842c4e66c7bb818496abc26cf75e2932617c19446bc9a804cdde01437866a1d7e61f5364940c569d3f196aa056592fc6fe349afb45b184914afffb627

data/Manifest.txt

@@ -13,5 +13,6 @@ lib/sportdb/readers/match_reader.rb
 lib/sportdb/readers/version.rb
 test/helper.rb
 test/test_match_parser.rb
+test/test_package.rb
 test/test_read.rb
 test/test_reader.rb

data/lib/sportdb/readers/datafile.rb

@@ -25,20 +25,57 @@ class PackageBase
   def each_conf( &blk )   each( pattern: CONF_RE, &blk ); end
   def each_match( &blk )  each( pattern: MATCH_RE, &blk ); end
 
-  def read_conf( season:, sync: )
-    read( pattern: CONF_RE ) do |name,txt|
-      SportDb.parse_conf( season: season, sync: sync )
+
+  def read_conf( *names,
+                 season: nil, sync: true )
+    if names.empty?   ## no (entry) names passed in; read in all
+      each_read( pattern: CONF_RE ) do |name, txt|
+        SportDb.parse_conf( txt, season: season, sync: sync )
+      end
+    else
+      names.each do |name|
+        txt = read_entry( name )
+        SportDb.parse_conf( txt, season: season, sync: sync )
+      end
     end
   end
-  def read_match( season:, sync: )
-    read( pattern: MATCH_RE ) do |name, txt|
-      SportDb.parse_match( season: season, sync: sync )
+
+  def read_match( *names,
+                  season: nil, sync: true )
+    if names.empty?   ## no (entry) names passed in; read in all
+      each_read( pattern: MATCH_RE ) do |name, txt|
+        SportDb.parse_match( txt, season: season, sync: sync )
+      end
+    else
+      names.each do |name|
+        txt = read_entry( name )
+        SportDb.parse_match( txt, season: season, sync: sync )
+      end
+    end
+  end
+
+
+  def read( *names,
+            season: nil, sync: true )
+    if names.empty?   ##  read all datafiles
+      read_conf( season: season, sync: sync )
+      read_match( season: season, sync: sync )
+    else
+      names.each do |name|
+        txt = read_entry( name )
+        if Datafile.match_conf( name )      ## check if datafile matches conf(iguration) naming (e.g. .conf.txt)
+          SportDb.parse_conf( txt, season: season, sync: sync )
+        else                                ## assume "regular" match datafile
+          SportDb.parse_match( txt, season: season, sync: sync )
+        end
+      end
     end
   end
 end   # class PackageBase
 
 
 
+
 class DirPackage < PackageBase    ## todo/check: find a better name e.g. UnzippedPackage, FilesystemPackage, etc. - why? why not?
 
   def initialize( path )
@@ -51,7 +88,7 @@ class DirPackage < PackageBase    ## todo/check: find a better name e.g. Unzippe
     Dir.glob( "#{@path}/**/{*,.*}.txt" ).each do |path|
       ## todo/fix: (auto) skip and check for directories
       if pattern.match( path )
-        yield( path)
+        yield( path )
       else
         ## puts "  skipping >#{path}<"
       end
@@ -68,7 +105,12 @@ class DirPackage < PackageBase    ## todo/check: find a better name e.g. Unzippe
     end
   end
 
-  def read( pattern: )
+  def read_entry( name )
+    txt = File.open( "#{@path}/#{name}", 'r:utf-8').read
+    txt
+  end
+
+  def each_read( pattern: )
     each_file( pattern: pattern ) do |path|
       txt = File.open( path, 'r:utf-8').read
       yield( path, txt )  ## only pass along txt - why? why not? or pass along entry and not just entry.name?
@@ -97,14 +139,58 @@ class ZipPackage < PackageBase
             ## puts "  skipping >#{entry.name}<"
           end
         else
-          puts "** !! ERROR !! #{entry.name} is unknown zip file type, sorry"
+          puts "** !! ERROR !! #{entry.name} is unknown zip file type in >#{@path}<, sorry"
           exit 1
         end
       end
     end
   end
 
-  def read( pattern: )
+
+  def match_entry( name )
+    ## todo/fix:  use Zip::File.glob or find_entry or ?  why? why not?
+
+    pattern = %r{ #{Regexp.escape( name )}    ## match string if ends with name
+                   $
+                }x
+
+    entries = []
+    Zip::File.open( @path ) do |zipfile|
+      zipfile.each do |entry|
+        if entry.directory?
+          next ## skip
+        elsif entry.file?
+          if pattern.match( entry.name )
+            entries << entry
+          end
+        else
+          puts "** !! ERROR !! #{entry.name} is unknown zip file type in >#{@path}<, sorry"
+          exit 1
+        end
+      end
+    end
+    entries
+  end
+
+  def read_entry( name )
+     entries = match_entry( name )
+     if entries.empty?
+       puts "** !!! ERROR !!! zip entry >#{name}< not found in >#{@path}<; sorry"
+       exit 1
+     elsif entries.size > 1
+       puts "** !!! ERROR !!! ambigious zip entry >#{name}<; found #{entries.size} entries in >#{@path}<:"
+       pp entries
+       exit 1
+     else
+       entry = entries[0]
+       txt = entry.get_input_stream.read
+       ##  puts "** encoding: #{txt.encoding}"  #=> encoding: ASCII-8BIT
+       txt = txt.force_encoding( Encoding::UTF_8 )
+     end
+  end
+
+
+  def each_read( pattern: )
     each( pattern: pattern ) do |entry|
       txt = entry.get_input_stream.read
       ##  puts "** encoding: #{txt.encoding}"  #=> encoding: ASCII-8BIT

data/lib/sportdb/readers/version.rb

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

data/test/test_package.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_package.rb
+
+
+require 'helper'
+
+
+class TestPackage < MiniTest::Test
+
+  def test_read
+    eng = Datafile::DirPackage.new( '../../../openfootball/england' )
+    ## eng = Datafile::ZipPackage.new( 'tmp/england-master.zip' )
+    assert eng.read_entry( '2015-16/.conf.txt' ).start_with?( '= English Premier League 2015/16' )
+    assert eng.read_entry( '2017-18/.conf.txt' ).start_with?( '= English Premier League 2017/18' )
+    assert eng.read_entry( '2015-16/1-premierleague-i.txt' ).start_with?( '= English Premier League 2015/16' )
+
+    at  = Datafile::DirPackage.new( '../../../openfootball/austria' )
+    ## at  = Datafile::ZipPackage.new( 'tmp/austria-master.zip' )
+    assert at.read_entry( '2018-19/.conf.txt' ).start_with?( '= Österr. Bundesliga 2018/19' )
+  end  # method test_read
+
+end  # class TestPackage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-readers
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-16 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config
@@ -105,6 +105,7 @@ files:
 - lib/sportdb/readers/version.rb
 - test/helper.rb
 - test/test_match_parser.rb
+- test/test_package.rb
 - test/test_read.rb
 - test/test_reader.rb
 homepage: https://github.com/sportdb/sport.db