| 1 | #!@PERL@ |
1 | #!@PERL@ |
| 2 | |
2 | |
| 3 | # |
3 | # |
| 4 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
4 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
| 5 | # |
5 | # |
| 6 | # Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
6 | # Copyright (©) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
| 7 | # |
7 | # |
| 8 | # Deliantra is free software: you can redistribute it and/or modify it under |
8 | # Deliantra is free software: you can redistribute it and/or modify it under |
| 9 | # the terms of the Affero GNU General Public License as published by the |
9 | # the terms of the Affero GNU General Public License as published by the |
| 10 | # Free Software Foundation, either version 3 of the License, or (at your |
10 | # Free Software Foundation, either version 3 of the License, or (at your |
| 11 | # option) any later version. |
11 | # option) any later version. |
| 12 | # |
12 | # |
| 13 | # This program is distributed in the hope that it will be useful, |
13 | # This program is distributed in the hope that it will be useful, |
| 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 16 | # GNU General Public License for more details. |
16 | # GNU General Public License for more details. |
| 17 | # |
17 | # |
| 18 | # You should have received a copy of the Affero GNU General Public License |
18 | # You should have received a copy of the Affero GNU General Public License |
| 19 | # and the GNU General Public License along with this program. If not, see |
19 | # and the GNU General Public License along with this program. If not, see |
| 20 | # <http://www.gnu.org/licenses/>. |
20 | # <http://www.gnu.org/licenses/>. |
| 21 | # |
21 | # |
| 22 | # The authors can be reached via e-mail to <support@deliantra.net> |
22 | # The authors can be reached via e-mail to <support@deliantra.net> |
| 23 | # |
23 | # |
| 24 | |
24 | |
| 25 | use common::sense; |
25 | use common::sense; |
| 26 | |
26 | |
| … | |
… | |
| 28 | my $exec_prefix = "@exec_prefix@"; |
28 | my $exec_prefix = "@exec_prefix@"; |
| 29 | my $datarootdir = "@datarootdir@"; |
29 | my $datarootdir = "@datarootdir@"; |
| 30 | my $DATADIR = "@datadir@/@PACKAGE@"; |
30 | my $DATADIR = "@datadir@/@PACKAGE@"; |
| 31 | |
31 | |
| 32 | my $CONVERT = "@CONVERT@"; |
32 | my $CONVERT = "@CONVERT@"; |
| 33 | #my $IDENTIFY = "@IDENTIFY@"; |
33 | my $IDENTIFY = "@IDENTIFY@"; |
| 34 | my $OPTIPNG = "@OPTIPNG@"; |
34 | my $OPTIPNG = "@OPTIPNG@"; |
| 35 | my $RSYNC = "@RSYNC@"; |
35 | my $RSYNC = "@RSYNC@"; |
| 36 | my $PNGNQ = "@PNGNQ@"; |
36 | my $PNGNQ = "@PNGNQ@"; |
| 37 | |
37 | |
| 38 | use Getopt::Long; |
38 | use Getopt::Long; |
| 39 | use File::Temp; |
39 | use File::Temp; |
| 40 | use POSIX (); |
40 | use POSIX (); |
| 41 | use Carp; |
41 | use Carp; |
| 42 | |
42 | |
| 43 | use Coro::EV; |
|
|
| 44 | use AnyEvent; |
|
|
| 45 | use YAML::XS (); |
43 | use YAML::XS (); |
|
|
44 | use Digest::MD5 (); |
|
|
45 | use Storable (); |
| 46 | use JSON::XS (); |
46 | use JSON::XS (); |
| 47 | use IO::AIO (); |
47 | use IO::AIO (); |
| 48 | use Digest::MD5 (); |
48 | use Compress::LZF (); |
| 49 | |
49 | |
|
|
50 | use AnyEvent; |
| 50 | use Coro 5.12; |
51 | use Coro 5.12; |
|
|
52 | use Coro::EV; |
| 51 | use Coro::AIO; |
53 | use Coro::AIO; |
| 52 | use Coro::Util; |
54 | use Coro::Util; |
| 53 | use Coro::Channel; |
55 | use Coro::Channel; |
|
|
56 | use Coro::AnyEvent; |
| 54 | use Coro::Storable; $Storable::canonical = 1; |
57 | use Coro::Storable; $Storable::canonical = 1; |
| 55 | |
58 | |
| 56 | use Deliantra; |
59 | use Deliantra; |
| 57 | |
60 | |
| 58 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
61 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
| … | |
… | |
| 77 | my $TMPDIR = "/tmp/cfutil$$~"; |
80 | my $TMPDIR = "/tmp/cfutil$$~"; |
| 78 | my $TMPFILE = "aaaa0"; |
81 | my $TMPFILE = "aaaa0"; |
| 79 | my @COMMIT; |
82 | my @COMMIT; |
| 80 | |
83 | |
| 81 | our %COLOR = ( |
84 | our %COLOR = ( |
|
|
85 | # original cf colours |
| 82 | black => 0, |
86 | black => 0, |
| 83 | white => 1, |
87 | white => 1, |
| 84 | navy => 2, |
88 | navy => 2, # "dark blue" |
| 85 | red => 3, |
89 | red => 3, |
| 86 | orange => 4, |
90 | orange => 4, |
| 87 | blue => 5, |
91 | blue => 5, # "light blue" |
| 88 | darkorange => 6, |
92 | darkorange => 6, |
| 89 | green => 7, |
93 | green => 7, |
| 90 | lightgreen => 8, |
94 | lightgreen => 8, |
| 91 | grey => 9, |
95 | grey => 9, |
|
|
96 | brown => 10, # "yellow" |
|
|
97 | gold => 11, # "light yellow" |
|
|
98 | tan => 12, # yellowish gray |
|
|
99 | |
|
|
100 | # new for deliantra |
| 92 | brown => 10, |
101 | none => 13, |
|
|
102 | |
|
|
103 | # compatibility to existing archetypes |
|
|
104 | lightblue => 5, |
| 93 | gold => 11, |
105 | gray => 9, |
|
|
106 | yellow => 11, |
| 94 | tan => 12, |
107 | khaki => 12, |
| 95 | ); |
108 | ); |
| 96 | |
109 | |
| 97 | END { system "rm", "-rf", $TMPDIR } |
110 | END { system "rm", "-rf", $TMPDIR } |
| 98 | |
111 | |
| 99 | my $s_INT = EV::signal INT => sub { exit 1 }; |
112 | my $s_INT = AE::signal INT => sub { exit 1 }; |
| 100 | my $s_TERM = EV::signal TERM => sub { exit 1 }; |
113 | my $s_TERM = AE::signal TERM => sub { exit 1 }; |
| 101 | |
114 | |
| 102 | our %hash; |
115 | our %hash; |
| 103 | |
116 | |
| 104 | # here we could try to avoid collisions and reduce chksum size further |
117 | # here we could try to avoid collisions and reduce chksum size further |
| 105 | sub make_hash($\$\$;$) { |
118 | sub make_hash($\$\$;$) { |
| 106 | my ($id, $dataref, $hashref, $clen) = @_; |
119 | my ($id, $dataref, $hashref, $clen) = @_; |
| 107 | |
120 | |
| 108 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; |
121 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5; |
| 109 | |
122 | |
| 110 | if (exists $hash{$hash}) { |
123 | if (exists $hash{$hash}) { |
| 111 | # hahs collinion, but some files are simply identical |
124 | # hash collision, but some files are simply identical |
| 112 | if (${$hash{$hash}[1]} ne $$dataref) { |
125 | if (${$hash{$hash}[1]} ne $$dataref) { |
| 113 | warn "hash collision $hash{$hash}[0] vs. $id\n"; |
126 | warn "ERROR: hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n"; |
| 114 | exit 1; |
127 | exit 1; |
| 115 | } else { |
128 | } else { |
| 116 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
129 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
| 117 | } |
130 | } |
| 118 | } |
131 | } |
| 119 | $hash{$hash} = [$id, $dataref, $hashref]; |
132 | $hash{$hash} = [$id, $dataref, $hashref]; |
| 120 | |
133 | |
| 121 | $$hashref = $hash; |
134 | $$hashref = $hash; |
| 122 | } |
135 | } |
| 123 | |
136 | |
|
|
137 | sub optipng($) { |
|
|
138 | system $OPTIPNG, "-o5", "-i0", "-q", $_[0]; |
|
|
139 | die "$_[0] has zero size, aborting." unless -s $_[0]; |
|
|
140 | } |
|
|
141 | |
| 124 | mkdir $TMPDIR, 0700 |
142 | mkdir $TMPDIR, 0700 |
| 125 | or die "$TMPDIR: $!"; |
143 | or die "$TMPDIR: $!"; |
| 126 | |
144 | |
| 127 | sub fork_sub(&) { |
145 | sub fork_exec(&) { |
| 128 | my ($cb) = @_; |
146 | my ($cb) = @_; |
| 129 | |
147 | |
| 130 | if (my $pid = fork) { |
148 | if (my $pid = fork) { |
| 131 | my $current = $Coro::current; |
149 | my $current = $Coro::current; |
| 132 | my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); |
150 | my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); |
| … | |
… | |
| 137 | warn $@; |
155 | warn $@; |
| 138 | POSIX::_exit 1; |
156 | POSIX::_exit 1; |
| 139 | } |
157 | } |
| 140 | } |
158 | } |
| 141 | |
159 | |
|
|
160 | sub imgsize($) { |
|
|
161 | open my $fh, "-|", $IDENTIFY, qw(-ping -format %w,%h --), $_[0] |
|
|
162 | or die "$IDENTIFY: $!"; |
|
|
163 | |
|
|
164 | Coro::AnyEvent::readable $fh; |
|
|
165 | |
|
|
166 | my ($w, $h) = split /,/, <$fh>; |
|
|
167 | |
|
|
168 | ($w+0, $h+0) |
|
|
169 | } |
|
|
170 | |
|
|
171 | # make $dst from $src, if not uptodate, by calling $how |
|
|
172 | sub make_file($$$) { |
|
|
173 | my ($src, $dst, $how) = @_; |
|
|
174 | |
|
|
175 | my $t = (aio_stat $dst) ? -1 : (stat _)[9]; |
|
|
176 | |
|
|
177 | for (ref $src ? @$src : $src) { |
|
|
178 | aio_stat $_ |
|
|
179 | and die "$_: $!"; |
|
|
180 | |
|
|
181 | if ((stat _)[9] > $t) { |
|
|
182 | # outdated, redo |
|
|
183 | $how->(); |
|
|
184 | last; |
|
|
185 | } |
|
|
186 | } |
|
|
187 | } |
|
|
188 | |
| 142 | sub inst_maps($) { |
189 | sub inst_maps($) { |
| 143 | my (undef, $path) = @_; |
190 | my (undef, $path) = @_; |
| 144 | |
191 | |
| 145 | print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; |
192 | print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; |
| 146 | |
193 | |
| 147 | if (!-f "$path/regions") { |
194 | if (!-f "$path/regions") { |
| 148 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
195 | warn "ERROR: '$path' does not look like a maps directory ('regions' file is missing).\n"; |
| 149 | exit 1 unless $FORCE; |
196 | exit 1 unless $FORCE; |
| 150 | } |
197 | } |
| 151 | |
198 | |
| 152 | system $RSYNC, "-av", "--chmod=u=rwX,go=rX", |
199 | system $RSYNC, "-av", "--chmod=u=rwX,go=rX", |
| 153 | "$path/.", "$DATADIR/maps/.", |
200 | "$path/.", "$DATADIR/maps/.", |
| 154 | "--exclude", "CVS", "--exclude", "/world-precomposed", |
201 | "--exclude", "CVS", "--exclude", "/world-precomposed", |
| 155 | "--delete", "--delete-excluded" |
202 | "--delete", "--delete-excluded" |
| 156 | and die "map installation failed.\n"; |
203 | and die "map installation failed.\n"; |
| 157 | |
204 | |
| 158 | print "maps installed successfully.\n"; |
205 | print "maps installed successfully.\n"; |
| 159 | } |
|
|
| 160 | |
|
|
| 161 | sub autoglyph { |
|
|
| 162 | my ($stem, $face) = @_; |
|
|
| 163 | |
|
|
| 164 | if ($stem =~ /^wall\/|Nimwall/) { |
|
|
| 165 | # warn $stem; |
|
|
| 166 | "+" |
|
|
| 167 | } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { |
|
|
| 168 | "." |
|
|
| 169 | } elsif ($stem =~ /^player\//) { |
|
|
| 170 | "@" |
|
|
| 171 | } else { |
|
|
| 172 | substr $stem, 0, 1 |
|
|
| 173 | } |
|
|
| 174 | } |
206 | } |
| 175 | |
207 | |
| 176 | { |
208 | { |
| 177 | our %ANIMINFO; |
209 | our %ANIMINFO; |
| 178 | our %FACEINFO; |
210 | our %FACEINFO; |
| 179 | our %RESOURCE; |
211 | our %RESOURCE; |
| 180 | our @ARC; |
212 | our @ARC; |
| 181 | our %ARC; |
213 | our %ARC; |
| 182 | our $TRS; |
214 | our $TRS; |
|
|
215 | our %PNG; |
| 183 | our $NFILE; |
216 | our $NFILE; |
| 184 | our $PATH; |
217 | our $PATH; |
| 185 | |
218 | |
| 186 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
219 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
| 187 | |
220 | |
| 188 | our $c_arc = new Coro::Channel; |
221 | our $c_arc = new Coro::Channel; |
| 189 | our $c_trs = new Coro::Channel; |
222 | our $c_any = new Coro::Channel; |
| 190 | our $c_res = new Coro::Channel; |
|
|
| 191 | |
223 | |
| 192 | our @c_png; |
224 | our @c_png; |
| 193 | |
225 | |
|
|
226 | # texture catalog size, in 64x64 tiles |
|
|
227 | sub TC_W() { 1024 / 64 } |
|
|
228 | sub TC_H() { 1024 / 64 } |
|
|
229 | |
|
|
230 | our @TC = ([]); # texture catalogs |
|
|
231 | |
| 194 | sub commit_png($$$$) { |
232 | sub commit_png($$$$$$) { |
| 195 | my ($stem, $name, $data, $T) = @_; |
233 | my ($stem, $name, $data, $T, $w, $h) = @_; |
| 196 | |
234 | |
| 197 | $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; |
235 | $FACEINFO{$name}{stem} = substr $stem, 1 + length $PATH; |
| 198 | $FACEINFO{$name}{"data$T"} = $data; |
236 | $FACEINFO{$name}{"data$T"} = $data; |
|
|
237 | $FACEINFO{$name}{w} = $w; |
|
|
238 | $FACEINFO{$name}{h} = $h; |
| 199 | } |
239 | } |
| 200 | |
240 | |
| 201 | sub process_png { |
241 | sub process_png { |
| 202 | while (@c_png) { |
242 | while (@c_png) { |
| 203 | my ($path, $delete) = @{pop @c_png}; |
243 | my ($path, $delete) = @{pop @c_png}; |
| … | |
… | |
| 205 | my $png; |
245 | my $png; |
| 206 | aio_lstat $path; |
246 | aio_lstat $path; |
| 207 | my ($size, $mtime) = (stat _)[7,9]; |
247 | my ($size, $mtime) = (stat _)[7,9]; |
| 208 | |
248 | |
| 209 | if (0 > aio_load $path, $png) { |
249 | if (0 > aio_load $path, $png) { |
| 210 | warn "$path: $!, skipping.\n"; |
250 | warn "ERROR: $path: $!, skipping.\n"; |
| 211 | next; |
251 | next; |
| 212 | } |
252 | } |
| 213 | |
253 | |
| 214 | my $stem = $path; |
254 | my $stem = $path; |
| 215 | my $T; |
255 | my $T; |
| … | |
… | |
| 217 | if ($stem =~ s/\.32x32\.png~?$//) { |
257 | if ($stem =~ s/\.32x32\.png~?$//) { |
| 218 | $T = 32; |
258 | $T = 32; |
| 219 | } elsif ($stem =~ s/\.64x64\.png~?$//) { |
259 | } elsif ($stem =~ s/\.64x64\.png~?$//) { |
| 220 | $T = 64; |
260 | $T = 64; |
| 221 | } else { |
261 | } else { |
| 222 | warn "$path: weird filename, skipping.\n"; |
262 | warn "ERROR: $path: weird filename, skipping.\n"; |
| 223 | next; |
263 | next; |
| 224 | } |
264 | } |
| 225 | |
265 | |
| 226 | # quickly extract width and height of the (necessarily PNG) image |
266 | # quickly extract width and height of the (necessarily PNG) image |
| 227 | unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { |
267 | unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { |
| 228 | warn "$path: not a recognized png file, skipping.\n"; |
268 | warn "ERROR: $path: not a recognized png file, skipping.\n"; |
| 229 | next; |
269 | next; |
| 230 | } |
270 | } |
| 231 | |
271 | |
| 232 | my ($w, $h) = unpack "NN", $1; |
272 | my ($w, $h) = unpack "NN", $1; |
| 233 | |
273 | |
| 234 | if ($w < $T || $h < $T) { |
274 | if ($w < $T || $h < $T) { |
| 235 | warn "$path: too small ($w $h), skipping.\n"; |
275 | warn "ERROR: $path: too small ($w $h), skipping.\n"; |
| 236 | next; |
276 | next; |
| 237 | } |
277 | } |
| 238 | |
278 | |
| 239 | if ($w % $T || $h % $T) { |
279 | if ($w % $T || $h % $T) { |
| 240 | warn "$path: weird png size ($w $h), skipping.\n"; |
280 | warn "ERROR: $path: weird png size ($w $h), skipping.\n"; |
| 241 | next; |
281 | next; |
| 242 | } |
282 | } |
| 243 | |
283 | |
| 244 | (my $base = $stem) =~ s/^.*\///; |
284 | (my $base = $stem) =~ s/^.*\///; |
| 245 | |
285 | |
| … | |
… | |
| 254 | unless ($path =~ /~$/) { |
294 | unless ($path =~ /~$/) { |
| 255 | # possibly enlarge |
295 | # possibly enlarge |
| 256 | if (0 > aio_stat "$stem.64x64.png") { |
296 | if (0 > aio_stat "$stem.64x64.png") { |
| 257 | my $other = "$stem.64x64.png~"; |
297 | my $other = "$stem.64x64.png~"; |
| 258 | |
298 | |
| 259 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
299 | make_file $path, $other, sub { |
| 260 | fork_sub { |
300 | fork_exec { |
| 261 | my $CROP; |
301 | my $CROP; |
| 262 | my $SRC = "png:\Q$path\E"; |
302 | my $SRC = "png:\Q$path\E"; |
| 263 | |
303 | |
| 264 | my $is_floor = $arc->{is_floor}; |
304 | my $is_floor = $arc->{is_floor}; |
| 265 | my $is_wall = 0; |
305 | my $is_wall = 0; |
| … | |
… | |
| 315 | $x * ($w - 8) + 4, |
355 | $x * ($w - 8) + 4, |
| 316 | $y * ($h - 8) + 4; |
356 | $y * ($h - 8) + 4; |
| 317 | } |
357 | } |
| 318 | } |
358 | } |
| 319 | |
359 | |
| 320 | system "convert -depth 8 $SRC rgba:-" |
360 | system "$CONVERT -depth 8 $SRC rgba:-" |
| 321 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
361 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
| 322 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" |
362 | . "| $CONVERT -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" |
| 323 | and die "convert/cfhq2xa pipeline error: status $? ($!)"; |
363 | and die "convert/cfhq2xa pipeline error: status $? ($!)"; |
| 324 | system $OPTIPNG, "-i0", "-q", "$other~"; |
364 | optipng "$other~"; |
| 325 | die "$other~ has zero size, aborting." unless -s "$other~"; |
|
|
| 326 | rename "$other~", $other; |
365 | rename "$other~", $other; |
| 327 | }; |
366 | }; |
| 328 | } |
367 | }; |
| 329 | |
368 | |
| 330 | push @c_png, [$other, !$CACHE]; |
369 | push @c_png, [$other, !$CACHE]; |
| 331 | } |
370 | } |
| 332 | |
371 | |
| 333 | # possibly scale down |
372 | # possibly scale down |
| 334 | if (0 > aio_stat "$stem.32x32.png") { |
373 | if (0 > aio_stat "$stem.32x32.png") { |
| 335 | my $other = "$stem.32x32.png~"; |
374 | my $other = "$stem.32x32.png~"; |
| 336 | |
375 | |
| 337 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
376 | make_file $path, $other, sub { |
| 338 | fork_sub { |
377 | fork_exec { |
| 339 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
378 | system "$CONVERT png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
| 340 | system $OPTIPNG, "-i0", "-q", "$other~"; |
379 | optipng "$other~"; |
| 341 | |
380 | |
| 342 | # reduce smoothfaces >10000 bytes |
381 | # reduce smoothfaces >10000 bytes |
| 343 | # obsolete, no longer required |
382 | # obsolete, no longer required |
| 344 | if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { |
383 | if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { |
| 345 | my $ncolor = 256; |
384 | my $ncolor = 256; |
| 346 | while () { |
385 | while () { |
| 347 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
386 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
| 348 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
387 | optipng "$other~~"; |
| 349 | last if 10000 > -s "$other~~"; |
388 | last if 10000 > -s "$other~~"; |
| 350 | $ncolor = int $ncolor * 0.9; |
389 | $ncolor = int $ncolor * 0.9; |
| 351 | $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; |
390 | $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; |
| 352 | } |
391 | } |
| 353 | |
392 | |
| … | |
… | |
| 358 | } |
397 | } |
| 359 | |
398 | |
| 360 | die "$other~ has zero size, aborting." unless -s "$other~"; |
399 | die "$other~ has zero size, aborting." unless -s "$other~"; |
| 361 | rename "$other~", $other; |
400 | rename "$other~", $other; |
| 362 | }; |
401 | }; |
| 363 | } |
402 | }; |
| 364 | |
403 | |
| 365 | #warn "scaled down $path to $other\n";#d# |
404 | #warn "scaled down $path to $other\n";#d# |
| 366 | push @c_png, [$other, !$CACHE]; |
405 | push @c_png, [$other, !$CACHE]; |
| 367 | } |
406 | } |
| 368 | } |
407 | } |
| 369 | |
408 | |
| 370 | (my $face = $stem) =~ s/^.*\///; |
409 | (my $face = $stem) =~ s/^.*\///; |
|
|
410 | |
|
|
411 | for (@{ $fi->{derive} }) { |
|
|
412 | my ($dir, $type) = @$_; |
|
|
413 | |
|
|
414 | my $geom = "${T}x${T}"; |
|
|
415 | my $dpath = "$dir/$type:$face.$geom.png~"; |
|
|
416 | |
|
|
417 | if ($type eq "buildmaterial") { |
|
|
418 | my $ov = "$PATH/mapbuilding/buildmaterial.png"; |
|
|
419 | make_file [$path, $ov], $dpath, sub { |
|
|
420 | fork_exec { |
|
|
421 | system "$CONVERT -size 64x64 xc:transparent \\( \Q$path\E -geometry 52x52+6+6 \\) -composite \Q$ov\E -composite -geometry $geom png:\Q$dpath\E~"; |
|
|
422 | optipng "$dpath~"; |
|
|
423 | rename "$dpath~", $dpath; |
|
|
424 | }; |
|
|
425 | }; |
|
|
426 | } elsif ($type eq "buildmaterial-box") { |
|
|
427 | my $ov = "$PATH/mapbuilding/buildmaterial-box.png"; |
|
|
428 | make_file [$path, $ov], $dpath, sub { |
|
|
429 | fork_exec { |
|
|
430 | system "$CONVERT \Q$ov\E " |
|
|
431 | . "\\( \Q$path\E -trim -geometry 34x31\\> " |
|
|
432 | . "-gravity center -background transparent -extent 37x34 +gravity " |
|
|
433 | . "-geometry +22+6 \\) -composite " |
|
|
434 | . "-geometry $geom png:\Q$dpath\E~"; |
|
|
435 | optipng "$dpath~"; |
|
|
436 | rename "$dpath~", $dpath; |
|
|
437 | }; |
|
|
438 | }; |
|
|
439 | } elsif ($type eq "buildmaterial-sbox") { |
|
|
440 | my $ov = "$PATH/mapbuilding/buildmaterial-sbox.png"; |
|
|
441 | make_file [$path, $ov], $dpath, sub { |
|
|
442 | fork_exec { |
|
|
443 | system "$CONVERT \Q$ov\E " |
|
|
444 | . "\\( \Q$path\E -trim -geometry 16x24\\> " |
|
|
445 | . "-gravity center -background transparent -extent 18x26 +gravity " |
|
|
446 | . "-geometry +26+16 \\) -composite " |
|
|
447 | . "-geometry $geom png:\Q$dpath\E~"; |
|
|
448 | optipng "$dpath~"; |
|
|
449 | rename "$dpath~", $dpath; |
|
|
450 | }; |
|
|
451 | }; |
|
|
452 | } else { |
|
|
453 | warn "ERROR: facename $type:$face contains unsupported derivation type.\n"; |
|
|
454 | } |
|
|
455 | |
|
|
456 | aio_load $dpath, my $png; |
|
|
457 | IO::AIO::aio_unlink $dpath unless $CACHE; |
|
|
458 | commit_png "$dir/$type:$face", "$type:$face", $png, $T, 1, 1; |
|
|
459 | } |
| 371 | |
460 | |
| 372 | # split all bigfaces, but avoid smoothfaces (*_S) |
461 | # split all bigfaces, but avoid smoothfaces (*_S) |
| 373 | if (($w > $T || $h > $T) && $face !~ /_S\./) { |
462 | if (($w > $T || $h > $T) && $face !~ /_S\./) { |
| 374 | # split |
463 | # split |
| 375 | my @tile; |
464 | my @tile; |
| … | |
… | |
| 380 | push @tile, [$x, $y, $file, (stat _)[9]]; |
469 | push @tile, [$x, $y, $file, (stat _)[9]]; |
| 381 | } |
470 | } |
| 382 | } |
471 | } |
| 383 | |
472 | |
| 384 | my $mtime = (lstat $path)[9]; |
473 | my $mtime = (lstat $path)[9]; |
| 385 | my @todo = grep { $_->[3] <= $mtime } @tile; |
474 | my @todo = grep { $_->[3] < $mtime } @tile; |
| 386 | if (@todo) { |
475 | if (@todo) { |
| 387 | fork_sub { |
476 | fork_exec { |
| 388 | open my $convert, "|-", $CONVERT, |
477 | open my $convert, "|-", $CONVERT, |
| 389 | "png:-", |
478 | "png:-", |
| 390 | (map { |
479 | (map { |
| 391 | ( |
480 | ( |
| 392 | "(", |
481 | "(", |
| … | |
… | |
| 405 | print $convert $png; |
494 | print $convert $png; |
| 406 | close $convert; |
495 | close $convert; |
| 407 | |
496 | |
| 408 | # pass 2, optimise, and rename |
497 | # pass 2, optimise, and rename |
| 409 | for (@todo) { |
498 | for (@todo) { |
| 410 | system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; |
499 | optipng "$_->[2]~"; |
| 411 | die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~"; |
|
|
| 412 | rename "$_->[2]~", $_->[2]; |
500 | rename "$_->[2]~", $_->[2]; |
| 413 | } |
501 | } |
| 414 | }; |
502 | }; |
| 415 | } |
503 | } |
| 416 | |
504 | |
| … | |
… | |
| 420 | |
508 | |
| 421 | if (0 > aio_load $file, $tile) { |
509 | if (0 > aio_load $file, $tile) { |
| 422 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
510 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
| 423 | } |
511 | } |
| 424 | IO::AIO::aio_unlink $file unless $CACHE; |
512 | IO::AIO::aio_unlink $file unless $CACHE; |
| 425 | commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
513 | commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T, 1, 1; |
| 426 | } |
514 | } |
| 427 | } else { |
515 | } else { |
| 428 | # use as-is (either small, use smooth) |
516 | # use as-is (either small, use smooth) |
| 429 | commit_png $stem, $face, $png, $T; |
517 | commit_png $stem, $face, $png, $T, $w / $T, $h / $T; |
| 430 | } |
518 | } |
| 431 | |
519 | |
| 432 | aio_unlink $path if $delete; |
520 | IO::AIO::aio_unlink $path if $delete; |
|
|
521 | } |
|
|
522 | } |
|
|
523 | |
|
|
524 | sub process_faceinfo { |
|
|
525 | my ($dir, $file) = @_; |
|
|
526 | my $path = "$dir/$file"; |
|
|
527 | |
|
|
528 | my $data; |
|
|
529 | if (0 > aio_load $path, $data) { |
|
|
530 | warn "ERROR: $path: $!, skipping.\n"; |
|
|
531 | return; |
|
|
532 | } |
|
|
533 | |
|
|
534 | for (split /\n/, $data) { |
|
|
535 | chomp; |
|
|
536 | my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5; |
|
|
537 | # bg not used except for text clients |
|
|
538 | |
|
|
539 | utf8::decode $glyph; |
|
|
540 | $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag |
|
|
541 | $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting |
|
|
542 | |
|
|
543 | $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet |
|
|
544 | |
|
|
545 | (my $fgi = $COLOR{$fg}) |
|
|
546 | // warn "ERROR: $path: $face specifies unknown foreground colour '$fg'.\n"; |
|
|
547 | (my $bgi = $COLOR{$bg}) |
|
|
548 | // warn "ERROR: $path: $face specifies unknown background colour '$bg'.\n"; |
|
|
549 | |
|
|
550 | my $fi = $FACEINFO{$face} ||= { }; |
|
|
551 | $fi->{visibility} = $visibility * 1; |
|
|
552 | $fi->{magicmap} = $fgi; # foreground colour becomes magicmap |
|
|
553 | |
|
|
554 | $glyph .= " " if 2 > length $glyph; # TODO kanji |
|
|
555 | die "glyph $face too long" if 2 < length $glyph; |
|
|
556 | |
|
|
557 | $fi->{glyph} = ""; |
|
|
558 | for (split //, $glyph) { |
|
|
559 | utf8::encode $_; |
|
|
560 | $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_; |
|
|
561 | } |
| 433 | } |
562 | } |
| 434 | } |
563 | } |
| 435 | |
564 | |
| 436 | sub process_arc { |
565 | sub process_arc { |
| 437 | while (my $job = $c_arc->get) { |
566 | while (my ($dir, $file) = @{ $c_arc->get }) { |
| 438 | my ($dir, $file) = @$job; |
|
|
| 439 | |
|
|
| 440 | my $arc; |
567 | my $arc; |
| 441 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
568 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
| 442 | |
569 | |
| 443 | my $arc = read_arch "$dir/$file"; |
570 | my $arc = read_arch "$dir/$file"; |
| 444 | for my $o (values %$arc) { |
571 | for my $o (values %$arc) { |
| … | |
… | |
| 446 | for (my $m = $o; $m; $m = $m->{more}) { |
573 | for (my $m = $o; $m; $m = $m->{more}) { |
| 447 | $ARC{$m->{_name}} = $m; |
574 | $ARC{$m->{_name}} = $m; |
| 448 | } |
575 | } |
| 449 | |
576 | |
| 450 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
577 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
| 451 | |
|
|
| 452 | my $visibility = delete $o->{visibility}; |
|
|
| 453 | my $magicmap = delete $o->{magicmap}; |
|
|
| 454 | my $glyph = delete $o->{glyph}; |
|
|
| 455 | |
578 | |
| 456 | # find upper left corner :/ |
579 | # find upper left corner :/ |
| 457 | # omg, this is sooo broken |
580 | # omg, this is sooo broken |
| 458 | my ($dx, $dy); |
581 | my ($dx, $dy); |
| 459 | for (my $o = $o; $o; $o = $o->{more}) { |
582 | for (my $o = $o; $o; $o = $o->{more}) { |
| … | |
… | |
| 466 | my $y = $o->{y} - $dy; |
589 | my $y = $o->{y} - $dy; |
| 467 | |
590 | |
| 468 | my $ext = $x|$y ? "+$x+$y" : ""; |
591 | my $ext = $x|$y ? "+$x+$y" : ""; |
| 469 | |
592 | |
| 470 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
593 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
| 471 | |
|
|
| 472 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
|
|
| 473 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
|
|
| 474 | $glyph = delete $o->{glyph} if exists $o->{glyph}; |
|
|
| 475 | |
594 | |
| 476 | my $anim = delete $o->{anim}; |
595 | my $anim = delete $o->{anim}; |
| 477 | |
596 | |
| 478 | if ($anim) { |
597 | if ($anim) { |
| 479 | # possibly add $ext to the animation name to avoid |
598 | # possibly add $ext to the animation name to avoid |
| … | |
… | |
| 503 | next if /^facings\s/; |
622 | next if /^facings\s/; |
| 504 | |
623 | |
| 505 | my $face = $_; |
624 | my $face = $_; |
| 506 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
625 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
| 507 | |
626 | |
| 508 | my $info = $FACEINFO{$face} ||= { }; |
627 | # handle derived faces |
|
|
628 | if ($face =~ /^([^:]+):(.*)/) { |
|
|
629 | my ($type, $base) = ($1, $2); |
|
|
630 | push @{ $FACEINFO{$base}{derive} }, [$dir, $type]; |
|
|
631 | } |
|
|
632 | |
| 509 | $info->{arc} = $o; |
633 | $FACEINFO{$face}{arc} = $o; |
| 510 | |
634 | |
| 511 | next if $face =~ /^blank.x11$|^empty.x11$/; |
635 | next if $face =~ /^blank.x11$|^empty.x11$/; |
| 512 | |
|
|
| 513 | $info->{visibility} = $visibility if defined $visibility; |
|
|
| 514 | $info->{magicmap} = $magicmap if defined $magicmap; |
|
|
| 515 | $info->{glyph} = $glyph if defined $glyph; |
|
|
| 516 | } |
636 | } |
| 517 | |
637 | |
| 518 | if (my $smooth = delete $o->{smoothface}) { |
638 | if (my $smooth = delete $o->{smoothface}) { |
| 519 | my %kv = split /\s+/, $smooth; |
639 | my %kv = split /\s+/, $smooth; |
| 520 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
640 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
| … | |
… | |
| 529 | } |
649 | } |
| 530 | } |
650 | } |
| 531 | } |
651 | } |
| 532 | |
652 | |
| 533 | sub process_trs { |
653 | sub process_trs { |
| 534 | while (my $job = $c_trs->get) { |
|
|
| 535 | my ($dir, $file) = @$job; |
654 | my ($dir, $file) = @_; |
| 536 | my $path = "$dir/$file"; |
655 | my $path = "$dir/$file"; |
| 537 | |
656 | |
| 538 | my $trs; |
657 | my $trs; |
| 539 | if (0 > aio_load $path, $trs) { |
658 | if (0 > aio_load $path, $trs) { |
| 540 | warn "$path: $!, skipping.\n"; |
659 | warn "ERROR: $path: $!, skipping.\n"; |
| 541 | next; |
660 | return; |
| 542 | } |
661 | } |
| 543 | |
662 | |
| 544 | $TRS .= $trs; |
663 | $TRS .= $trs; |
| 545 | } |
|
|
| 546 | } |
664 | } |
| 547 | |
665 | |
| 548 | my %FILECACHE; |
666 | my %FILECACHE; |
| 549 | |
667 | |
| 550 | sub load_cached($;$) { |
668 | sub load_cached($;$) { |
| 551 | unless (exists $FILECACHE{$_[0]}) { |
669 | unless (exists $FILECACHE{$_[0]}) { |
| 552 | my $data; |
670 | my $data; |
| 553 | if (0 < aio_load $_[0], $data) { |
671 | if (0 < aio_load $_[0], $data) { |
| 554 | if ($_[1]) { |
672 | if ($_[1]) { |
| 555 | $data = eval { $_[1]->($data) }; |
673 | $data = eval { $_[1]->($data) }; |
| 556 | warn "$_[0]: $@" if $@; |
674 | warn "ERROR: $_[0]: $@" if $@; |
| 557 | } |
675 | } |
| 558 | } |
676 | } |
| 559 | |
677 | |
| 560 | $FILECACHE{$_[0]} = $data; |
678 | $FILECACHE{$_[0]} = $data; |
| 561 | } |
679 | } |
| 562 | |
680 | |
| 563 | $FILECACHE{$_[0]} |
681 | $FILECACHE{$_[0]} |
| 564 | } |
682 | } |
| 565 | |
683 | |
|
|
684 | # convert an image and a palette to some indexed 2d-matrix structure |
|
|
685 | sub process_plt { |
|
|
686 | my ($base, $plt) = @_; |
|
|
687 | |
|
|
688 | my ($w, $h) = imgsize "$base.png"; |
|
|
689 | |
|
|
690 | $w * $h |
|
|
691 | or die "$base.png: unable to identify correct size\n"; |
|
|
692 | |
|
|
693 | my @plt; |
|
|
694 | my %map; |
|
|
695 | |
|
|
696 | for (split /\n/, $plt) { |
|
|
697 | next unless /\S/; |
|
|
698 | next if /^\s*#/; |
|
|
699 | |
|
|
700 | /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/ |
|
|
701 | or die "unparseable palette entry for $base.plt: $_"; |
|
|
702 | |
|
|
703 | my ($rgb, $name) = ($1, $2); |
|
|
704 | |
|
|
705 | $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/; |
|
|
706 | |
|
|
707 | $map{pack "H*", $rgb} = chr @plt; |
|
|
708 | push @plt, $name; |
|
|
709 | } |
|
|
710 | |
|
|
711 | make_file ["$base.plt", "$base.png"], "$base.tbl~", sub { |
|
|
712 | warn "building $base\n" if $VERBOSE >= 3; |
|
|
713 | |
|
|
714 | fork_exec { |
|
|
715 | open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:" |
|
|
716 | or die "$base.png: $!"; |
|
|
717 | |
|
|
718 | local $/; |
|
|
719 | $png = <$png>; |
|
|
720 | |
|
|
721 | $w * $h * 3 == length $png |
|
|
722 | or die "$base.png: failed to read enough data from file\n"; |
|
|
723 | |
|
|
724 | $png =~ s/(...)/$map{$1}/ge; |
|
|
725 | |
|
|
726 | $w * $h == length $png |
|
|
727 | or die "$base.png: failed to map all data - wrong palette?\n"; |
|
|
728 | |
|
|
729 | { |
|
|
730 | open my $fh, ">:raw", "$base.tbl~~" |
|
|
731 | or die "$base.tbl~~: $!"; |
|
|
732 | syswrite $fh, $png; |
|
|
733 | } |
|
|
734 | |
|
|
735 | rename "$base.tbl~~", "$base.tbl~"; |
|
|
736 | }; |
|
|
737 | }; |
|
|
738 | |
|
|
739 | 0 <= aio_load "$base.tbl~", my $tbl |
|
|
740 | or die "$base.tbl~: $!"; |
|
|
741 | |
|
|
742 | IO::AIO::aio_unlink "$base.tbl~" unless $CACHE; |
|
|
743 | |
|
|
744 | Compress::LZF::compress nfreeze { |
|
|
745 | w => $w, |
|
|
746 | h => $h, |
|
|
747 | plt => \@plt, |
|
|
748 | tbl => $tbl, |
|
|
749 | } |
|
|
750 | } |
|
|
751 | |
| 566 | sub process_res { |
752 | sub process_res { |
| 567 | while (my $job = $c_res->get) { |
|
|
| 568 | my ($dir, $file, $type) = @$job; |
753 | my ($dir, $file, $type) = @_; |
| 569 | |
754 | |
| 570 | my $data; |
|
|
| 571 | aio_load "$dir/$file", $data; |
755 | 0 <= aio_load "$dir/$file", my $data |
|
|
756 | or die "$dir/$file: $!"; |
| 572 | |
757 | |
| 573 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
758 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
| 574 | |
759 | |
| 575 | utf8::decode $dir; |
760 | utf8::decode $dir; |
| 576 | utf8::decode $file; |
761 | utf8::decode $file; |
| 577 | |
762 | |
| 578 | # a meta file for resources is now mandatory |
763 | # a meta file for resources is now mandatory |
| 579 | unless (exists $meta->{$file}) { |
764 | unless (exists $meta->{$file}) { |
| 580 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
765 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
| 581 | next; |
766 | return; |
| 582 | } |
767 | } |
| 583 | |
768 | |
| 584 | $meta = { |
769 | $meta = { |
| 585 | %{ $meta->{"" } || {} }, |
770 | %{ $meta->{"" } || {} }, |
| 586 | %{ $meta->{$file} || {} }, |
771 | %{ $meta->{$file} || {} }, |
| 587 | }; |
772 | }; |
| 588 | |
773 | |
| 589 | if ($meta->{license} =~ s/^#//) { |
774 | if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification |
|
|
775 | # all these are acceptable for deliantra - if not specified, agpl 3+ is the default. |
| 590 | $meta->{license} = ({ |
776 | $meta->{license} = ({ |
| 591 | "pd" => "Public Domain", |
777 | "pd" => "Public Domain", |
| 592 | "gpl" => "GNU General Public License, version 3.0 or any later", |
778 | "gpl" => "GNU General Public License, version 3.0 or any later", |
|
|
779 | "2bsd" => "2-clause BSD/MIT style license", |
|
|
780 | "3bsd" => "3-clause BSD style license", |
| 593 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
781 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
| 594 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
782 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
| 595 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
783 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
| 596 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
784 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
| 597 | })->{$meta->{license}} |
785 | })->{$meta->{license}} |
| 598 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
786 | || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found."; |
| 599 | } |
787 | } |
| 600 | |
788 | |
| 601 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
789 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
| 602 | ($meta->{author} = $1) =~ s/_/ /g; |
790 | ($meta->{author} = $1) =~ s/_/ /g; |
| 603 | } |
791 | } |
| 604 | |
792 | |
| 605 | $file =~ s/\.res$//; |
793 | $file =~ s/\.(res|ogg|wav|jpg|png)$// unless $meta->{keep_suffix}; |
| 606 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
|
|
| 607 | |
794 | |
| 608 | substr $dir, 0, 1 + length $PATH, ""; |
795 | if ($file =~ s/\.plt$//) { |
| 609 | |
796 | $data = process_plt "$dir/$file", $data; |
| 610 | if (my $filter = $meta->{cfutil_filter}) { |
797 | } elsif (my $filter = delete $meta->{cfutil_filter}) { |
| 611 | if ($filter eq "yaml2json") { |
798 | if ($filter eq "yaml2json") { |
| 612 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
799 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
| 613 | } elsif ($filter eq "json2json") { |
800 | } elsif ($filter eq "json2json") { |
| 614 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
801 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
| 615 | } elsif ($filter eq "perl2json") { |
802 | } elsif ($filter eq "perl2json") { |
| 616 | $data = eval $data; die if $@; |
803 | $data = eval $data; die if $@; |
| 617 | $data = JSON::XS::encode_json $data; |
804 | $data = JSON::XS::encode_json $data; |
| 618 | } else { |
805 | } else { |
| 619 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
806 | warn "ERROR: $dir/$file: unknown filter $filter, skipping\n"; |
| 620 | } |
807 | } |
| 621 | } |
808 | } |
| 622 | |
809 | |
| 623 | $RESOURCE{"$dir/$file"} = { |
810 | substr $dir, 0, 1 + length $PATH, ""; |
|
|
811 | |
|
|
812 | my %info = ( |
| 624 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
813 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
| 625 | data => $data, |
814 | data => $data, |
| 626 | %$meta ? (meta => $meta) : (), |
815 | %$meta ? (meta => $meta) : (), |
| 627 | }; |
816 | ); |
|
|
817 | |
|
|
818 | $RESOURCE{"$dir/$file"} = \%info; |
|
|
819 | } |
|
|
820 | |
|
|
821 | sub process_any { |
|
|
822 | while (my ($func, @args) = @{ $c_any->get }) { |
|
|
823 | $func->(@args); |
| 628 | } |
824 | } |
| 629 | } |
825 | } |
| 630 | |
826 | |
| 631 | sub find_files; |
827 | sub find_files; |
| 632 | sub find_files { |
828 | sub find_files { |
| 633 | my ($path) = @_; |
829 | my ($path) = @_; |
| 634 | |
830 | |
|
|
831 | my $grp = IO::AIO::aio_group; |
|
|
832 | |
|
|
833 | my $scandir; $scandir = sub { |
|
|
834 | my ($path) = @_; |
|
|
835 | |
| 635 | IO::AIO::aioreq_pri 4; |
836 | IO::AIO::aioreq_pri 4; |
| 636 | IO::AIO::aio_scandir $path, 4, sub { |
837 | add $grp IO::AIO::aio_scandir $path, 4, sub { |
| 637 | my ($dirs, $nondirs) = @_; |
838 | my ($dirs, $nondirs) = @_; |
| 638 | |
839 | |
| 639 | find_files "$path/$_" |
840 | $scandir->("$path/$_") |
| 640 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
841 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
| 641 | |
842 | |
| 642 | my $dir = $path; |
843 | my $dir = $path; |
| 643 | substr $dir, 0, 1 + length $PATH, ""; |
844 | substr $dir, 0, 1 + length $PATH, ""; |
| 644 | |
845 | |
| 645 | for my $file (@$nondirs) { |
846 | for my $file (@$nondirs) { |
| 646 | if ($dir =~ /^music(?:\/|$)/) { |
847 | if ($dir =~ /^music(?:\/|$)/) { |
| 647 | $c_res->put ([$path, $file, 3]) # FT_MUSIC |
848 | $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC |
| 648 | if $file =~ /\.(ogg)$/; |
849 | if $file =~ /\.(ogg)$/; |
| 649 | |
850 | |
| 650 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
851 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
| 651 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
852 | $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND |
| 652 | if $file =~ /\.(wav|ogg)$/; |
853 | if $file =~ /\.(wav|ogg)$/; |
| 653 | |
854 | |
| 654 | } elsif ($dir =~ /^res(?:\/|$)/) { |
855 | } elsif ($dir =~ /^res(?:\/|$)/) { |
| 655 | if ($file =~ /\.(jpg|png)$/) { |
856 | if ($file =~ /\.(jpg|png)$/) { |
| 656 | $c_res->put ([$path, $file, 0]) # FT_FACE |
857 | $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE |
| 657 | } elsif ($file =~ /\.(res)$/) { |
858 | } elsif ($file =~ /\.(res)$/) { |
|
|
859 | $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC |
|
|
860 | } else { |
|
|
861 | $c_any->put ([\&process_res, $path, $file, 6]); # was type undef, but now meta files are mandatory, so any mentioned file surely has a purpose |
|
|
862 | } |
|
|
863 | |
|
|
864 | } elsif ($file =~ /\.png$/) { |
|
|
865 | $PNG{$file} = $path; |
|
|
866 | |
|
|
867 | } elsif ($file =~ /\.faceinfo$/) { |
|
|
868 | $c_any->put ([\&process_faceinfo, $path, $file]); |
|
|
869 | |
|
|
870 | } elsif ($file =~ /\.trs$/) { |
|
|
871 | $c_any->put ([\&process_trs, $path, $file]); |
|
|
872 | |
|
|
873 | } elsif ($file =~ /\.arc$/) { |
| 658 | $c_res->put ([$path, $file, 6]) # FT_RSRC |
874 | $c_arc->put ([$path, $file]); |
|
|
875 | |
| 659 | } else { |
876 | } else { |
| 660 | $c_res->put ([$path, $file, undef]); |
877 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
| 661 | } |
878 | } |
| 662 | |
|
|
| 663 | } elsif ($file =~ /\.png$/) { |
|
|
| 664 | push @c_png, ["$path/$file", 0]; |
|
|
| 665 | |
|
|
| 666 | } elsif ($file =~ /\.trs$/) { |
|
|
| 667 | $c_trs->put ([$path, $file]); |
|
|
| 668 | |
|
|
| 669 | } elsif ($file =~ /\.arc$/) { |
|
|
| 670 | $c_arc->put ([$path, $file]); |
|
|
| 671 | |
|
|
| 672 | } else { |
879 | } |
| 673 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
|
|
| 674 | } |
|
|
| 675 | } |
880 | }; |
| 676 | }; |
881 | }; |
|
|
882 | |
|
|
883 | $scandir->($path); |
|
|
884 | aio_wait $grp; |
| 677 | } |
885 | } |
| 678 | |
886 | |
| 679 | sub generate_plurals { |
887 | sub generate_plurals { |
| 680 | # use Lingua::EN::Inflect (); |
888 | # use Lingua::EN::Inflect (); |
| 681 | # Lingua::EN::Inflect::classical; |
889 | # Lingua::EN::Inflect::classical; |
| … | |
… | |
| 715 | "Unless you run verbosely, all following warning\n", |
923 | "Unless you run verbosely, all following warning\n", |
| 716 | "or error messages indicate serious problems.\n", |
924 | "or error messages indicate serious problems.\n", |
| 717 | "\n"; |
925 | "\n"; |
| 718 | |
926 | |
| 719 | if (!-d "$path/treasures") { |
927 | if (!-d "$path/treasures") { |
| 720 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
928 | warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
| 721 | exit 1 unless $FORCE; |
929 | exit 1 unless $FORCE; |
| 722 | } |
930 | } |
| 723 | |
931 | |
| 724 | print "scanning files...\n" if $VERBOSE; |
932 | print "starting file scan, arc, any processing...\n" if $VERBOSE; |
|
|
933 | |
|
|
934 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
935 | my @a_any = map +(async \&process_any), 1..4; |
| 725 | |
936 | |
| 726 | find_files $path; |
937 | find_files $path; |
| 727 | |
938 | |
| 728 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
| 729 | my @a_res = map +(async \&process_res), 1..2; |
|
|
| 730 | my @a_trs = map +(async \&process_trs), 1..2; |
|
|
| 731 | |
|
|
| 732 | IO::AIO::flush; |
|
|
| 733 | |
|
|
| 734 | $c_res->shutdown; |
|
|
| 735 | $c_arc->shutdown; |
939 | $c_arc->shutdown; |
| 736 | $c_trs->shutdown; |
940 | $c_any->shutdown; |
| 737 | |
|
|
| 738 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
|
|
| 739 | |
941 | |
| 740 | $_->join for @a_arc; # need to parse all archetypes before png processing |
942 | $_->join for @a_arc; # need to parse all archetypes before png processing |
|
|
943 | print "finished arc processing...\n" if $VERBOSE; |
| 741 | |
944 | |
|
|
945 | # fill png queue |
|
|
946 | for (keys %FACEINFO) { |
|
|
947 | # we only expect source pngs to exist for non-derived |
|
|
948 | # faces, i.e. no split tiles (+x+x) and no face derivates |
|
|
949 | # (xxx:) |
|
|
950 | /^[^:]+\....$/ |
|
|
951 | or next; |
|
|
952 | |
|
|
953 | my $seen; |
|
|
954 | |
|
|
955 | if (exists $PNG{"$_.32x32.png"}) { |
|
|
956 | push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"]; |
|
|
957 | $seen = 1; |
|
|
958 | } |
|
|
959 | if (exists $PNG{"$_.64x64.png"}) { |
|
|
960 | push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"]; |
|
|
961 | $seen = 1; |
|
|
962 | } |
|
|
963 | |
|
|
964 | warn "ERROR: $_: face not found, expect problems.\n" |
|
|
965 | unless $seen; |
|
|
966 | } |
|
|
967 | |
| 742 | print "end arc, start png processing...\n" if $VERBOSE; |
968 | print "starting png processing...\n" if $VERBOSE; |
| 743 | |
969 | |
| 744 | # eight png crunchers work fine for my 4x smp machine |
970 | # eight png crunchers work fine for my 4x smp machine |
| 745 | my @a_png = map +(async \&process_png), 1..8; |
971 | my @a_png = map +(async \&process_png), 1..8; |
| 746 | |
972 | |
| 747 | $_->join for (@a_trs, @a_res, @a_png); |
973 | $_->join for @a_any; |
|
|
974 | print "finished any processing...\n" if $VERBOSE; |
|
|
975 | |
|
|
976 | $_->join for @a_png; |
|
|
977 | print "finished png processing...\n" if $VERBOSE; |
| 748 | |
978 | |
| 749 | print "scanning done, processing results...\n" if $VERBOSE; |
979 | print "scanning done, processing results...\n" if $VERBOSE; |
| 750 | { |
980 | { |
| 751 | # remove path prefix from editor_folder |
981 | # remove path prefix from editor_folder |
| 752 | $_->{editor_folder} =~ /^\x00/ |
982 | $_->{editor_folder} =~ /^\x00/ |
| … | |
… | |
| 770 | delete @s{qw(_name more name name_pl)}; |
1000 | delete @s{qw(_name more name name_pl)}; |
| 771 | %$o = ( %s, %$o ); |
1001 | %$o = ( %s, %$o ); |
| 772 | ++$progress; |
1002 | ++$progress; |
| 773 | } |
1003 | } |
| 774 | } else { |
1004 | } else { |
| 775 | warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
1005 | warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; |
| 776 | delete $ARC{$o->{_name}}; |
1006 | delete $ARC{$o->{_name}}; |
| 777 | } |
1007 | } |
| 778 | } |
1008 | } |
| 779 | } |
1009 | } |
| 780 | |
1010 | |
| … | |
… | |
| 787 | } |
1017 | } |
| 788 | |
1018 | |
| 789 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
1019 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
| 790 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
1020 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
| 791 | |
1021 | |
|
|
1022 | # fix up archetypes without names, where the archanme doesn't work at all |
|
|
1023 | for (@ARC) { |
|
|
1024 | if (!exists $_->{name} and $_->{_name} =~ /_/) { |
|
|
1025 | for ($_->{name} = $_->{_name}) { |
|
|
1026 | s/(?:_\d+)+$//; |
|
|
1027 | s/_[nesw]+$//; |
|
|
1028 | y/_/ /; |
|
|
1029 | } |
|
|
1030 | } |
|
|
1031 | } |
|
|
1032 | |
| 792 | print "generating plurals...\n" if $VERBOSE; |
1033 | #print "generating plurals...\n" if $VERBOSE; |
| 793 | generate_plurals; |
1034 | #generate_plurals; |
| 794 | |
1035 | |
| 795 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
1036 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
| 796 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
1037 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
| 797 | or die "$DATADIR/archetypes~: $!"; |
1038 | or die "$DATADIR/archetypes~: $!"; |
| 798 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
1039 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
| … | |
… | |
| 805 | print $fh $TRS; |
1046 | print $fh $TRS; |
| 806 | } |
1047 | } |
| 807 | |
1048 | |
| 808 | { |
1049 | { |
| 809 | print "processing facedata...\n" if $VERBOSE; |
1050 | print "processing facedata...\n" if $VERBOSE; |
| 810 | while (my ($k, $v) = each %FACEINFO) { |
1051 | |
|
|
1052 | for my $k (sort keys %FACEINFO) { |
|
|
1053 | my $v = $FACEINFO{$k}; |
|
|
1054 | |
| 811 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
1055 | length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n"; |
| 812 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
1056 | length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n"; |
| 813 | |
1057 | |
| 814 | make_hash $k, $v->{data32}, $v->{hash32}; |
1058 | make_hash $k, $v->{data32}, $v->{hash32}; |
| 815 | make_hash $k, $v->{data64}, $v->{hash64}; |
1059 | make_hash $k, $v->{data64}, $v->{hash64}; |
| 816 | |
1060 | |
| 817 | #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
1061 | #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
| 818 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
1062 | #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n"; |
| 819 | |
1063 | |
| 820 | my $stem = delete $v->{stem}; |
1064 | $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n"; |
| 821 | $v->{glyph} //= autoglyph $stem, $v; |
1065 | $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n"; |
|
|
1066 | $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n"; |
| 822 | |
1067 | |
| 823 | if (my $magicmap = $v->{magicmap}) { |
1068 | if (0 && $v->{w} == 1 && $v->{h} == 1) { # texture catalogs |
| 824 | $magicmap =~ y/A-Z_\-/a-z/d; |
1069 | my $id = @TC; |
| 825 | $v->{magicmap} = $COLOR{$magicmap}; |
1070 | my $n = @{ $TC[-1] }; |
| 826 | } |
1071 | my $x = $n % TC_W; |
|
|
1072 | my $y = int $n / TC_W; |
| 827 | |
1073 | |
| 828 | delete $v->{arc}; |
1074 | push @{ $TC[-1] }, [$v, $x, $y]; |
|
|
1075 | |
|
|
1076 | $v->{tc} = [$id, $x, $y]; |
|
|
1077 | |
|
|
1078 | push @TC, [] if $n == TC_W * TC_H - 1; # start new texture if full |
| 829 | } |
1079 | } |
|
|
1080 | |
|
|
1081 | delete @$v{qw(w h arc stem derive)}; # not used by the server |
|
|
1082 | } |
|
|
1083 | |
|
|
1084 | if (0) { #d# texture catalogs |
|
|
1085 | print "creating texture catalogs...\n" if $VERBOSE; |
|
|
1086 | |
|
|
1087 | for my $id (0 .. $#TC) { |
|
|
1088 | my $tc = $TC[$id]; |
|
|
1089 | |
|
|
1090 | my $cmd = "$CONVERT -depth 8 -size " . (TC_W * 64) . "x" . (TC_H * 64) . " xc:transparent"; |
|
|
1091 | my $idx = "a"; |
|
|
1092 | |
|
|
1093 | for (@$tc) { |
|
|
1094 | my $path = "$TMPDIR/tc" . $idx++; |
|
|
1095 | |
|
|
1096 | open my $fh, ">:perlio", $path |
|
|
1097 | or die "$path: $!"; |
|
|
1098 | syswrite $fh, $_->[0]{data64}; |
|
|
1099 | |
|
|
1100 | my $x = $_->[1] * 64; |
|
|
1101 | my $y = $_->[2] * 64; |
|
|
1102 | |
|
|
1103 | $cmd .= " png:\Q$path\E -geometry +$x+$y -composite"; |
|
|
1104 | } |
|
|
1105 | |
|
|
1106 | system "$cmd png:\Q$TMPDIR/tc$id\E"; |
|
|
1107 | optipng "$TMPDIR/tc$id"; |
|
|
1108 | } |
|
|
1109 | } |
| 830 | |
1110 | |
| 831 | print "processing resources...\n" if $VERBOSE; |
1111 | print "processing resources...\n" if $VERBOSE; |
| 832 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
1112 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
| 833 | while (my ($k, $v) = each %RESOURCE) { |
1113 | for my $k (sort keys %RESOURCE) { |
|
|
1114 | my $v = $RESOURCE{$k}; |
| 834 | |
1115 | |
| 835 | if ($v->{meta} && $v->{meta}{datadir}) { |
1116 | if ($v->{meta} && $v->{meta}{datadir}) { |
| 836 | delete $RESOURCE{$k}; |
1117 | delete $RESOURCE{$k}; |
| 837 | |
1118 | |
| 838 | $k =~ s/^res\/// or die "$k: datadir files must be in res/"; |
1119 | $k =~ s/^res\/// or die "$k: datadir files must be in res/"; |
| … | |
… | |
| 857 | |
1138 | |
| 858 | make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients |
1139 | make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients |
| 859 | } |
1140 | } |
| 860 | } |
1141 | } |
| 861 | |
1142 | |
|
|
1143 | printf "writing facedata...\n" if $VERBOSE; |
|
|
1144 | |
|
|
1145 | { |
|
|
1146 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
|
|
1147 | or die "$DATADIR/facedata~: $!"; |
|
|
1148 | |
|
|
1149 | print $fh "FACEDATA"; |
|
|
1150 | my $fofs = 8; |
|
|
1151 | |
|
|
1152 | my $put = sub { |
|
|
1153 | my $len = length $_[0]; |
|
|
1154 | my $ofs = $fofs; |
|
|
1155 | |
|
|
1156 | print $fh $_[0]; |
|
|
1157 | $fofs += $len; |
|
|
1158 | |
|
|
1159 | ($len, $ofs) |
|
|
1160 | }; |
|
|
1161 | |
|
|
1162 | for (values %FACEINFO) { |
|
|
1163 | ($_->{size32}, $_->{fofs32}) = $put->(delete $_->{data32}); |
|
|
1164 | ($_->{size64}, $_->{fofs64}) = $put->(delete $_->{data64}); |
|
|
1165 | } |
|
|
1166 | |
|
|
1167 | for (values %RESOURCE) { |
|
|
1168 | ($_->{size}, $_->{fofs}) = $put->(delete $_->{data}); |
|
|
1169 | } |
|
|
1170 | |
|
|
1171 | close $fh; |
|
|
1172 | } |
|
|
1173 | |
| 862 | printf "writing facedata (%d faces, %d anims, %d resources)...\n", |
1174 | printf "writing faceinfo (%d faces, %d anims, %d resources)...\n", |
| 863 | scalar keys %FACEINFO, |
1175 | scalar keys %FACEINFO, |
| 864 | scalar keys %ANIMINFO, |
1176 | scalar keys %ANIMINFO, |
| 865 | scalar keys %RESOURCE |
1177 | scalar keys %RESOURCE |
| 866 | if $VERBOSE; |
1178 | if $VERBOSE; |
| 867 | |
1179 | |
| 868 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
1180 | open my $fh, ">:perlio", "$DATADIR/faceinfo~" |
| 869 | or die "$DATADIR/facedata~: $!"; |
1181 | or die "$DATADIR/faceinfo~: $!"; |
| 870 | |
1182 | |
| 871 | print $fh nfreeze { |
1183 | print $fh nfreeze { |
| 872 | version => 2, |
1184 | version => 2, |
| 873 | faceinfo => \%FACEINFO, |
1185 | faceinfo => \%FACEINFO, |
| 874 | animinfo => \%ANIMINFO, |
1186 | animinfo => \%ANIMINFO, |
| 875 | resource => \%RESOURCE, |
1187 | resource => \%RESOURCE, |
| 876 | }; |
1188 | }; |
| 877 | |
|
|
| 878 | } |
1189 | } |
| 879 | |
1190 | |
| 880 | print "committing files...\n" if $VERBOSE; |
1191 | print "committing files...\n" if $VERBOSE; |
| 881 | |
1192 | |
| 882 | for (qw(archetypes facedata treasures), @COMMIT) { |
1193 | for (qw(archetypes faceinfo facedata treasures), @COMMIT) { |
| 883 | chmod 0644, "$DATADIR/$_~"; |
1194 | chmod 0644, "$DATADIR/$_~"; |
| 884 | rename "$DATADIR/$_~", "$DATADIR/$_" |
1195 | rename "$DATADIR/$_~", "$DATADIR/$_" |
| 885 | or die "$DATADIR/$_: $!"; |
1196 | or die "$DATADIR/$_: $!"; |
| 886 | } |
1197 | } |
| 887 | |
1198 | |
