fbtxt-pp 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb82751c433e1b2a9495f545dde77a538f1cb08b66e55aa6c6af0e3830ef6cff
-  data.tar.gz: 5cc0c7f57f4d5e79db8bba38d97dc3dbc4ca6374de7db8d51acf3fc7d351e681
+  metadata.gz: db5f011b7eb6f90695401a5de2672d1f210684df87033b2592831692f17fe92a
+  data.tar.gz: 04c710000abbf7f491bed97d92f86b06288902058a234a048fb4927c631c7625
 SHA512:
-  metadata.gz: ec8a5d094a5054b95a7ee2fd7b2d798a181c4ad92e81f77a1d94bf571041032431d69fa85afbf90f07bd1bd3e35306a8d45a8a994a0989c6760e8321231d99d2
-  data.tar.gz: 32dea04aa3ad82a0033c8505794e2dd6fb959f0fdef51a00dbacd53a083358f0a2ac81628f1feccb745169e163f6c1301400de2c26487167aa2b0064f734551d
+  metadata.gz: 3f194fdcf1896b83ed82d4fe6546e3918839bf0e65b0ebf69fe8ca0a63ad20219ca5183f5808b74333cf234c4961b747d2d937239086c54e2b7c24f3ca174e0e
+  data.tar.gz: 7b2f42b11e823c4f2668a8d7802c97c0b69754ea502e2985e1b15c1a2c0a016be18b70032917de1c95465e1af5adfcc31edba4a648e1f1cae94b72ff30e2d51c

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-
+### 0.1.0
 ### 0.0.2 / 2026-07-23
 
 * Everything is new. First release.

data/bin/fbhub

@@ -6,8 +6,8 @@
 
 ##
 ## note - always use latest (local) if present
-$LOAD_PATH.unshift( '/sports/yorobot/fbup/fbup/lib' )
-require 'fbup'
+$LOAD_PATH.unshift( '/sports/yorobot/fbup/openfootball/lib' )
+require 'openfootball'
 
 ##
 ## note - always use latest (local) if present

data/lib/fbtxt-pp/config.rb

@@ -49,7 +49,7 @@ def read_config_pp( *paths )
             opts_full: {}.merge( FORMAT_OPTS_FULL_DEFAULTS, _parse_format_opts( rec['opts_full'] )),
       }
 
-      config[ key ] = h
+      config[ key.to_sym ] = h
     end
   end
   config

data/lib/fbtxt-pp/config_clubs.csv

@@ -4,20 +4,35 @@ code, name, seasons,  opts,    opts_full
 ##
 ##  remove seasons - why? why not?
 
-at,      Austria | Bundesliga,     2025/26,,
-de,      Germany | Bundesliga,     2025/26,,
-eng,     England | Premier League, 2025/26,,
+at,      Austria | Bundesliga,     2026/27 2025/26,,
+at.cup,  Austria | Cup,            2026/27 2025/26,,
 
+de,      Germany | Bundesliga,     2026/27 2025/26,,
+eng,     England | Premier League, 2026/27 2025/26,,
 
-fr,      France | Ligue 1,          2025/26,,
-it,      Italy | Serie A,           2025/26,,
-es,      Spain | Primera División,   2025/26,,
 
-mx,      Mexico | Liga MX,           2025/26,,
+fr,      France | Ligue 1,          2026/27 2025/26,,
+it,      Italy | Serie A,           2026/27 2025/26,,
+es,      Spain | Primera División,   2026/27 2025/26,,
 
