sportdb-writers 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8617a863daaeb1b9d99c74068d58e762086ba329a423dee7effce66659b28e33
-  data.tar.gz: 920417fb198af92e662102d356cfae8edb038fdeb9f7659d6538b942ed6f2835
+  metadata.gz: b08a4a77a08af12a0f8c7b9873c5115b8b8135e13e3b7d878ab246567a8ffa32
+  data.tar.gz: a6e9f8f3b0933667f2fa4cf5eb7903c4410ead48e3647dfb903e261bb3f164be
 SHA512:
-  metadata.gz: 1e179dfaa2ad55f64f690308a83af8a0861056050faa7e1d0e5645d7098c54f090ffdc24a8dea30d903ce4b72c2860a3a3741b8f954ee9f343a4f27d62df8297
-  data.tar.gz: 00340a7bfb452dbf504e15346f6ecdd63757853dd2144a868bc77e4742b4f8f6efe1c98c982c6a449caaf20d5cd4883bdc99317e949caa80f72e245fef62b5c0
+  metadata.gz: 1ebb1e1a90a196a992fef5eebf43baea0e613f559d73db25d8bd8812da67fe31bb4f286b767e7423c80f00d25d1c3f745972946448eaab8a3239e9f53a8d78fc
+  data.tar.gz: 02342a063aef2f2604567a70a76e4caf48e49b555ab1b09fb7da996b6812547c17d684a053b3164f9b797de44e4c2a2c490a66b7865983d8d63fb78eda3294a8

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.4.2
+### 0.4.3
 ### 0.0.1 / 2020-11-15
 
 * Everything is new. First release.

data/Manifest.txt

@@ -5,4 +5,5 @@ Rakefile
 lib/sportdb/writers.rb
 lib/sportdb/writers/goals.rb
 lib/sportdb/writers/txt_writer.rb
+lib/sportdb/writers/txt_writer_v2.rb
 lib/sportdb/writers/version.rb

data/lib/sportdb/writers/txt_writer.rb

@@ -11,31 +11,40 @@ class TxtMatchWriter
    'Viertelfinale' => 'Quarterfinals',
    'Halbfinale'    => 'Semifinals',
    'Finale'        => 'Final',
- }
-
 
-## note: build returns buf - an (in-memory) string buf(fer)
-def self.build( matches, rounds: true )
-  ## note: make sure rounds is a bool, that is, true or false  (do NOT pass in strings etc.)
-  raise ArgumentError, "rounds flag - bool expected; got: #{rounds.inspect}"    unless rounds.is_a?( TrueClass ) || rounds.is_a?( FalseClass )
+   'Gruppe A'      => 'Group A',
+   'Gruppe B'      => 'Group B',
+   'Gruppe C'      => 'Group C',
+   'Gruppe D'      => 'Group D',
+   'Gruppe E'      => 'Group E',
+   'Gruppe F'      => 'Group F',
+ }
 
 
+##  helper - to calculate match stats e.g.
+##              how many stages, start and end dates, etc.
+def self._calc_stats( matches )
   ### check for stages & stats
-  stats = {  'stage' => Hash.new(0),
-             'date' =>  { 'start_date' => nil,
-                          'end_date'   => nil, },
-             'teams' => Hash.new(0),
-              }
-
-## add matches played stats too??
+  stats = {  'stage'     => Hash.new(0),
+             'date'      =>  { 'start_date' => nil,
+                               'end_date'   => nil, },
+             'teams'     => Hash.new(0),
+             'matches'    => 0,
+             'use_stages' => false,
+          }
+
+  ## add matches played stats too??
+  ##   for now only simply count used
+  stats['matches'] = matches.size
 
   matches.each do |match|
      stage = match.stage
      stage = 'Regular Season'   if stage.nil? || stage.empty?
      stats['stage'][ stage ] += 1
 
+     ## note - date for now optional (not required)!!!!
+     ##            only teams for match
      if match.date
