fbtok 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15089da91cb8cb9ce5f6905c3714e52758fcf4254c26f978ef1a64ac053caf9d
-  data.tar.gz: 13edb307d1fcbc9b0e30ff80f1764623c5f4a1cc17ef225e61d96e071615bcc6
+  metadata.gz: f1d30fb729e926e1745a62c927272839f8be9b6578b92a6d4aa6415872c49164
+  data.tar.gz: 9eb174553656a9394993c554969600262807f8210dd1b4d01a5b392431bf14f0
 SHA512:
-  metadata.gz: 2d56318a4f9895dd71b8c6309ba131e2a310e0bc5d799bfe646f67220138ca1351bbde05ee5725bd28676988ccdbca009f0868b8de6f0e9a2ea5923743a2a32f
-  data.tar.gz: a28531c219b2ccf4cd1ee76129dcb8564433b1b3c2bdd1fd439ab44a4be2d04541cb8436cc9daab15c3010b22f590179556acfed1a2d2c8b23243f5156220e01
+  metadata.gz: 9fadde8d521bf4dc46f20650789b1b9de1e8ffe68289bd499ea5d0807e8911bfe7a424a082dfcc599c8e7e97dce63b30ed9962d93cba4cf6b4d5ee3e4f8703bf
+  data.tar.gz: 197a3385174d42bab7045a8d3e64844f85d131da66d51973cfca71cd2176e88baa2831b40a9d1cfe31b8f13352971576f5427b02575c8b2a12d7f38d81fc3ce9

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.3.2
+### 0.3.4
 ### 0.0.1 / 2025-01-02
 
 * Everything is new. First release.

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 
 
 Hoe.spec 'fbtok' do
-  self.version = '0.3.2'
+  self.version = '0.3.4'
 
   self.summary = "fbtok - football.txt lint tools incl. tokenizer, parser & more"
   self.description = summary

data/lib/fbtok/opts.rb

@@ -12,8 +12,10 @@ class Opts
   
 
     SEASON_RE = %r{ (?:
-                       \d{4}-\d{2}
-                     | \d{4}(--[a-z0-9_-]+)?
+                       (?<season>\d{4}-\d{2})
+                        | 
+                       (?<season>\d{4}) 
+                         (?: --[a-z0-9_-]+ )?   ## todo/fix - allow "extension" to 2024-25 too - why?
                     )
                   }x
     SEASON = SEASON_RE.source    ## "inline" helper for embedding in other regexes - keep? why? why not?
@@ -25,15 +27,29 @@ class Opts
     ##     BUT NOT as first character!!! (e.g. exclude .confg.txt !!!)
     ##               e.g. 2024-25/at.1.txt
     ##                        change to at_1 or uefa_cl or such - why? why not?
-    MATCH_RE = %r{ (?: ^|/ )      # beginning (^) or beginning of path (/)
+    MATCH_RE = %r{ (?:   ## "classic"  variant i)  with season folder
+                      (?: ^|/ )      # beginning (^) or beginning of path (/)
                        #{SEASON}
-                     /[a-z0-9][a-z0-9_.-]*\.txt$  ## txt e.g /1-premierleague.txt
+                         /
+                       [a-z0-9][a-z0-9_.-]*\.txt$  ## txt e.g /1-premierleague.txt
+                    )
+                     |
+                    (?:  ## "compact" variant ii) with season in filename
+                       (?: ^|/ )      # beginning (^) or beginning of path (/)
+                        (?:  (?<season>\d{4}-\d{2}) 
+                                | 
+                             (?<season>\d{4})
+                         )
+                         _  ## allow more than one underscore - why? why not?
+                        [a-z0-9][a-z0-9_.-]*\.txt$           
+                    )
                 }x
 
+    ### add support for matchdatafile with season NOT in directory
+    ##      but starting filename e.g. 2024_friendlies.txt or 2024-25_bundesliga.txt
 
 
-
-def self._find( path )
+def self._find( path, seasons: nil )
     ## check - rename dir
     ##          use root_dir or work_dir or cd or such - why? why not?
 
@@ -44,6 +60,11 @@ def self._find( path )
     ## path = path.gsub( "\\", '/' )
     path =  File.expand_path( path )
           
+    if seasons && seasons.size > 0
+       ## norm seasons
+       seasons = seasons.map {|season| Season(season) }
+    end
+
 
     ## check all txt files
     ## note: incl. files starting with dot (.)) as candidates
@@ -51,7 +72,14 @@ def self._find( path )
     candidates = Dir.glob( "#{path}/**/{*,.*}.txt" )
     ## pp candidates
     candidates.each do |candidate|
-      datafiles << candidate    if MATCH_RE.match( candidate )
+       if m=MATCH_RE.match( candidate )
+          if seasons && seasons.size > 0   ## check for seasons filter 
+            season = Season.parse(m[:season])
+            datafiles << candidate   if seasons.include?( season )   
+          else
+            datafiles << candidate 
+          end  
+       end
     end
 
     ## pp datafiles

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbtok
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-parser