-uefa.cl,     UEFA | Champions League,  2025/26, country|city, country
-uefa.europa, UEFA | Europa League,     2025/26, country|city, country
-uefa.con,    UEFA | Conference League, 2025/26, country|city, country
+
+be,   Belgium | First Division A,       2026/27,,
+ch,   Switzerland | Super League,       2026/27,,
+cz,   Czech Republic | First League,    2026/27,,
+
+gr,   Greece | Super League,      2026/27,,
+tr,   Turkey | Süper Lig,       2026/27,,
+
+sco,  Scotland | Premiership,      2026/27,,
+
+
+uefa.cl,     UEFA | Champions League,  2026/27 2025/26, country|city, country
+uefa.europa, UEFA | Europa League,     2026/27 2025/26, country|city, country
+uefa.con,    UEFA | Conference League, 2026/27 2025/26, country|city, country
+
+
+
+mx,      Mexico | Liga MX,           2026/27 2025/26,,
 
 ###
 #  opts

data/lib/fbtxt-pp/models/document.rb

@@ -62,10 +62,8 @@ def calc_start_end_dates
 
   @data['matches'].each do |_m|
 
-     ## date_utc       = parse_date_utc(   _m['datetime_utc'] )
-     date_local     = parse_date_local( _m['datetime_local'] )
-
      ## note - alway use local datetime for now
+     date_local     =  Date.strptime( _m['date_local'], '%Y-%m-%d' )
 
      if start_date.nil? || date_local  < start_date
         start_date = date_local

data/lib/fbtxt-pp/models/match.rb

@@ -8,7 +8,9 @@ class Match
 
 attr_reader :team1,    :team2,
             :score,
-            :date_utc, :date_local,  :utc_offset,
+            :datetime_utc,
+            :date_local,
+            :time_local, :utc_offset,
             :stadium,
             :goals1, :goals2
 
@@ -25,21 +27,33 @@ def initialize( doc, data )
      @team2 = @doc.find_team!( @h['team2'] )
 
 
-     @date_utc       = parse_date_utc(   @h['datetime_utc'] )
-     @date_local     = parse_date_local( @h['datetime_local'] )
 
-     assert( @date_utc.sec == 0 && @date_local.sec == 0,
-                "sec 00 expected" )
+     ####
+     #  note -  match might NOT be timed only scheduled (e.g. only date no time)
 
-    ## note:  returns Rational (e.g. 3/1 or 1/4 etc.) use to_f/to_i to convert
-    ## diff_in_hours = ((localDateTime - dateTime) * 24).to_f
-    ## diff_in_days  =  localDateTime.jd - dateTime.jd
+     ##
+     ## todo/fix
+     ##   support different date style formats - why? why not?
+     ##  for now use/prefer:
+     ##        "datetime_utc": "2026-08-08T16:15Z",
+     ##        "date_local": "2026-08-08",
+     ##        "time_local": "18:15 UTC+2",
 
-     # note - offset is in rational fraction of a day (e.g. 1/12 for 2hours)
-     ##  was diff_in_hours
-     @utc_offset = (@date_local.offset * 24).to_i
 
-     ## pp [@date_utc, @date_local, @utc_offset]
+     if @h['date_local'] && @h['time_local'].nil?
+       @date_local =  Date.strptime( @h['date_local'], '%Y-%m-%d' )
+     else
+       @datetime_utc   = parse_date_utc( @h['datetime_utc'] )
+       assert( @datetime_utc.sec == 0,  "sec 00 expected" )
+
+       @date_local     = Date.strptime( @h['date_local'], '%Y-%m-%d' )
+       ## 18:15 UTC+2
+       ##  split into  18:15 and UTC+2
+       @time_local, @utc_offset  = @h['time_local'].split( /[ ]+/, 2)
+
+       ## pp [@datetime_utc, @date_local, @time_local, @utc_offset]
+     end
+
 
      ## note - always lookup full stadium record (use match inline only as ref)
      @stadium  =  @doc.find_stadium!( @h['stadium'] )
@@ -61,7 +75,7 @@ def data() @h; end
 
 ##  todo - find a better name for timezone offset
 ##   use utc_offset - why? why not?
-alias_method :diff_in_hours, :utc_offset
+##  alias_method :diff_in_hours, :utc_offset
 
 
 def stage()      @h['stage']; end

data/lib/fbtxt-pp/models/score.rb

