football-sources 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9b9787aaaaad173642d6bf3ddd19bb573f8f997eb04dbe2e702dc830144eedb
-  data.tar.gz: e2f0e59b5949d9994a4eb01b2ae2ef0deaa959042cb1a98feccf9c009a01ffbd
+  metadata.gz: 42b02267a8c37a2b3a38662941d13ac8e61e622c8b45dc0c06a28453e272b2dc
+  data.tar.gz: e26f5cf47b6c0390b4f5d99b85919852eb46e7822201e4d6eba52315dc683e44
 SHA512:
-  metadata.gz: b95e6df43a8374cbc66d8e4774443a613de9a35ba8adc9041b496c1ae4f34ba03b55b887ed6f2573cafae37ecf3828490fa15bc0ea5c8b89d1723d6a45030db2
-  data.tar.gz: 6674c3799a962cc57405f4cab10cf273bbc856f3268c9f556c02fc5da7541703e205ace4e1b431b417195aeab33a9666d084e0cb3a5dc3e14c0cdac273698e1b
+  metadata.gz: 24038df8393a7ab1635cd6a5a9376e20c29ba077fbe3db63a917a5f59154aec50c1f6f99c68e1f51cbbd1c28ce07412e89387ae9576e8fc22c2bc872df689ae0
+  data.tar.gz: d27328142ffed18c30078e66c5a313a9df7a12be714401cba36cfa6752c08d0f1c158a796e87c50202ba08ae5ab2212061db494982656b378c3374c3e1cd23c5

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.1.1
+### 0.2.0
 
 ### 0.0.1 / 2020-11-09
 

data/Manifest.txt

@@ -2,6 +2,8 @@ CHANGELOG.md
 Manifest.txt
 README.md
 Rakefile
+bin/fbgen
 lib/football-sources.rb
+lib/football-sources/process.rb
 lib/football-sources/version.rb
 lib/football/sources.rb

data/Rakefile

@@ -21,6 +21,10 @@ Hoe.spec 'football-sources' do
 
   self.extra_deps = [
     ['sportdb-catalogs'],   #, '>= 1.0.0'],
+    ['sportdb-writers'],
+    ##  footballdata sources
+    ['footballdata-api'],
+    ['worldfootball'],
   ]
 
   self.licenses = ['Public Domain']

data/bin/fbgen

@@ -0,0 +1,131 @@
+#!/usr/bin/env ruby
+
+## tip: to test run:
+##   ruby -I ./lib bin/fbgen
+
+require 'football/sources'
+
+
+load_env   ## use dotenv (.env)
+
+
+Webcache.root =  if File.exist?( '/sports/cache' )
+                     puts "  setting web cache to >/sports/cache<"
+                     '/sports/cache'
+                 else 
+                     './cache'
+                 end
+
+
+
+## set openfootball github org root - note - NOT monorepo (github) root dirc
+SportDb::GitHubSync.root = '/sports/openfootball'   
+
+
+## add convenience shortcuts
+Country = Sports::Country
+League  = Sports::League
+Club    = Sports::Club
+
+# Worldfootball.config.convert.out_dir = './o/aug29'
+# Worldfootball.config.convert.out_dir = './o'
+# Worldfootball.config.convert.out_dir = './o'
+Worldfootball.config.convert.out_dir = if File.exist?( '/sports/cache.wfb' )
+                                  puts "  setting wfb stage/cache to >/sports/cache.wfb<"
+                                          '/sports/cache.wfb'
+                                       else
+                                         './stage/wfb'
+                                       end
+#########
+##  staging cache settings
+Footballdata.config.convert.out_dir =  if File.exist?( '/sports/cache.api.fbdat' )
+                                  puts "  setting fbdat stage/cache to >/sports/cache.api.fbdat<"
+                                           '/sports/cache.api.fbdat'
+                                        else
+                                          './stage/fbdat'
+                                       end
+
+pp File.expand_path( Footballdata.config.convert.out_dir )
+
+
+## note -  free tier (tier one) plan - 10 requests/minute   
+##              (one request every 6 seconds 6*10=60 secs)
+##     10 API calls per minute max.
+##  note - default sleep (delay in secs) is 3 sec(s)
+Webget.config.sleep  = 10
+
+
+
+
+require 'optparse'
+
+
+
+args=ARGV 
+
+
+opts = {
+    type: 'fbdat',
+    download: false,
+    push:     false,
+}
+
+parser = OptionParser.new do |parser|
+  parser.banner = "Usage: #{$PROGRAM_NAME} [options]"
+
+#  parser.on( "--cache", "--cached", "--offline",
+#               "use cached data in #{Webcache.root}" ) do |cached|
+#    opts[:cached] = cached
+#  end
+
+  parser.on( "-t NAME", "--type=NAME", 
+               "use source type - default is (#{opts[:type]})" ) do |type|
+     opts[:type] = type
+  end
+#  end
+
+
+# add download and push ???
+
+end
+parser.parse!( args )
+
+puts "OPTS:"
+p opts
+puts "ARGV:"
+p args
+
+
+
+source = if ['fbdat'].include?( opts[:type] )
+               Footballdata
+        elsif ['wfb'].include?( opts[:type] )
+               Worldfootball
+        else
+              raise ArgumentError, "unknown source type - expected fbdata|wfb; got #{opts[:type]}"
+        end
+
+puts "source:"
+pp source
+
+
+league      =  (args[0] || 'eng.1' ).downcase
+season      =  (args[1] || '2024/25')
+
+datasets = [
+  [league, [season]]  
+]
+
+puts "datasets:"
+pp datasets
+
+
+
+Fbgen.process( datasets,
+                  source:   source,    
+                  download: opts[:download],
+                  push:     opts[:push] )
+
+
+puts "bye"
+

data/lib/football-sources/process.rb

@@ -0,0 +1,68 @@
+
+
+module Fbgen
+
+
+class Job     ## todo/check: use a module (NOT a class) - why? why not?
+  ## note - source expected module/class e.g. Footballdata/Worldfootball e.g.    
+def self.download( datasets, source: )
+  datasets.each_with_index do |dataset,i|
+    league  = dataset[0]
+    seasons = dataset[1]
+
+    puts "downloading [#{i+1}/#{datasets.size}] #{league}..."
+    seasons.each_with_index do |season,j|
+      puts "  season [#{j+1}/#{season.size}] #{league} #{season}..."
+      source.schedule( league: league,
+                       season: season )
+    end
+  end
+end
+
+def self.convert( datasets, source: )
+  datasets.each_with_index do |dataset,i|
+    league  = dataset[0]
+    seasons = dataset[1]
+
+    puts "converting [#{i+1}/#{datasets.size}] #{league}..."
+    seasons.each_with_index do |season,j|
+      puts "  season [#{j+1}/#{season.size}] #{league} #{season}..."
+      source.convert( league: league,
+                      season: season )
+    end
+  end
+end
+end  # class Job
+
+
+## change download? to cache - true/false - why? why not?   
+##  change push: to sync - true/false - why? why not?
+def self.process( datasets,
+                     source:,
+                     download: false,
+                     push:     false )
+
+  Job.download( datasets, source: source )   if download
+
+  ## always pull before push!! (use fast_forward)
+  gh = SportDb::GitHubSync.new( datasets )
+  gh.git_fast_forward_if_clean    if push
+
+
+  Job.convert( datasets, source: source )
+
+  if push
+    Writer.config.out_dir = SportDb::GitHubSync.root   # e.g. "/sports/openfootball"
+  else
+    ##  fix/fix - use default - do not (re)set here - why? why not?
+    Writer.config.out_dir = './tmp'
+  end
+
+  Writer::Job.write( datasets,
+                     source: source.config.convert.out_dir )
+
+  ## todo/fix: add a getch or something to hit return before commiting pushing - why? why not?
+  gh.git_push_if_changes     if push
+end  
+
+end  # module Fbgen

data/lib/football-sources/version.rb

@@ -1,8 +1,8 @@
 
 module FootballSources
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
-  MINOR = 1
-  PATCH = 1
+  MINOR = 2
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version
@@ -10,7 +10,7 @@ module FootballSources
   end
 
   def self.banner
-    "football-sources/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    "football-sources/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
   end
 
   def self.root

data/lib/football-sources.rb

@@ -2,15 +2,20 @@
 
 # require 'sportdb/formats'   ## for Season etc.
 require 'sportdb/catalogs'    ## note: incl. deps csvreader etc.
+require 'sportdb/writers'
 
 
-
+require 'footballdata'      # e.g. football-data.org (api)
+require 'worldfootball'     # e.g. weltfussball.de (web)
 
 
 
 ###
 # our own code
 require_relative 'football-sources/version' # let version always go first
+require_relative 'football-sources/process'
+
+
 
 
 puts FootballSources.banner   # say hello

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: football-sources
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
@@ -24,6 +24,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sportdb-writers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: footballdata-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: worldfootball
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +103,8 @@ dependencies:
 description: football-sources - get football match data (leagues, cups & more) via
   web pages or web api (json) calls
 email: gerald.bauer@gmail.com
-executables: []
+executables:
+- fbgen
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
@@ -72,7 +115,9 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- bin/fbgen
 - lib/football-sources.rb
+- lib/football-sources/process.rb
 - lib/football-sources/version.rb
 - lib/football/sources.rb
 homepage: https://github.com/sportdb/sport.db