datafile.rb in sportdb-formats-1.0.0

- old
+ new
@@ -1,79 +1,59 @@
 # encoding: utf-8
 
 
 module Datafile      # note: keep Datafile in its own top-level module/namespace for now - why? why not?
 
-  def self.find( path, pattern )
-     datafiles = []
-
-     ## check all txt files
-     ## note: incl. files starting with dot (.)) as candidates (normally excluded with just *)
-     candidates = Dir.glob( "#{path}/**/{*,.*}.txt" )
-     pp candidates
-     candidates.each do |candidate|
-       datafiles << candidate    if pattern.match( candidate )
-     end
-
-     pp datafiles
-     datafiles
+  def self.read( path )   ## todo/check: use as a shortcut helper - why? why not?
+     ## note: always assume utf-8 for now!!!
+     File.open( path, 'r:utf-8') {|f| f.read }
   end
 
 
-  CLUBS_RE = %r{  (?: ^|/ )               # beginning (^) or beginning of path (/)
-                       (?: [a-z]{1,4}\. )?   # optional country code/key e.g. eng.clubs.txt
-                       clubs\.txt$
-                   }x
+  ########################
+  ## todo/fix: turn into Datafile::Bundle.new  and Bundle#write/save -why? why not?
+  class Bundle
+    def initialize( path )
+      @path = path
+      @buf  = String.new('')
+    end
 
-  CLUBS_WIKI_RE = %r{  (?:^|/)               # beginning (^) or beginning of path (/)
-                           (?:[a-z]{1,4}\.)?   # optional country code/key e.g. eng.clubs.wiki.txt
-                          clubs\.wiki\.txt$
-                       }x
+    def <<(value)
+       if value.is_a?( Array )  ## assume array of datafiles (file paths)
+         datafiles = value
+         datafiles.each do |datafile|
+           text = Datafile.read( datafile )
+           ## todo/fix/check:  move  sub __END__ to Datafile.read and turn it always on  -  why? why not?
+           text = text.sub( /__END__.*/m, '' )    ## note: add/allow support for __END__; use m-multiline flag
+           @buf << text
+           @buf << "\n\n"
+          end
+        else ## assume string (e.g. header, comments, etc.)
+          text = value
+          @buf << text
+          @buf << "\n\n"
+        end
+    end
+    alias_method :write, :<<
 
-  CLUB_PROPS_RE = %r{  (?: ^|/ )               # beginning (^) or beginning of path (/)
-                       (?: [a-z]{1,4}\. )?   # optional country code/key e.g. eng.clubs.props.txt
-                      clubs\.props\.txt$
-                   }x
+    ## todo/fix/check: write only on close? or write on every write and use close for close?
+    def close
+      File.open( @path, 'w:utf-8' ) do |f|
+        f.write @buf
+      end
+    end
+  end  # class Bundle
 
-  def self.find_clubs( path, pattern: CLUBS_RE )            find( path, pattern ); end
-  def self.find_clubs_wiki( path, pattern: CLUBS_WIKI_RE )  find( path, pattern ); end
 
-  def self.match_clubs( path )       CLUBS_RE.match( path ); end
-  def self.match_clubs_wiki( path )  CLUBS_WIKI_RE.match( path ); end
-  def self.match_club_props( path, pattern: CLUB_PROPS_RE ) pattern.match( path ); end
-
-
-  LEAGUES_RE = %r{  (?: ^|/ )               # beginning (^) or beginning of path (/)
-                        (?: [a-z]{1,4}\. )?   # optional country code/key e.g. eng.clubs.wiki.txt
-                     leagues\.txt$
-                    }x
-
-  def self.find_leagues( path, pattern: LEAGUES_RE )  find( path, pattern ); end
-  def self.match_leagues( path )  LEAGUES_RE.match( path ); end
-
-
-  CONF_RE = %r{  (?: ^|/ )               # beginning (^) or beginning of path (/)
-                     \.conf\.txt$
-                 }x
-
-  def self.find_conf( path, pattern: CONF_RE )  find( path, pattern ); end
-  def self.match_conf( path )  CONF_RE.match( path ); end
-
-
-
   def self.write_bundle( path, datafiles:, header: nil )
-    File.open( path, 'w:utf-8') do |fout|
-      if header
-        fout.write( header )
-        fout.write( "\n\n" )
-      end
-      datafiles.each do |datafile|
-        File.open( datafile, 'r:utf-8') do |fin|
-          text = fin.read
-          text = text.sub( /__END__.*/m, '' )    ## note: add/allow support for __END__; use m-multiline flag
-          fout.write( text )
-        end
-      end
+    bundle = Bundle.new( path )
+    bundle.write( header )   if header
+    datafiles.each do |datafile|
+      text = read( datafile )
+      ## todo/fix/check:  move  sub __END__ to Datafile.read and turn it always on  -  why? why not?
+      text = text.sub( /__END__.*/m, '' )    ## note: add/allow support for __END__; use m-multiline flag
+      bundle.write( text )
     end
+    bundle.close
   end
 
 end # module Datafile