-
       ## todo/fix - norm date (parse as Date)
       ##   check format etc.
       date = if match.date.is_a?( String )
@@ -48,52 +57,74 @@ def self.build( matches, rounds: true )
 
        stats['date']['start_date'] = date  if date < stats['date']['start_date']
        stats['date']['end_date']   = date  if date > stats['date']['end_date']
-      end
+     end
 
      [match.team1, match.team2].each do |team|
         stats['teams'][ team ] += 1    if team && !['N.N.'].include?( team )
      end
   end
+            
+  ## add & update use_stage flag
+  stats['use_stages']  =  if stats['stage'].size >= 2  ||
+                            (stats['stage'].size == 1  &&
+                             stats['stage'].keys[0] != 'Regular Season')
+                              true
+                         else
+                              false
+                         end
+  stats
+end
 
-  use_stages =  if stats['stage'].size >= 2  ||
-                   (stats['stage'].size == 1  &&
-                    stats['stage'].keys[0] != 'Regular Season')
-                  true
-                else
-                  false
-                end
-
-
-   ### add comment header
-    buf = String.new
-    # e.g. 13 April – 25 September 2024
-    #  or  16 August 2024 – 25 May 2025
-    ## note - date is optional!!
-    if stats['date']['start_date']
-      buf << "# Date       "
-      start_date = stats['date']['start_date']
-      end_date   = stats['date']['end_date']
-      if start_date.year != end_date.year
-        buf << "#{start_date.strftime('%a %b/%-d %Y')} - #{end_date.strftime('%a %b/%-d %Y')}"
-      else
-        buf << "#{start_date.strftime('%a %b/%-d')} - #{end_date.strftime('%a %b/%-d %Y')}"
-      end
-      buf << " (#{end_date.jd-start_date.jd}d)"   ## add days
-      buf << "\n"
-    end
+def self._build_stats( stats )
+ ### add comment header
+ buf = String.new
+ # e.g. 13 April – 25 September 2024
+ #  or  16 August 2024 – 25 May 2025
+ ## note - date is optional!!
+ if stats['date']['start_date']
+   buf << "# Date       "
+   start_date = stats['date']['start_date']
+   end_date   = stats['date']['end_date']
+   if start_date.year != end_date.year
+     buf << "#{start_date.strftime('%a %b/%-d %Y')} - #{end_date.strftime('%a %b/%-d %Y')}"
+   else
+     buf << "#{start_date.strftime('%a %b/%-d')} - #{end_date.strftime('%a %b/%-d %Y')}"
+   end
+   buf << " (#{end_date.jd-start_date.jd}d)"   ## add days
+   buf << "\n"
+ end
+
+ buf << "# Teams      #{stats['teams'].size}\n"
+ buf << "# Matches    #{stats['matches']}\n"
+
+ if stats['use_stages']
+   buf << "# Stages     "
+   stages = stats['stage'].map { |name,count| "#{name} (#{count})" }.join( '  ' )
+   buf << stages
+   buf << "\n"
+ end
+
+  buf 
+end
 
-    buf << "# Teams      #{stats['teams'].size}\n"
-    buf << "# Matches    #{matches.size}\n"
 
-    if use_stages
-      buf << "# Stages     "
-      stages = stats['stage'].map { |name,count| "#{name} (#{count})" }.join( '  ' )
-      buf << stages
-      buf << "\n"
-    end
-    buf << "\n\n"
+## note: build returns buf - an (in-memory) string buf(fer)
+def self.build( matches, rounds: true )
+  ## note: make sure rounds is a bool, that is, true or false  (do NOT pass in strings etc.)
+  raise ArgumentError, "rounds flag - bool expected; got: #{rounds.inspect}"    unless rounds.is_a?( TrueClass ) || rounds.is_a?( FalseClass )
+
+
+  ### calc stats and check for stages 
+  stats = _calc_stats( matches )
+
+  buf = String.new
+
+  ### add comment header
+  buf << _build_stats( stats )
+  buf << "\n\n"
 
 
+  use_stages = stats['use_stages' ]
   if use_stages
     ## split matches by stage
     matches_by_stage = {}