@@ -6,7 +6,7 @@ def self.build( score )
   if score.nil?
         raise ArgumentError, "Score.build - expected Hash or Array; got nil"
   elsif score.is_a?(Hash)
-      new( **score.transform_keys(&:to_sym) )
+      new( **score.transform_keys(&:to_sym).except( :type ) )
   elsif score.is_a?(Array)
        new( reported: score )
   else

data/lib/fbtxt-pp/pp/ppmatch.rb

@@ -24,9 +24,11 @@ def pp_matches(  season:,
    buf << "\n"
 
 
-last_round   = nil
-last_date    = nil
-last_year    = nil   ## track running year
+last_round       = nil
+last_date        = nil
+last_time        = nil
+last_utc_offset  = nil
+last_year        = nil   ## track running year
 
 
 doc.each_match do |m|
@@ -42,8 +44,8 @@ doc.each_match do |m|
    ## note - make round
    ##         =  stage  +  group (optional)  +  matchday (optional)
    round  = m.stage
-   round += ", #{m.group}"       if m.group
    round += " - #{m.matchday}"   if m.matchday
+   round += ", #{m.group}"       if m.group
 
 
 
@@ -54,7 +56,9 @@ doc.each_match do |m|
          buf << "▪ #{round}\n"
 
         last_round = round
-        last_date  = nil
+        last_date          = nil
+        last_time          = nil
+        last_utc_offsset   = nil
    end
 
 
@@ -70,15 +74,22 @@ doc.each_match do |m|
             else
                  buf << "#{m.date_local.strftime('%a %b %-e')}\n"
             end
+            last_time          = nil
+            last_utc_offsset   = nil
       end
 
-
-     ##  always print time for now
-     if opts.timezone?
-         ## use   20:30 UTC+1  or 20:30 UTC-3
-         buf <<  "  #{m.date_local.strftime( '%H:%M' )} UTC%+d" % m.diff_in_hours
+     ## note - skip printing same time again (use inheritance)
+     if m.time_local.nil? ||
+        (last_time       == m.time_local &&
+         last_utc_offset == m.utc_offset)
+           buf <<  "       "
      else
-         buf <<  "  #{m.date_local.strftime( '%H:%M' )}"
+          if opts.timezone?
+             ## use   20:30 UTC+1  or 20:30 UTC-3
+             buf <<  "  #{m.time_local} #{m.utc_offset}"
+          else
+             buf <<  "  #{m.time_local}"
+         end
      end
 
 
@@ -111,8 +122,10 @@ doc.each_match do |m|
       buf << "\n"
 
 
-   last_date = m.date_local
-   last_year = m.date_local.year
+   last_date       = m.date_local
+   last_year       = m.date_local.year
+   last_time       = m.time_local
+   last_utc_offset = m.utc_offset
 
 
     ## skip adding goals if teams not yet known!!

data/lib/fbtxt-pp/tool-fbhub.rb

@@ -9,12 +9,19 @@ module Fbhub
 
 
 LEAGUE_CODES = {
-    'de'  => 'de.1',
     'eng' => 'eng.1',
+    'de'  => 'de.1',
     'es'  => 'es.1',
     'it'  => 'it.1',
     'fr'  => 'fr.1',
+
     'at'  => 'at.1',
+    'ch'  => 'ch.1',
+    'cz'  => 'cz.1',
+    'tr'  => 'tr.1',
+    'gr'  => 'gr.1',
+    'sco'  => 'sco.1',
+
     'mx'  => 'mx.1',
 }
 
@@ -26,7 +33,9 @@ opts = {
   push:     false,
   ffwd:     false,
 
-  full:     true,   ## add full details page - true|false
+  full: false,
+  ## full:     true,   ## add full details page - true|false
+
   test:     true,  ## true,   ## sets push & ffwd to false
   test_dir:  './o',
   convert_dir:  '/sports/cache.api.fifa',
@@ -91,17 +100,17 @@ pp datasets
 root_dir =  if opts[:test]
                opts[:test_dir]
             else
-               Fbup::GitHubSync.root   # e.g. "/sports"
+               Openfootball::GitHubSync.root   # e.g. "/sports"
             end
 
 puts "  (output) root_dir: >#{root_dir}<"
 
 
-repos = Fbup::GitHubSync.find_repos( datasets )
+repos = Openfootball.find_repos( datasets )
 puts "  #{repos.size} repo(s):"
 pp repos
 
-sync  =  Fbup::GitHubSync.new( repos )
+sync  =  Openfootball::GitHubSync.new( repos )
 puts "  sync:"
 pp sync
 
@@ -112,7 +121,7 @@ sync.git_fast_forward_if_clean    if opts[:ffwd]
 datasets.each do |slug, seasons|
   puts "==> gen #{slug} - #{seasons.size} seasons(s)..."
 
-  config = CONFIGS[ slug ]
+  config = CONFIGS[ slug.to_sym ]  ## note - use symbol for lookup!!
   if config.nil?
      puts "!! no pp config found for slug >#{slug}<; keys/codes include:"
      pp CONFIGS.keys
@@ -120,54 +129,20 @@ datasets.each do |slug, seasons|
   end
 
   seasons.each do |season|
-     ## get repo config for flags and more
-      repo  = Fbup::GitHubSync::REPOS[ slug ]
-      flags = repo['flags'] || {}
-      classic_flag = flags['classic'] || false
-
-      pp repo
-
-
-      basename = nil
-      if classic_flag
-         league_config = Fbup::LeagueConfig.find_by( code:   LEAGUE_CODES[slug]||slug,
-                                                      season: season )
-         if league_config.nil?
-            puts "!! ERROR - basename league config required for classic format; no config found for #{league_query} #{season}; sorry"
-            exit 1
-         end
-         basename  = league_config['basename']
-      else
-         ## change base name to league key
-         ##   todo - fix - make gsub smarter
-         ##    change at.cup to at_cup - why? why not?
-         basename = (LEAGUE_CODES[slug]||slug).gsub( '.', '' )
-      end
-
-
-      repo_path = "#{repo['owner']}/#{repo['name']}"
-      repo_path << "/#{repo['path']}"    if repo['path']  ## note: do NOT forget to add optional extra path!!!
 
+      repo_path      = Openfootball.mkpath( code:   LEAGUE_CODES[slug]||slug,
+                                            season: season )
+      repo_path_full = Openfootball.mkpath( code:   LEAGUE_CODES[slug]||slug,
+                                            season: season,
+                                            suffix: 'full' )
 
-      outpath = "#{root_dir}/#{repo_path}"
-      outpath +=  if classic_flag
-                     "/#{season.to_path}/#{basename}.txt"
-                  else
-                     ## note - add season "inline" (to basename) or use dir
-                     "/#{season.to_path}_#{basename}.txt"
-                  end
-
-      outpath_full = "#{root_dir}/#{repo_path}"
-      outpath_full +=  if classic_flag
-                     "/#{season.to_path}/#{basename}-full.txt"
-                  else
-                     ## note - add season "inline" (to basename) or use dir
-                     "/#{season.to_path}_#{basename}-full.txt"
-                  end
+      outpath      = "#{root_dir}/#{repo_path}"
+      outpath_full = "#{root_dir}/#{repo_path_full}"
 
        puts "   writing to >#{outpath}<..."
        puts "   writing (full) to >#{outpath_full}<..."
 
+
        league_name      = config[:name]
        format_opts      = config[:opts]
        format_opts_full = config[:opts_full]

data/lib/fbtxt-pp/tool-fbpp.rb

@@ -61,6 +61,7 @@ pp config
 
 if config.nil?
   ## auto-fill with defaults!!
+    puts "note - no config found for #{key}; using defaults"
    config = { slug: key,
               name:  "#{key}",
               seasons: [],

data/lib/fbtxt-pp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fbtxt-pp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-12 00:00:00.000000000 Z
+date: 2026-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos