worldfootball 0.3.1 → 0.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1 -1
- data/Manifest.txt +2 -0
- data/Rakefile +1 -1
- data/bin/wfb +13 -11
- data/bin/wfbconf +20 -12
- data/bin/wfbconv +1 -1
- data/bin/wfbgen +1 -1
- data/bin/wfbsync +205 -0
- data/bin/wfbup +1 -1
- data/config/leagues/america.csv +6 -1
- data/config/leagues/europe.csv +14 -1
- data/config/leagues/world.csv +6 -0
- data/config/rounds.csv +97 -60
- data/config/stages.csv +3 -6
- data/lib/worldfootball/build.rb +22 -3
- data/lib/worldfootball/convert.rb +20 -4
- data/lib/worldfootball/leagues.rb +2 -2
- data/lib/worldfootball/version.rb +1 -1
- data/lib/worldfootball.rb +1 -1
- metadata +6 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 75755982ccfac637d1757b6163be5e03e9af9f6f024ce567ea4137cb64f5eeea
|
|
4
|
+
data.tar.gz: bd5214b9225b1563d395ab2363a26e21cefadb996c65523e1ce51b647d346fab
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6e70b232fc8b5275042174d9576b6c3bf57bfb680470667e5cf7af8c77cfd6160c9a1d1ea0a372bb67673cb8210e035314ebe93108ea974ceb496c44cb1d4e8f
|
|
7
|
+
data.tar.gz: 920bc2041c52cca8445ef4be90d6b4432d4fa1a6518babb0e19e47be6dc7daf4d856fdf709f9dbddfd2614467f300472a726e556767509d59b3db6ebbc93ae85
|
data/CHANGELOG.md
CHANGED
data/Manifest.txt
CHANGED
|
@@ -7,6 +7,7 @@ bin/wfbconf
|
|
|
7
7
|
bin/wfbconv
|
|
8
8
|
bin/wfbdump
|
|
9
9
|
bin/wfbgen
|
|
10
|
+
bin/wfbsync
|
|
10
11
|
bin/wfbup
|
|
11
12
|
config/leagues/africa.csv
|
|
12
13
|
config/leagues/america.csv
|
|
@@ -14,6 +15,7 @@ config/leagues/asia.csv
|
|
|
14
15
|
config/leagues/europe.csv
|
|
15
16
|
config/leagues/middle_east.csv
|
|
16
17
|
config/leagues/pacific.csv
|
|
18
|
+
config/leagues/world.csv
|
|
17
19
|
config/rounds.csv
|
|
18
20
|
config/stages.csv
|
|
19
21
|
lib/worldfootball.rb
|
data/Rakefile
CHANGED
data/bin/wfb
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
## ruby -I wfb/lib wfb/bin/wfb -f max.csv --cached
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/
|
|
11
|
+
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
|
|
12
12
|
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
|
|
13
13
|
require 'worldfootball'
|
|
14
14
|
|
|
@@ -134,13 +134,23 @@ end
|
|
|
134
134
|
####
|
|
135
135
|
# assume leagues
|
|
136
136
|
|
|
137
|
+
autofiller = ->(league_query) {
|
|
138
|
+
league = find_league!( league_query ) ## league info lookup
|
|
139
|
+
## note - default to latest season of league
|
|
140
|
+
## might be 2024/25 or 2024 or
|
|
141
|
+
# for world cup 2022 or such
|
|
142
|
+
league.seasons.keys[0] ## assume first entry is latest season
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
|
|
137
146
|
datasets = if opts[:file]
|
|
138
|
-
read_leagueset( opts[:file] )
|
|
147
|
+
read_leagueset( opts[:file], autofill: autofiller )
|
|
139
148
|
else
|
|
140
|
-
parse_leagueset_args( args )
|
|
149
|
+
parse_leagueset_args( args, autofill: autofiller )
|
|
141
150
|
end
|
|
142
151
|
|
|
143
152
|
|
|
153
|
+
|
|
144
154
|
## step 0 - validate and fill-up seasons etc.
|
|
145
155
|
datasets.each do |league_key, seasons|
|
|
146
156
|
|
|
@@ -149,14 +159,6 @@ datasets.each do |league_key, seasons|
|
|
|
149
159
|
## output more page meta info
|
|
150
160
|
puts "league meta:"
|
|
151
161
|
pp league
|
|
152
|
-
|
|
153
|
-
## note - default to latest season of league
|
|
154
|
-
## might be 2024/25 or 2024 or
|
|
155
|
-
# for world cup 2022 or such
|
|
156
|
-
if seasons.empty?
|
|
157
|
-
season = Season(league.seasons.keys[0])
|
|
158
|
-
seasons << season
|
|
159
|
-
end
|
|
160
162
|
end
|
|
161
163
|
|
|
162
164
|
|
data/bin/wfbconf
CHANGED
|
@@ -34,22 +34,30 @@ args = ARGV
|
|
|
34
34
|
|
|
35
35
|
Worldfootball.debug = true
|
|
36
36
|
|
|
37
|
-
##
|
|
38
|
-
## download fresh copy?
|
|
39
|
-
## Worldfootball::Metal.download_schedule( slug )
|
|
40
37
|
|
|
41
|
-
|
|
38
|
+
if args.size == 0 ## no args; print all keys
|
|
39
|
+
keys = Worldfootball::LEAGUES.keys
|
|
40
|
+
|
|
41
|
+
pp keys
|
|
42
|
+
puts " #{keys.size} league(s)"
|
|
43
|
+
else
|
|
44
|
+
##
|
|
45
|
+
## download fresh copy?
|
|
46
|
+
## Worldfootball::Metal.download_schedule( slug )
|
|
47
|
+
|
|
48
|
+
key = args[0] || 'eng.1'
|
|
42
49
|
|
|
43
|
-
league = Worldfootball::LEAGUES[key]
|
|
44
|
-
seasons = league.seasons
|
|
45
|
-
pp seasons
|
|
50
|
+
league = Worldfootball::LEAGUES[key]
|
|
51
|
+
seasons = league.seasons
|
|
52
|
+
pp seasons
|
|
46
53
|
|
|
47
|
-
puts " #{key} - #{seasons.size} season(s)"
|
|
54
|
+
puts " #{key} - #{seasons.size} season(s)"
|
|
48
55
|
|
|
49
|
-
puts
|
|
50
|
-
latest = seasons.keys[0]
|
|
51
|
-
puts " latest #{latest}: "
|
|
52
|
-
pp seasons[latest]
|
|
56
|
+
puts
|
|
57
|
+
latest = seasons.keys[0]
|
|
58
|
+
puts " latest #{latest}: "
|
|
59
|
+
pp seasons[latest]
|
|
60
|
+
end
|
|
53
61
|
|
|
54
62
|
|
|
55
63
|
puts "bye"
|
data/bin/wfbconv
CHANGED
data/bin/wfbgen
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
#
|
|
11
11
|
|
|
12
12
|
|
|
13
|
-
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/
|
|
13
|
+
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
|
|
14
14
|
$LOAD_PATH.unshift( '/sports/sportdb/sportdb-writers/lib' )
|
|
15
15
|
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
|
|
16
16
|
|
data/bin/wfbsync
ADDED
|
@@ -0,0 +1,205 @@
|
|
|
1
|
+
#!/usr/bin/env ruby
|
|
2
|
+
|
|
3
|
+
##
|
|
4
|
+
## rename to wfbget or wfbpull or such - why? why not?
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
## tip: to test run:
|
|
8
|
+
## ruby -I ./lib bin/wfbsync
|
|
9
|
+
## or
|
|
10
|
+
## ruby -I wfb/lib wfb/bin/wfbsync
|
|
11
|
+
## or
|
|
12
|
+
## ruby -I wfb/lib wfb/bin/wfbsync -f world.csv
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
###
|
|
16
|
+
## only download if NOT cached
|
|
17
|
+
## ALWAYS download if season is latest e.g 2024/25 or 2025
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
|
|
22
|
+
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
|
|
23
|
+
require 'worldfootball'
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
Webcache.root = if File.exist?( '/sports/cache' )
|
|
27
|
+
puts " setting web cache to >/sports/cache<"
|
|
28
|
+
'/sports/cache'
|
|
29
|
+
else
|
|
30
|
+
'./cache'
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
## convert (default) output directory
|
|
34
|
+
Worldfootball.config.convert.out_dir = if File.exist?( '/sports/cache.wfb')
|
|
35
|
+
puts " setting convert out_dir to >/sports/cache.wfb<"
|
|
36
|
+
'/sports/cache.wfb'
|
|
37
|
+
else
|
|
38
|
+
'./tmp' ## use tmp in working dir
|
|
39
|
+
end
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
require 'optparse'
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
module Worldfootball
|
|
48
|
+
def self.main_sync( args=ARGV )
|
|
49
|
+
|
|
50
|
+
opts = {
|
|
51
|
+
debug: false,
|
|
52
|
+
convert: true,
|
|
53
|
+
file: nil,
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
parser = OptionParser.new do |parser|
|
|
58
|
+
parser.banner = "Usage: #{$PROGRAM_NAME} [options]"
|
|
59
|
+
|
|
60
|
+
##
|
|
61
|
+
## check if git has a offline option?? (use same)
|
|
62
|
+
## check for other tools - why? why not?
|
|
63
|
+
|
|
64
|
+
## todo - add a single letter option for offline/cached
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
parser.on( "--[no-]convert",
|
|
68
|
+
"turn on/off conversion to (tabular) .csv format in #{Worldfootball.config.convert.out_dir} - default is (#{opts[:convert]})" ) do |convert|
|
|
69
|
+
opts[:convert] = convert # true|false
|
|
70
|
+
end
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
parser.on( "-f FILE", "--file FILE",
|
|
74
|
+
"read leagues (and seasons) via .csv file") do |file|
|
|
75
|
+
opts[:file] = file
|
|
76
|
+
end
|
|
77
|
+
end
|
|
78
|
+
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
|
|
82
|
+
parser.parse!( args )
|
|
83
|
+
|
|
84
|
+
puts "OPTS:"
|
|
85
|
+
p opts
|
|
86
|
+
puts "ARGV:"
|
|
87
|
+
p args
|
|
88
|
+
|
|
89
|
+
|
|
90
|
+
## turn on debug output
|
|
91
|
+
if opts[:debug]
|
|
92
|
+
Worldfootball.debug = true
|
|
93
|
+
else
|
|
94
|
+
Worldfootball.debug = false
|
|
95
|
+
end
|
|
96
|
+
|
|
97
|
+
|
|
98
|
+
####
|
|
99
|
+
# assume leagues
|
|
100
|
+
|
|
101
|
+
autofiller = ->(league_query) {
|
|
102
|
+
league = find_league!( league_query ) ## league info lookup
|
|
103
|
+
## note - default to latest season of league
|
|
104
|
+
## might be 2024/25 or 2024 or
|
|
105
|
+
# for world cup 2022 or such
|
|
106
|
+
league.seasons.keys[0] ## assume first entry is latest season
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
datasets = if opts[:file]
|
|
110
|
+
read_leagueset( opts[:file], autofill: autofiller )
|
|
111
|
+
else
|
|
112
|
+
raise ArgumentError, "file required; sorry"
|
|
113
|
+
end
|
|
114
|
+
|
|
115
|
+
|
|
116
|
+
|
|
117
|
+
## step 0 - validate and fill-up seasons etc.
|
|
118
|
+
datasets.each do |league_key, seasons|
|
|
119
|
+
|
|
120
|
+
league = find_league!( league_key ) ## league info lookup
|
|
121
|
+
|
|
122
|
+
## output more page meta info
|
|
123
|
+
puts "league meta:"
|
|
124
|
+
pp league
|
|
125
|
+
end
|
|
126
|
+
|
|
127
|
+
|
|
128
|
+
###
|
|
129
|
+
## collect league names & more
|
|
130
|
+
extra = {}
|
|
131
|
+
|
|
132
|
+
|
|
133
|
+
## step 1 - download
|
|
134
|
+
##
|
|
135
|
+
|
|
136
|
+
## note - only download if NOT cached
|
|
137
|
+
## or if seasson is latest
|
|
138
|
+
|
|
139
|
+
|
|
140
|
+
|
|
141
|
+
datasets.each do |league_key, seasons|
|
|
142
|
+
league = find_league!( league_key ) ## league info lookup
|
|
143
|
+
seasons.each do |season|
|
|
144
|
+
pages = league.pages!( season: season )
|
|
145
|
+
puts
|
|
146
|
+
pp [league.key, season.key]
|
|
147
|
+
pp pages
|
|
148
|
+
puts " #{pages.size} page(s)"
|
|
149
|
+
|
|
150
|
+
|
|
151
|
+
### check for latest season
|
|
152
|
+
### if latest than ALWAYS overwrite (that is, do NOT use cached version)
|
|
153
|
+
overwrite = false
|
|
154
|
+
|
|
155
|
+
overwrite = true if season == Season('2025') ||
|
|
156
|
+
season == Season('2024/25')
|
|
157
|
+
|
|
158
|
+
|
|
159
|
+
pages.each_with_index do |(slug,_),i|
|
|
160
|
+
puts "==> #{i+1}/#{pages.size} - #{league_key} @ #{slug}..."
|
|
161
|
+
|
|
162
|
+
if !overwrite && Webcache.cached?( Metal.schedule_url( slug ))
|
|
163
|
+
puts " OK #{league_key} #{season.key} - #{slug} (do NOT overwrite)"
|
|
164
|
+
else
|
|
165
|
+
Metal.download_schedule( slug )
|
|
166
|
+
end
|
|
167
|
+
end
|
|
168
|
+
|
|
169
|
+
|
|
170
|
+
##
|
|
171
|
+
## check for/collect extra (debug) league info
|
|
172
|
+
pages.each_with_index do |(slug,_),i|
|
|
173
|
+
puts "==> #{i+1}/#{pages.size} - #{league_key} @ #{slug}..."
|
|
174
|
+
page = Page::Schedule.from_cache( slug )
|
|
175
|
+
matches = page.matches
|
|
176
|
+
|
|
177
|
+
puts " #{matches.size} match(es)"
|
|
178
|
+
|
|
179
|
+
league_extra = extra[ league.key ] ||= {}
|
|
180
|
+
season_extra = league_extra[ season.key] ||= { names: [] }
|
|
181
|
+
season_extra[:names] << page.title
|
|
182
|
+
end
|
|
183
|
+
end # each seasons
|
|
184
|
+
end # each league
|
|
185
|
+
|
|
186
|
+
|
|
187
|
+
if opts[:convert]
|
|
188
|
+
## step 2 - convert
|
|
189
|
+
datasets.each do |league_key, seasons|
|
|
190
|
+
seasons.each do |season|
|
|
191
|
+
## write out (export to) comma-separated values (.csv) datafile
|
|
192
|
+
convert( league: league_key,
|
|
193
|
+
season: season )
|
|
194
|
+
end
|
|
195
|
+
end
|
|
196
|
+
end
|
|
197
|
+
|
|
198
|
+
end # def self.main
|
|
199
|
+
end # module Worldfootball
|
|
200
|
+
|
|
201
|
+
|
|
202
|
+
Worldfootball.main_sync( ARGV )
|
|
203
|
+
|
|
204
|
+
|
|
205
|
+
puts "bye"
|
data/bin/wfbup
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
## - stopping at si.1 2017/18...
|
|
14
14
|
|
|
15
15
|
|
|
16
|
-
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/
|
|
16
|
+
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/leagues/lib' )
|
|
17
17
|
$LOAD_PATH.unshift( '/sports/sportdb/sport.db/fifa/lib' )
|
|
18
18
|
require 'worldfootball'
|
|
19
19
|
|
data/config/leagues/america.csv
CHANGED
|
@@ -40,11 +40,16 @@ mx.3.b, mex-lp-serie-b-2024-2025-apertura
|
|
|
40
40
|
|
|
41
41
|
|
|
42
42
|
## change to mls - why? why not?
|
|
43
|
+
## note - add alt msl for now
|
|
44
|
+
|
|
43
45
|
us.1, usa-major-league-soccer-2024
|
|
46
|
+
mls, usa-major-league-soccer-2024
|
|
47
|
+
|
|
44
48
|
us.2, usa-usl-championship-2024
|
|
45
49
|
us.cup, usa-u-s-open-cup-2024
|
|
46
50
|
|
|
47
51
|
|
|
52
|
+
|
|
48
53
|
concacaf.cl, concacaf-champions-league-2020
|
|
49
54
|
|
|
50
55
|
|
|
@@ -99,7 +104,7 @@ ve.1, ven-primera-division-2024-clausura
|
|
|
99
104
|
|
|
100
105
|
|
|
101
106
|
copa.l, copa-libertadores-2020
|
|
102
|
-
|
|
107
|
+
copa.s, copa-sudamericana-2025
|
|
103
108
|
|
|
104
109
|
###################
|
|
105
110
|
### Central America & Caribbean Islands
|
data/config/leagues/europe.csv
CHANGED
|
@@ -43,19 +43,32 @@ sk.1, svk-super-liga-2024-2025
|
|
|
43
43
|
pl.1, pol-ekstraklasa-2024-2025
|
|
44
44
|
|
|
45
45
|
|
|
46
|
+
|
|
46
47
|
#########
|
|
47
48
|
### British Isles / Western Europe
|
|
49
|
+
##
|
|
50
|
+
## fix - move to config europe-british_isles !!!
|
|
48
51
|
|
|
49
52
|
eng.1, eng-premier-league-2024-2025
|
|
50
53
|
eng.2, eng-championship-2024-2025
|
|
51
54
|
eng.3, eng-league-one-2024-2025
|
|
52
55
|
eng.4, eng-league-two-2024-2025
|
|
53
56
|
eng.5, eng-national-league-2024-2025
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
### use fa cup and efl cup (league cup) as codes for now
|
|
60
|
+
## use eng.cup.fa and cup.efl instead - why? why not?
|
|
61
|
+
eng.fa.cup, eng-fa-cup-2023-2024
|
|
62
|
+
eng.efl.cup, eng-league-cup-2024-2025
|
|
63
|
+
## "old" codes for compat (cup and cup.l aka league cup)
|
|
54
64
|
eng.cup, eng-fa-cup-2023-2024 ### update to 2024-2025 later!!!
|
|
55
65
|
eng.cup.l, eng-league-cup-2024-2025
|
|
56
66
|
|
|
67
|
+
|
|
68
|
+
|
|
69
|
+
|
|
57
70
|
sco.1, sco-premiership-2024-2025
|
|
58
|
-
wal.1,
|
|
71
|
+
wal.1, wal-premier-league-2024-2025
|
|
59
72
|
nir.1, nir-premier-league-2024-2025
|
|
60
73
|
ie.1, irl-premier-division-2024
|
|
61
74
|
|
data/config/rounds.csv
CHANGED
|
@@ -1,21 +1,31 @@
|
|
|
1
1
|
key, name1, name2
|
|
2
2
|
|
|
3
3
|
## de to en
|
|
4
|
-
*, 1. Runde,
|
|
5
|
-
*, 2. Runde,
|
|
6
|
-
*, 3. Runde,
|
|
7
|
-
*, 4. Runde,
|
|
8
|
-
*, 5. Runde,
|
|
9
|
-
*, 6. Runde,
|
|
10
|
-
*, 7. Runde,
|
|
11
|
-
*, 8. Runde,
|
|
12
|
-
*, 9. Runde,
|
|
13
|
-
*,
|
|
14
|
-
*,
|
|
15
|
-
*,
|
|
16
|
-
*,
|
|
17
|
-
|
|
18
|
-
|
|
4
|
+
*, 1. Runde, Round 1
|
|
5
|
+
*, 2. Runde, Round 2
|
|
6
|
+
*, 3. Runde, Round 3
|
|
7
|
+
*, 4. Runde, Round 4
|
|
8
|
+
*, 5. Runde, Round 5
|
|
9
|
+
*, 6. Runde, Round 6
|
|
10
|
+
*, 7. Runde, Round 7
|
|
11
|
+
*, 8. Runde, Round 8
|
|
12
|
+
*, 9. Runde, Round 9
|
|
13
|
+
*, Sechzehntelfinal, Round of 32
|
|
14
|
+
*, Achtelfinale, Round of 16
|
|
15
|
+
*, Viertelfinale, Quarterfinals
|
|
16
|
+
*, Halbfinale, Semifinals
|
|
17
|
+
*, Finale, Final
|
|
18
|
+
|
|
19
|
+
*, Spiel um Platz 6, Match 6th place
|
|
20
|
+
*, Spiel um Platz 5, Match 5th place
|
|
21
|
+
*, Spiel um Platz 3, Match 3rd place ## use Match for 3rd place
|
|
22
|
+
|
|
23
|
+
*, 11. Platz, Match 11th place
|
|
24
|
+
*, 9. Platz, Match 9th place
|
|
25
|
+
*, 7. Platz, Match 7th place
|
|
26
|
+
*, 5. Platz, Match 5th place
|
|
27
|
+
*, 3. Platz, Match 3rd place
|
|
28
|
+
|
|
19
29
|
|
|
20
30
|
*, Vorrunde, Preliminary round
|
|
21
31
|
|
|
@@ -24,11 +34,35 @@ key, name1, name2
|
|
|
24
34
|
|
|
25
35
|
|
|
26
36
|
*, Entscheidungsspiel, Decider
|
|
27
|
-
*, Finalrunde, Finals
|
|
37
|
+
*, Finalrunde, Finals ## use Final round ???
|
|
28
38
|
*, Ligaphase, League phase
|
|
29
39
|
|
|
30
40
|
|
|
31
41
|
|
|
42
|
+
*, Gruppe A, Group A
|
|
43
|
+
*, Gruppe B, Group B
|
|
44
|
+
*, Gruppe C, Group C
|
|
45
|
+
*, Gruppe D, Group D
|
|
46
|
+
*, Gruppe E, Group E
|
|
47
|
+
*, Gruppe F, Group F
|
|
48
|
+
*, Gruppe G, Group G
|
|
49
|
+
*, Gruppe H, Group H
|
|
50
|
+
*, Gruppe I, Group I
|
|
51
|
+
*, Gruppe J, Group J
|
|
52
|
+
*, Gruppe K, Group K
|
|
53
|
+
*, Gruppe L, Group L
|
|
54
|
+
|
|
55
|
+
*, Gruppe 1, Group 1
|
|
56
|
+
*, Gruppe 2, Group 2
|
|
57
|
+
*, Gruppe 3, Group 3
|
|
58
|
+
*, Gruppe 4, Group 4
|
|
59
|
+
*, Gruppe 5, Group 5
|
|
60
|
+
*, Gruppe 6, Group 6
|
|
61
|
+
*, Gruppe 7, Group 7
|
|
62
|
+
*, Gruppe 8, Group 8
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
|
|
32
66
|
|
|
33
67
|
## es to en
|
|
34
68
|
*, Recalificación, Reclassification
|
|
@@ -45,47 +79,50 @@ mx.2, Qual. 2. Runde, Play-in round 2
|
|
|
45
79
|
|
|
46
80
|
###
|
|
47
81
|
## quick fix - move groups to new groups column!!!!
|
|
48
|
-
|
|
49
|
-
ar.1, Gruppe
|
|
50
|
-
ar.1, Gruppe
|
|
51
|
-
ar.1, Gruppe
|
|
52
|
-
ar.1, Gruppe
|
|
53
|
-
ar.1, Gruppe
|
|
54
|
-
ar.1, Gruppe
|
|
55
|
-
ar.1, Gruppe
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
co.1, Gruppe
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
caf.cl, Gruppe
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
uefa.cl, Gruppe
|
|
70
|
-
uefa.cl, Gruppe
|
|
71
|
-
uefa.cl, Gruppe
|
|
72
|
-
uefa.cl, Gruppe
|
|
73
|
-
uefa.cl, Gruppe
|
|
74
|
-
|
|
75
|
-
uefa.
|
|
76
|
-
uefa.
|
|
77
|
-
|
|
78
|
-
uefa.el, Gruppe
|
|
79
|
-
uefa.el, Gruppe
|
|
80
|
-
uefa.el, Gruppe
|
|
81
|
-
uefa.el, Gruppe
|
|
82
|
-
uefa.el, Gruppe
|
|
83
|
-
|
|
84
|
-
uefa.
|
|
85
|
-
uefa.
|
|
86
|
-
|
|
87
|
-
uefa.conf, Gruppe
|
|
88
|
-
uefa.conf, Gruppe
|
|
89
|
-
uefa.conf, Gruppe
|
|
90
|
-
uefa.conf, Gruppe
|
|
91
|
-
uefa.conf, Gruppe
|
|
82
|
+
#### no longer use - keep group (do NOT generalize)
|
|
83
|
+
# ar.1, Gruppe A, Group
|
|
84
|
+
# ar.1, Gruppe B, Group
|
|
85
|
+
# ar.1, Gruppe C, Group
|
|
86
|
+
# ar.1, Gruppe D, Group
|
|
87
|
+
# ar.1, Gruppe E, Group
|
|
88
|
+
# ar.1, Gruppe F, Group
|
|
89
|
+
# ar.1, Gruppe 1, Group
|
|
90
|
+
# ar.1, Gruppe 2, Group
|
|
91
|
+
|
|
92
|
+
# co.1, Gruppe A, Group
|
|
93
|
+
# co.1, Gruppe B, Group
|
|
94
|
+
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
# caf.cl, Gruppe A, Group
|
|
98
|
+
# caf.cl, Gruppe B, Group
|
|
99
|
+
# caf.cl, Gruppe C, Group
|
|
100
|
+
# caf.cl, Gruppe D, Group
|
|
101
|
+
|
|
102
|
+
|
|
103
|
+
# uefa.cl, Gruppe A, Group
|
|
104
|
+
# uefa.cl, Gruppe B, Group
|
|
105
|
+
# uefa.cl, Gruppe C, Group
|
|
106
|
+
# uefa.cl, Gruppe D, Group
|
|
107
|
+
# uefa.cl, Gruppe E, Group
|
|
108
|
+
# uefa.cl, Gruppe F, Group
|
|
109
|
+
# uefa.cl, Gruppe G, Group
|
|
110
|
+
# uefa.cl, Gruppe H, Group
|
|
111
|
+
|
|
112
|
+
# uefa.el, Gruppe A, Group
|
|
113
|
+
# uefa.el, Gruppe B, Group
|
|
114
|
+
# uefa.el, Gruppe C, Group
|
|
115
|
+
# uefa.el, Gruppe D, Group
|
|
116
|
+
# uefa.el, Gruppe E, Group
|
|
117
|
+
# uefa.el, Gruppe F, Group
|
|
118
|
+
# uefa.el, Gruppe G, Group
|
|
119
|
+
# uefa.el, Gruppe H, Group
|
|
120
|
+
|
|
121
|
+
# uefa.conf, Gruppe A, Group
|
|
122
|
+
# uefa.conf, Gruppe B, Group
|
|
123
|
+
# uefa.conf, Gruppe C, Group
|
|
124
|
+
# uefa.conf, Gruppe D, Group
|
|
125
|
+
# uefa.conf, Gruppe E, Group
|
|
126
|
+
# uefa.conf, Gruppe F, Group
|
|
127
|
+
# uefa.conf, Gruppe G, Group
|
|
128
|
+
# uefa.conf, Gruppe H, Group
|
data/config/stages.csv
CHANGED
|
@@ -37,12 +37,9 @@ gr.1, Playoffs, Playoffs
|
|
|
37
37
|
gr.1, Spiel um Platz 6, Match 6th Place
|
|
38
38
|
|
|
39
39
|
|
|
40
|
-
|
|
41
|
-
mx.1, Apertura Playoffs, Apertura - Liguilla
|
|
42
|
-
mx.1, Clausura Playoffs, Clausura - Liguilla
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
40
|
nz.1, Playoffs, Playoff Finals
|
|
47
41
|
|
|
48
42
|
|
|
43
|
+
|
|
44
|
+
## mx.1, Apertura Playoffs, Apertura - Liguilla
|
|
45
|
+
## mx.1, Clausura Playoffs, Clausura - Liguilla
|
data/lib/worldfootball/build.rb
CHANGED
|
@@ -15,8 +15,9 @@ def self.build( rows, season:, league:, stage: '' ) ## rename to fixup or such
|
|
|
15
15
|
print " - #{stage}" unless stage.empty?
|
|
16
16
|
print "\n"
|
|
17
17
|
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
## fix - use find_by! - add upstream
|
|
19
|
+
league_info = LeagueCodes.find_by( code: league, season: season )
|
|
20
|
+
zone = league_info['tz']
|
|
20
21
|
|
|
21
22
|
|
|
22
23
|
## note: use only first part from key for lookup
|
|
@@ -73,10 +74,28 @@ def self.build( rows, season:, league:, stage: '' ) ## rename to fixup or such
|
|
|
73
74
|
|
|
74
75
|
date_str = row[:date]
|
|
75
76
|
time_str = row[:time]
|
|
77
|
+
|
|
78
|
+
|
|
76
79
|
team1_str = row[:team1]
|
|
77
80
|
team2_str = row[:team2]
|
|
78
|
-
|
|
81
|
+
|
|
82
|
+
## R. Betis / Jag. Białystok v Celje / Fiorentina
|
|
83
|
+
## Legia Warszawa / Chelsea v Djurgårdens / Rapid Wien
|
|
84
|
+
team1_ref = row[:team1_ref]
|
|
85
|
+
team2_ref = row[:team2_ref]
|
|
86
|
+
|
|
87
|
+
## reset team name to N.N. if team_ref is nil and name include " / "
|
|
88
|
+
if team1_ref.nil? && team1_str.index( ' / ')
|
|
89
|
+
puts "!! WARN - change placeholder team #{team1_str} to N.N."
|
|
90
|
+
team1_str = 'N.N.'
|
|
91
|
+
end
|
|
92
|
+
if team2_ref.nil? && team2_str.index( ' / ')
|
|
93
|
+
puts "!! WARN - change placeholder team #{team2_str} to N.N."
|
|
94
|
+
team2_str = 'N.N.'
|
|
95
|
+
end
|
|
96
|
+
|
|
79
97
|
|
|
98
|
+
score_str = row[:score]
|
|
80
99
|
|
|
81
100
|
|
|
82
101
|
### check for score_error; first (step 1) lookup by date
|
|
@@ -53,6 +53,14 @@ def self.convert( league:, season:,
|
|
|
53
53
|
## e.g. {:count=>2, :name=>"AS Arta", :ref=>"as-arta"},
|
|
54
54
|
## {:count=>4, :name=>"Dekedaha FC", :ref=>"dekedaha-fc"},
|
|
55
55
|
## ...
|
|
56
|
+
### {:count=>2, :name=>"Arsenal / Real Madrid", :ref=>nil},
|
|
57
|
+
## {:count=>2, :name=>"PSG / Aston Villa", :ref=>nil},
|
|
58
|
+
## {:count=>2, :name=>"Barcelona / Dortmund", :ref=>nil},
|
|
59
|
+
## {:count=>2, :name=>"Bayern / Inter", :ref=>nil},
|
|
60
|
+
## {:count=>1, :name=>"Sieger HF 1", :ref=>nil},
|
|
61
|
+
## {:count=>1, :name=>"Sieger HF 2", :ref=>nil}]
|
|
62
|
+
|
|
63
|
+
|
|
56
64
|
teams.each do |h|
|
|
57
65
|
team_count = h[:count]
|
|
58
66
|
team_name = norm_team( h[:name] ) ## note: norm team name!!!
|
|
@@ -66,7 +74,10 @@ def self.convert( league:, season:,
|
|
|
66
74
|
## note: skip N.N. (place holder team)
|
|
67
75
|
## team_ref is nil etc.
|
|
68
76
|
next if team_name == 'N.N.'
|
|
69
|
-
|
|
77
|
+
### warn if team_ref is nil and skip !!!
|
|
78
|
+
next if team_ref.nil?
|
|
79
|
+
|
|
80
|
+
|
|
70
81
|
team_stat = teams_by_ref[ team_ref ] ||= { count: 0,
|
|
71
82
|
names: [] }
|
|
72
83
|
team_stat[:count] += team_count
|
|
@@ -86,10 +97,11 @@ def self.convert( league:, season:,
|
|
|
86
97
|
|
|
87
98
|
clubs_intl = ['uefa.cl', 'uefa.el', 'uefa.conf',
|
|
88
99
|
'uefa.cl.q', 'uefa.el.q', 'uefa.conf.q',
|
|
89
|
-
'copa.l',
|
|
100
|
+
'copa.l', 'copa.s',
|
|
90
101
|
'concacaf.cl',
|
|
91
102
|
'caf.cl',
|
|
92
103
|
'afl',
|
|
104
|
+
'world.clubs', ## club worldcup
|
|
93
105
|
].include?(league.key) ? true : false
|
|
94
106
|
|
|
95
107
|
####
|
|
@@ -130,15 +142,19 @@ def self.convert( league:, season:,
|
|
|
130
142
|
|
|
131
143
|
## quick hack
|
|
132
144
|
## add country (fifa) codes to team names
|
|
145
|
+
##
|
|
146
|
+
## note - some placeholder teams have no ref!! and, thus no entry with country code
|
|
133
147
|
recs.each do |rec|
|
|
134
148
|
team1_org = rec[5]
|
|
135
|
-
if team1_org != 'N.N.'
|
|
149
|
+
if team1_org != 'N.N.' && ## note - skip place holder; keep as-is
|
|
150
|
+
teams_by_name[team1_org]
|
|
136
151
|
country_code = teams_by_name[team1_org][:code]
|
|
137
152
|
rec[5] = "#{team1_org} (#{country_code})"
|
|
138
153
|
end
|
|
139
154
|
|
|
140
155
|
team2_org = rec[8]
|
|
141
|
-
if team2_org != 'N.N.' ## note - skip place holder; keep as-is
|
|
156
|
+
if team2_org != 'N.N.' && ## note - skip place holder; keep as-is
|
|
157
|
+
teams_by_name[team2_org]
|
|
142
158
|
country_code = teams_by_name[team2_org][:code]
|
|
143
159
|
rec[8] = "#{team2_org} (#{country_code})"
|
|
144
160
|
end
|
|
@@ -134,14 +134,14 @@ end # class LeagueConfig
|
|
|
134
134
|
|
|
135
135
|
|
|
136
136
|
|
|
137
|
-
|
|
138
137
|
LEAGUES = LeagueConfig.new
|
|
139
138
|
['africa',
|
|
140
139
|
'america',
|
|
141
140
|
'asia',
|
|
142
141
|
'europe',
|
|
143
142
|
'middle_east',
|
|
144
|
-
'pacific'
|
|
143
|
+
'pacific',
|
|
144
|
+
'world'].each do |name|
|
|
145
145
|
recs = read_csv( "#{Worldfootball.root}/config/leagues/#{name}.csv" )
|
|
146
146
|
pp recs
|
|
147
147
|
puts " #{recs.size} league(s) in #{name}"
|
data/lib/worldfootball.rb
CHANGED
metadata
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: worldfootball
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3.
|
|
4
|
+
version: 0.3.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Gerald Bauer
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2025-04-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
|
-
name:
|
|
14
|
+
name: leagues
|
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
|
16
16
|
requirements:
|
|
17
17
|
- - ">="
|
|
@@ -123,6 +123,7 @@ executables:
|
|
|
123
123
|
- wfbconv
|
|
124
124
|
- wfbdump
|
|
125
125
|
- wfbgen
|
|
126
|
+
- wfbsync
|
|
126
127
|
- wfbup
|
|
127
128
|
extensions: []
|
|
128
129
|
extra_rdoc_files:
|
|
@@ -139,6 +140,7 @@ files:
|
|
|
139
140
|
- bin/wfbconv
|
|
140
141
|
- bin/wfbdump
|
|
141
142
|
- bin/wfbgen
|
|
143
|
+
- bin/wfbsync
|
|
142
144
|
- bin/wfbup
|
|
143
145
|
- config/leagues/africa.csv
|
|
144
146
|
- config/leagues/america.csv
|
|
@@ -146,6 +148,7 @@ files:
|
|
|
146
148
|
- config/leagues/europe.csv
|
|
147
149
|
- config/leagues/middle_east.csv
|
|
148
150
|
- config/leagues/pacific.csv
|
|
151
|
+
- config/leagues/world.csv
|
|
149
152
|
- config/rounds.csv
|
|
150
153
|
- config/stages.csv
|
|
151
154
|
- lib/worldfootball.rb
|