data/lib/sportdb/writers/txt_writer_v2.rb

@@ -0,0 +1,188 @@
+module SportDb
+class TxtMatchWriter
+
+
+
+## note: build returns buf - an (in-memory) string buf(fer)
+def self.build_v2( matches, rounds: true )
+  ## note: make sure rounds is a bool, that is, true or false  (do NOT pass in strings etc.)
+  raise ArgumentError, "rounds flag - bool expected; got: #{rounds.inspect}"    unless rounds.is_a?( TrueClass ) || rounds.is_a?( FalseClass )
+
+
+  ### check for stages & stats
+  stats = _calc_stats( matches )
+
+
+  buf = String.new
+
+  ### add comment header
+  buf << _build_stats( stats )
+  buf << "\n\n"
+
+  buf << _build_batch_v2( matches, rounds: rounds )
+
+  buf
+end
+
+
+def self._build_batch_v2( matches, rounds: true )
+  ## note: make sure rounds is a bool, that is, true or false  (do NOT pass in strings etc.)
+  raise ArgumentError, "rounds flag - bool expected; got: #{rounds.inspect}"    unless rounds.is_a?( TrueClass ) || rounds.is_a?( FalseClass )
+
+  last_round = nil
+  last_year  = nil  
+  last_date  = nil
+  last_time  = nil
+
+
+  buf = String.new
+
+
+  matches.each_with_index do |match,i|
+
+     ## note: make rounds optional (set rounds flag to false to turn off)
+     if rounds
+        ## build round string
+        round = if match.round.is_a?( Integer ) ||
+                   match.round =~ /^[0-9]+$/   ## all numbers/digits
+                      ## default "class format
+                      ##   e.g. Runde 1, Spieltag 1, Matchday 1, Week 1
+                      "Matchday #{match.round}"
+                else ## use as is from match
+                  ## note: for now assume english names
+                  if match.round.nil?
+                    ## warn
+                    puts "!! ERROR - match with round nil?"
+                    pp match
+                    exit 1
+                  end
+                  (ROUND_TRANSLATIONS[match.round] || match.round)
+                end
+  
+        ## if stage present - (auto-)add upfront
+        round = "#{match.stage}, #{round}"   if match.stage
+
+
+        if round != last_round
+         buf << (i == 0 ? "\n" : "\n\n")    ## start with single empty line
+         buf << "» #{round}\n" 
+         
+         ## note - reset last_date & last_time on every new round header
+         last_date  = nil
+         last_time  = nil
+         last_round = round
+       end
+     end
+
+
+     date = if match.date.is_a?( String )
+               Date.strptime( match.date, '%Y-%m-%d' )
+            else  ## assume it's already a date (object) or nil!!!!
+               match.date
+            end
+
+     time = if match.time.is_a?( String )
+              Time.strptime( match.time, '%H:%M')
+            else ## assume it's already a time (object) or nil
+              match.time
+            end
+
+
+     ## note - date might be NIL!!!!!
+     date_yyyymmdd = date ? date.strftime( '%Y-%m-%d' ) : nil
+  
+     ## note: time is OPTIONAL for now
+     ## note: use 17.00 and NOT 17:00 for now
+     time_hhmm     = time ? time.strftime( '%H.%M' ) : nil
+
+
+     if date_yyyymmdd
+         if date_yyyymmdd != last_date
+            ## note: add an extra leading blank line (if no round headings printed)
+            buf << "\n"   unless rounds
+
+            buf << "  "
+            ## note: only add year if different for last date header
+            buf << if (date ? date.year : nil) != last_year
+                     "#{date.strftime( '%a %b/%-d %Y' )}" 
+                   else 
+                     "#{date.strftime( '%a %b/%-d' )}"
+                   end
+            buf << "\n"
+            last_time = nil
+         end
+     end
+
+
+     ## allow strings and structs for team names
+     team1 = match.team1.is_a?( String ) ? match.team1 : match.team1.name
+     team2 = match.team2.is_a?( String ) ? match.team2 : match.team2.name
+
+
+     line = String.new
+     line << '  '
+
+     if time
+        if last_time != time_hhmm
+          line << "  %5s" % time_hhmm
+        else
+          line << (' ' *7)
+        end
+        line << '  '
+     else
+       line << (' ' *9)
+     end
+
+     line << "%-23s" % team1    ## note: use %-s for left-align
+     line << " v "
+     line << "%-23s" % team2
+
+     ## note - only print if score is available
+     ##          returns - for not available for now!!!!
+     score = match.score.to_s( lang: 'en' )
+     if score != '-'
+        ## note: separate by at least two spaces for now
+        line << "  #{score}  "  
+     end
+
+     if match.status
+      line << '  '
+      case match.status
+      when Status::CANCELLED
+        line << '[cancelled]'
+      when Status::AWARDED
+        line << '[awarded]'
+      when Status::ABANDONED
+        line << '[abandoned]'
+      when Status::REPLAY
+        line << '[replay]'
+      when Status::POSTPONED
+        line << '[postponed]'
+        ## was -- note: add NOTHING for postponed for now
+      else
+        puts "!! WARN - unknown match status >#{match.status}<:"
+        pp match
+        line << "[#{match.status.downcase}]"  ## print "literal" downcased for now
+      end
+     end
+
+     ## add match line
+     buf << line.rstrip   ## remove possible right trailing spaces before adding
+     buf << "\n"
+
+     if match.goals
+       buf << '    '               # 4 space indent
+       buf << '       '  if time   # 7 (5+2) space indent (for hour e.g. 17.30)
+       buf << "[#{build_goals(match.goals)}]"
+       buf << "\n"
+     end
+
+     last_year  = date ? date.year : nil
+     last_date  = date_yyyymmdd
+     last_time  = time_hhmm
+  end
+  buf
+end
+
+end # class TxtMatchWriter
+end # module SportDb

data/lib/sportdb/writers/version.rb

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

data/lib/sportdb/writers.rb

@@ -28,6 +28,7 @@ end   # module Writer
 require_relative 'writers/version'
 require_relative 'writers/goals'
 require_relative 'writers/txt_writer'
+require_relative 'writers/txt_writer_v2'
 
 
 
@@ -42,10 +43,26 @@ class TxtMatchWriter
   
     puts "==> writing to >#{path}<..."
     File.open( path, 'w:utf-8' ) do |f|
-      f.write( "= #{name}\n" )
+      f.write( "= #{name}\n\n" )
       f.write( buf )
     end
   end # method self.write
+
+  def self.write_v2( path, matches, name:, rounds: true)
+
+    buf = build_v2( matches, rounds: rounds )
+  
+    ## for convenience - make sure parent folders/directories exist
+    FileUtils.mkdir_p( File.dirname( path) )  unless Dir.exist?( File.dirname( path ))
+  
+    puts "==> writing to >#{path}<..."
+    File.open( path, 'w:utf-8' ) do |f|
+      f.write( "= #{name}\n\n" )
+      f.write( buf )
+    end
+  end # method self.write_v2
+
+
 end  # class TxtMatchWriter
 end  # module SportDb
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-writers
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-structs
@@ -75,6 +75,7 @@ files:
 - lib/sportdb/writers.rb
 - lib/sportdb/writers/goals.rb
 - lib/sportdb/writers/txt_writer.rb
+- lib/sportdb/writers/txt_writer_v2.rb
 - lib/sportdb/writers/version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses: