| 1 | #!@PERL@ |
1 | #!@PERL@ |
| 2 | |
2 | |
| 3 | use strict; |
3 | # |
|
|
4 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
|
|
5 | # |
|
|
6 | # Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
|
|
7 | # |
|
|
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 |
|
|
10 | # Free Software Foundation, either version 3 of the License, or (at your |
|
|
11 | # option) any later version. |
|
|
12 | # |
|
|
13 | # This program is distributed in the hope that it will be useful, |
|
|
14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
16 | # GNU General Public License for more details. |
|
|
17 | # |
|
|
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 |
|
|
20 | # <http://www.gnu.org/licenses/>. |
|
|
21 | # |
|
|
22 | # The authors can be reached via e-mail to <support@deliantra.net> |
|
|
23 | # |
|
|
24 | |
|
|
25 | use common::sense; |
| 4 | |
26 | |
| 5 | my $prefix = "@prefix@"; |
27 | my $prefix = "@prefix@"; |
| 6 | my $exec_prefix = "@exec_prefix@"; |
28 | my $exec_prefix = "@exec_prefix@"; |
| 7 | my $datarootdir = "@datarootdir@"; |
29 | my $datarootdir = "@datarootdir@"; |
| 8 | my $DATADIR = "@datadir@/@PACKAGE@"; |
30 | my $DATADIR = "@datadir@/@PACKAGE@"; |
| … | |
… | |
| 12 | my $OPTIPNG = "@OPTIPNG@"; |
34 | my $OPTIPNG = "@OPTIPNG@"; |
| 13 | my $RSYNC = "@RSYNC@"; |
35 | my $RSYNC = "@RSYNC@"; |
| 14 | my $PNGNQ = "@PNGNQ@"; |
36 | my $PNGNQ = "@PNGNQ@"; |
| 15 | |
37 | |
| 16 | use Getopt::Long; |
38 | use Getopt::Long; |
|
|
39 | use File::Temp; |
|
|
40 | use POSIX (); |
|
|
41 | use Carp; |
|
|
42 | |
| 17 | use Coro::Event; |
43 | use Coro::EV; |
| 18 | use AnyEvent; |
44 | use AnyEvent; |
|
|
45 | use YAML::XS (); |
|
|
46 | use JSON::XS (); |
| 19 | use IO::AIO (); |
47 | use IO::AIO (); |
| 20 | use File::Temp; |
48 | use Digest::MD5 (); |
| 21 | use Crossfire; |
49 | |
| 22 | use Coro; |
50 | use Coro 5.12; |
| 23 | use Coro::AIO; |
51 | use Coro::AIO; |
| 24 | use POSIX (); |
52 | use Coro::Util; |
| 25 | use Digest::MD5; |
53 | use Coro::Channel; |
| 26 | use Carp; |
|
|
| 27 | use Coro::Storable; $Storable::canonical = 1; |
54 | use Coro::Storable; $Storable::canonical = 1; |
|
|
55 | |
|
|
56 | use Deliantra; |
| 28 | |
57 | |
| 29 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
58 | $SIG{QUIT} = sub { Carp::cluck "QUIT" }; |
| 30 | |
59 | |
| 31 | sub usage { |
60 | sub usage { |
| 32 | warn <<EOF; |
61 | warn <<EOF; |
| … | |
… | |
| 45 | my $VERBOSE = 1; |
74 | my $VERBOSE = 1; |
| 46 | my $CACHE = 0; |
75 | my $CACHE = 0; |
| 47 | my $FORCE; |
76 | my $FORCE; |
| 48 | my $TMPDIR = "/tmp/cfutil$$~"; |
77 | my $TMPDIR = "/tmp/cfutil$$~"; |
| 49 | my $TMPFILE = "aaaa0"; |
78 | my $TMPFILE = "aaaa0"; |
|
|
79 | my @COMMIT; |
| 50 | |
80 | |
| 51 | our %COLOR = ( |
81 | our %COLOR = ( |
| 52 | black => 0, |
82 | black => 0, |
| 53 | white => 1, |
83 | white => 1, |
| 54 | navy => 2, |
84 | navy => 2, |
| … | |
… | |
| 64 | tan => 12, |
94 | tan => 12, |
| 65 | ); |
95 | ); |
| 66 | |
96 | |
| 67 | END { system "rm", "-rf", $TMPDIR } |
97 | END { system "rm", "-rf", $TMPDIR } |
| 68 | |
98 | |
| 69 | Event->signal (signal => "INT", cb => sub { exit 1 }); |
99 | my $s_INT = EV::signal INT => sub { exit 1 }; |
| 70 | Event->signal (signal => "TERM", cb => sub { exit 1 }); |
100 | my $s_TERM = EV::signal TERM => sub { exit 1 }; |
|
|
101 | |
|
|
102 | our %hash; |
|
|
103 | |
|
|
104 | # here we could try to avoid collisions and reduce chksum size further |
|
|
105 | sub make_hash($\$\$;$) { |
|
|
106 | my ($id, $dataref, $hashref, $clen) = @_; |
|
|
107 | |
|
|
108 | my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; |
|
|
109 | |
|
|
110 | if (exists $hash{$hash}) { |
|
|
111 | # hash collision, but some files are simply identical |
|
|
112 | if (${$hash{$hash}[1]} ne $$dataref) { |
|
|
113 | warn "hash collision $hash{$hash}[0] vs. $id\n"; |
|
|
114 | exit 1; |
|
|
115 | } else { |
|
|
116 | print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; |
|
|
117 | } |
|
|
118 | } |
|
|
119 | $hash{$hash} = [$id, $dataref, $hashref]; |
|
|
120 | |
|
|
121 | $$hashref = $hash; |
|
|
122 | } |
| 71 | |
123 | |
| 72 | mkdir $TMPDIR, 0700 |
124 | mkdir $TMPDIR, 0700 |
| 73 | or die "$TMPDIR: $!"; |
125 | or die "$TMPDIR: $!"; |
| 74 | |
126 | |
| 75 | sub fork_sub(&) { |
127 | sub fork_sub(&) { |
| … | |
… | |
| 95 | if (!-f "$path/regions") { |
147 | if (!-f "$path/regions") { |
| 96 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
148 | warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; |
| 97 | exit 1 unless $FORCE; |
149 | exit 1 unless $FORCE; |
| 98 | } |
150 | } |
| 99 | |
151 | |
| 100 | system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" |
152 | system $RSYNC, "-av", "--chmod=u=rwX,go=rX", |
|
|
153 | "$path/.", "$DATADIR/maps/.", |
|
|
154 | "--exclude", "CVS", "--exclude", "/world-precomposed", |
|
|
155 | "--delete", "--delete-excluded" |
| 101 | and die "map installation failed.\n"; |
156 | and die "map installation failed.\n"; |
| 102 | |
157 | |
| 103 | print "maps installed successfully.\n"; |
158 | print "maps installed successfully.\n"; |
|
|
159 | } |
|
|
160 | |
|
|
161 | our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋); |
|
|
162 | |
|
|
163 | # used to create crude text glyphs for text-based clients |
|
|
164 | sub autoglyph { |
|
|
165 | my ($stem, $face) = @_; |
|
|
166 | |
|
|
167 | if ($stem =~ /^wall\/|Nimwall/) { |
|
|
168 | return $WALL_SUFFIX[hex $1] |
|
|
169 | if $stem =~ /(_[0-9A-F]).x11/; |
|
|
170 | |
|
|
171 | "█" |
|
|
172 | |
|
|
173 | } elsif ($stem =~ /^traps\//) { |
|
|
174 | "☠" |
|
|
175 | |
|
|
176 | } elsif ($stem =~ /^armour\/shield/) { |
|
|
177 | "Ø" |
|
|
178 | |
|
|
179 | } elsif ($stem =~ /^armour\//) { |
|
|
180 | "A" |
|
|
181 | |
|
|
182 | } elsif ($stem =~ /^weapon\//) { |
|
|
183 | "†" |
|
|
184 | |
|
|
185 | } elsif ($stem =~ /^readable\//) { |
|
|
186 | "✉" |
|
|
187 | |
|
|
188 | } elsif ($stem =~ /^river\//) { |
|
|
189 | "~" |
|
|
190 | |
|
|
191 | } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { |
|
|
192 | "·" |
|
|
193 | |
|
|
194 | } elsif ($stem =~ /^spells\//) { |
|
|
195 | "!" |
|
|
196 | |
|
|
197 | } elsif ($stem =~ /^exit\//) { |
|
|
198 | "⎆" |
|
|
199 | |
|
|
200 | } elsif ($stem =~ /^construct\//) { |
|
|
201 | "⌂" |
|
|
202 | |
|
|
203 | } elsif ($stem =~ /^player\//) { |
|
|
204 | "\@" |
|
|
205 | |
|
|
206 | } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) { |
|
|
207 | $1 |
|
|
208 | |
|
|
209 | } else { |
|
|
210 | substr $stem, 0, 1 |
|
|
211 | } |
| 104 | } |
212 | } |
| 105 | |
213 | |
| 106 | { |
214 | { |
| 107 | our %ANIMINFO; |
215 | our %ANIMINFO; |
| 108 | our %FACEINFO; |
216 | our %FACEINFO; |
| … | |
… | |
| 113 | our $NFILE; |
221 | our $NFILE; |
| 114 | our $PATH; |
222 | our $PATH; |
| 115 | |
223 | |
| 116 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
224 | our $QUANTIZE = "+dither -colorspace RGB -colors 256"; |
| 117 | |
225 | |
| 118 | our (@png, @trs, @arc, @res); # files we are interested in |
226 | our $c_arc = new Coro::Channel; |
|
|
227 | our $c_trs = new Coro::Channel; |
|
|
228 | our $c_res = new Coro::Channel; |
| 119 | |
229 | |
|
|
230 | our @c_png; |
|
|
231 | |
| 120 | sub commit_png($$$) { |
232 | sub commit_png($$$$) { |
| 121 | my ($name, $data, $T) = @_; |
233 | my ($stem, $name, $data, $T) = @_; |
| 122 | |
234 | |
|
|
235 | $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; |
| 123 | $FACEINFO{$name}{"data$T"} = $data; |
236 | $FACEINFO{$name}{"data$T"} = $data; |
| 124 | } |
237 | } |
| 125 | |
238 | |
| 126 | sub process_png { |
239 | sub process_png { |
| 127 | while (@png) { |
240 | while (@c_png) { |
| 128 | my ($path, $delete) = @{pop @png}; |
241 | my ($path, $delete) = @{pop @c_png}; |
| 129 | |
242 | |
| 130 | my $png; |
243 | my $png; |
| 131 | aio_lstat $path; |
244 | aio_lstat $path; |
| 132 | my ($size, $mtime) = (stat _)[7,9]; |
245 | my ($size, $mtime) = (stat _)[7,9]; |
| 133 | |
246 | |
| … | |
… | |
| 164 | if ($w % $T || $h % $T) { |
277 | if ($w % $T || $h % $T) { |
| 165 | warn "$path: weird png size ($w $h), skipping.\n"; |
278 | warn "$path: weird png size ($w $h), skipping.\n"; |
| 166 | next; |
279 | next; |
| 167 | } |
280 | } |
| 168 | |
281 | |
|
|
282 | (my $base = $stem) =~ s/^.*\///; |
|
|
283 | |
|
|
284 | my $fi = $FACEINFO{$base}; |
|
|
285 | unless ($fi) { |
|
|
286 | #warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
|
|
287 | #next; |
|
|
288 | } |
|
|
289 | |
|
|
290 | my $arc = $fi->{arc} || { }; |
|
|
291 | |
| 169 | unless ($path =~ /~$/) { |
292 | unless ($path =~ /~$/) { |
| 170 | # possibly enlarge |
293 | # possibly enlarge |
| 171 | if (0 > aio_stat "$stem.64x64.png") { |
294 | if (0 > aio_stat "$stem.64x64.png") { |
| 172 | my $other = "$stem.64x64.png~"; |
295 | my $other = "$stem.64x64.png~"; |
| 173 | |
296 | |
| 174 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
297 | if (0 > aio_lstat $other or (-M _) > (-M $path)) { |
| 175 | my $wrap = 0; # for the time being |
|
|
| 176 | fork_sub { |
298 | fork_sub { |
|
|
299 | my $CROP; |
|
|
300 | my $SRC = "png:\Q$path\E"; |
|
|
301 | |
|
|
302 | my $is_floor = $arc->{is_floor}; |
|
|
303 | my $is_wall = 0; |
|
|
304 | |
|
|
305 | my ($wall_pfx, $wall_dir, $wall_sfx); |
|
|
306 | |
|
|
307 | if ( |
|
|
308 | !$is_floor |
|
|
309 | && !$arc->{alive} |
|
|
310 | && $arc->{move_block} eq "all" |
|
|
311 | && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ |
|
|
312 | ) { |
|
|
313 | ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); |
|
|
314 | |
|
|
315 | unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { |
|
|
316 | $is_wall = 1; |
|
|
317 | } |
|
|
318 | } |
|
|
319 | |
|
|
320 | if ($is_wall || $is_floor) { |
|
|
321 | # add a 4px border and add other images around it |
|
|
322 | $CROP = "-shave 8x8 +repage"; |
|
|
323 | |
|
|
324 | $w += 8; |
|
|
325 | $h += 8; |
|
|
326 | |
|
|
327 | $SRC = "-size ${w}x${h} xc:transparent"; |
|
|
328 | $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; |
|
|
329 | |
|
|
330 | # 8 surrounding images |
|
|
331 | for ( |
|
|
332 | # x y b r0 r1 |
|
|
333 | [-1, -1, 0, 6], |
|
|
334 | [ 0, -1, 1, 10, 14], |
|
|
335 | [+1, -1, 0, 12], |
|
|
336 | |
|
|
337 | [-1, 0, 8, 5, 7], |
|
|
338 | # |
|
|
339 | [+1, 0, 2, 5, 13], |
|
|
340 | |
|
|
341 | [-1, +1, 0, 3], |
|
|
342 | [ 0, +1, 4, 10, 11], |
|
|
343 | [+1, +1, 0, 9], |
|
|
344 | ) { |
|
|
345 | my ($x, $y, $d, $r0, $r1) = @$_; |
|
|
346 | |
|
|
347 | my $tile = $is_floor ? $path |
|
|
348 | : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx |
|
|
349 | : die; |
|
|
350 | |
|
|
351 | $SRC .= sprintf " png:%s -geometry %+d%+d -composite", |
|
|
352 | "\Q$tile", |
|
|
353 | $x * ($w - 8) + 4, |
|
|
354 | $y * ($h - 8) + 4; |
|
|
355 | } |
|
|
356 | } |
|
|
357 | |
| 177 | system "convert png:\Q$path\E -depth 8 rgba:-" |
358 | system "convert -depth 8 $SRC rgba:-" |
| 178 | . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" |
359 | . "| $exec_prefix/bin/cfhq2xa $w $h 0" |
| 179 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" |
360 | . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" |
| 180 | and die "convert/hq2xa pipeline error: status $? ($!)"; |
361 | and die "convert/cfhq2xa pipeline error: status $? ($!)"; |
| 181 | system $OPTIPNG, "-i0", "-q", "$other~"; |
362 | system $OPTIPNG, "-i0", "-q", "$other~"; |
| 182 | die "$other~ has zero size, aborting." unless -s "$other~"; |
363 | die "$other~ has zero size, aborting." unless -s "$other~"; |
| 183 | rename "$other~", $other; |
364 | rename "$other~", $other; |
| 184 | }; |
365 | }; |
| 185 | } |
366 | } |
| 186 | |
367 | |
| 187 | push @png, [$other, !$CACHE]; |
368 | push @c_png, [$other, !$CACHE]; |
| 188 | } |
369 | } |
| 189 | |
370 | |
| 190 | # possibly scale down |
371 | # possibly scale down |
| 191 | if (0 > aio_stat "$stem.32x32.png") { |
372 | if (0 > aio_stat "$stem.32x32.png") { |
| 192 | my $other = "$stem.32x32.png~"; |
373 | my $other = "$stem.32x32.png~"; |
| … | |
… | |
| 195 | fork_sub { |
376 | fork_sub { |
| 196 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
377 | system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; |
| 197 | system $OPTIPNG, "-i0", "-q", "$other~"; |
378 | system $OPTIPNG, "-i0", "-q", "$other~"; |
| 198 | |
379 | |
| 199 | # reduce smoothfaces >10000 bytes |
380 | # reduce smoothfaces >10000 bytes |
|
|
381 | # obsolete, no longer required |
| 200 | if ($stem =~ /_S\./ && (-s "$other~") > 10000) { |
382 | if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { |
| 201 | my $ncolor = 256; |
383 | my $ncolor = 256; |
| 202 | while () { |
384 | while () { |
| 203 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
385 | system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; |
| 204 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
386 | system $OPTIPNG, "-i0", "-q", "$other~~"; |
| 205 | last if 10000 > -s "$other~~"; |
387 | last if 10000 > -s "$other~~"; |
| … | |
… | |
| 217 | rename "$other~", $other; |
399 | rename "$other~", $other; |
| 218 | }; |
400 | }; |
| 219 | } |
401 | } |
| 220 | |
402 | |
| 221 | #warn "scaled down $path to $other\n";#d# |
403 | #warn "scaled down $path to $other\n";#d# |
| 222 | push @png, [$other, !$CACHE]; |
404 | push @c_png, [$other, !$CACHE]; |
| 223 | } |
405 | } |
| 224 | } |
406 | } |
| 225 | |
407 | |
| 226 | (my $face = $stem) =~ s/^.*\///; |
408 | (my $face = $stem) =~ s/^.*\///; |
| 227 | |
409 | |
| … | |
… | |
| 276 | |
458 | |
| 277 | if (0 > aio_load $file, $tile) { |
459 | if (0 > aio_load $file, $tile) { |
| 278 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
460 | die "$path: unable to read tile +$x+$y, aborting.\n"; |
| 279 | } |
461 | } |
| 280 | IO::AIO::aio_unlink $file unless $CACHE; |
462 | IO::AIO::aio_unlink $file unless $CACHE; |
| 281 | commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
463 | commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T; |
| 282 | } |
464 | } |
| 283 | } else { |
465 | } else { |
| 284 | # use as-is (either small, use smooth) |
466 | # use as-is (either small, use smooth) |
| 285 | commit_png $face, $png, $T; |
467 | commit_png $stem, $face, $png, $T; |
| 286 | } |
468 | } |
| 287 | |
469 | |
| 288 | aio_unlink $path if $delete; |
470 | aio_unlink $path if $delete; |
| 289 | } |
471 | } |
| 290 | } |
472 | } |
| 291 | |
473 | |
| 292 | sub process_arc { |
474 | sub process_arc { |
| 293 | while (@arc) { |
475 | while (my $job = $c_arc->get) { |
| 294 | my ($dir, $file) = @{pop @arc}; |
476 | my ($dir, $file) = @$job; |
| 295 | |
477 | |
| 296 | my $arc; |
478 | my $arc; |
| 297 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
479 | aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ |
| 298 | |
480 | |
| 299 | my $arc = read_arch "$dir/$file"; |
481 | my $arc = read_arch "$dir/$file"; |
| … | |
… | |
| 301 | push @ARC, $o; |
483 | push @ARC, $o; |
| 302 | for (my $m = $o; $m; $m = $m->{more}) { |
484 | for (my $m = $o; $m; $m = $m->{more}) { |
| 303 | $ARC{$m->{_name}} = $m; |
485 | $ARC{$m->{_name}} = $m; |
| 304 | } |
486 | } |
| 305 | |
487 | |
| 306 | $o->{editor_folder} = $dir; |
488 | $o->{editor_folder} ||= "\x00$dir"; # horrible kludge |
| 307 | |
489 | |
| 308 | my $visibility = delete $o->{visibility}; |
490 | my $visibility = delete $o->{visibility}; |
| 309 | my $magicmap = delete $o->{magicmap}; |
491 | my $magicmap = delete $o->{magicmap}; |
|
|
492 | my $glyph = delete $o->{glyph}; |
| 310 | |
493 | |
| 311 | # find upper left corner :/ |
494 | # find upper left corner :/ |
| 312 | # omg, this is sooo broken |
495 | # omg, this is sooo broken |
| 313 | my ($dx, $dy); |
496 | my ($dx, $dy); |
| 314 | for (my $o = $o; $o; $o = $o->{more}) { |
497 | for (my $o = $o; $o; $o = $o->{more}) { |
| … | |
… | |
| 324 | |
507 | |
| 325 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
508 | $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; |
| 326 | |
509 | |
| 327 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
510 | $visibility = delete $o->{visibility} if exists $o->{visibility}; |
| 328 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
511 | $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; |
|
|
512 | $glyph = delete $o->{glyph} if exists $o->{glyph}; |
| 329 | |
513 | |
| 330 | my $anim = delete $o->{anim}; |
514 | my $anim = delete $o->{anim}; |
| 331 | |
515 | |
| 332 | if ($anim) { |
516 | if ($anim) { |
| 333 | # possibly add $ext to the animation name to avoid |
517 | # possibly add $ext to the animation name to avoid |
| … | |
… | |
| 351 | facings => $facings, |
535 | facings => $facings, |
| 352 | frames => \@frames, |
536 | frames => \@frames, |
| 353 | }; |
537 | }; |
| 354 | } |
538 | } |
| 355 | |
539 | |
| 356 | for my $face ($o->{face} || (), @{$anim || []}) { |
540 | for ($o->{face} || (), @{$anim || []}) { |
| 357 | next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; |
541 | next if /^facings\s/; |
| 358 | |
542 | |
|
|
543 | my $face = $_; |
|
|
544 | $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates |
|
|
545 | |
| 359 | my $info = $FACEINFO{$face} ||= {}; |
546 | my $info = $FACEINFO{$face} ||= { }; |
|
|
547 | $info->{arc} = $o; |
|
|
548 | |
|
|
549 | next if $face =~ /^blank.x11$|^empty.x11$/; |
| 360 | |
550 | |
| 361 | $info->{visibility} = $visibility if defined $visibility; |
551 | $info->{visibility} = $visibility if defined $visibility; |
| 362 | $info->{magicmap} = $magicmap if defined $magicmap; |
552 | $info->{magicmap} = $magicmap if defined $magicmap; |
|
|
553 | $info->{glyph} = $glyph if defined $glyph; |
| 363 | } |
554 | } |
| 364 | |
555 | |
| 365 | if (my $smooth = delete $o->{smoothface}) { |
556 | if (my $smooth = delete $o->{smoothface}) { |
| 366 | my %kv =split /\s+/, $smooth; |
557 | my %kv = split /\s+/, $smooth; |
| 367 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
558 | my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support |
| 368 | while (my ($face, $smooth) = each %kv) { |
559 | while (my ($face, $smooth) = each %kv) { |
|
|
560 | $FACEINFO{$smooth}{arc} = $o; |
|
|
561 | |
| 369 | $FACEINFO{$face}{smooth} = $smooth; |
562 | $FACEINFO{$face}{smooth} = $smooth; |
| 370 | $FACEINFO{$face}{smoothlevel} = $level; |
563 | $FACEINFO{$face}{smoothlevel} = $level; |
| 371 | } |
564 | } |
| 372 | } |
565 | } |
| 373 | } |
566 | } |
| 374 | } |
567 | } |
| 375 | } |
568 | } |
| 376 | } |
569 | } |
| 377 | |
570 | |
| 378 | sub process_trs { |
571 | sub process_trs { |
| 379 | while (@trs) { |
572 | while (my $job = $c_trs->get) { |
| 380 | my ($dir, $file) = @{pop @trs}; |
573 | my ($dir, $file) = @$job; |
| 381 | my $path = "$dir/$file"; |
574 | my $path = "$dir/$file"; |
| 382 | |
575 | |
| 383 | my $trs; |
576 | my $trs; |
| 384 | if (0 > aio_load $path, $trs) { |
577 | if (0 > aio_load $path, $trs) { |
| 385 | warn "$path: $!, skipping.\n"; |
578 | warn "$path: $!, skipping.\n"; |
| … | |
… | |
| 388 | |
581 | |
| 389 | $TRS .= $trs; |
582 | $TRS .= $trs; |
| 390 | } |
583 | } |
| 391 | } |
584 | } |
| 392 | |
585 | |
|
|
586 | my %FILECACHE; |
|
|
587 | |
|
|
588 | sub load_cached($;$) { |
|
|
589 | unless (exists $FILECACHE{$_[0]}) { |
|
|
590 | my $data; |
|
|
591 | if (0 < aio_load $_[0], $data) { |
|
|
592 | if ($_[1]) { |
|
|
593 | $data = eval { $_[1]->($data) }; |
|
|
594 | warn "$_[0]: $@" if $@; |
|
|
595 | } |
|
|
596 | } |
|
|
597 | |
|
|
598 | $FILECACHE{$_[0]} = $data; |
|
|
599 | } |
|
|
600 | |
|
|
601 | $FILECACHE{$_[0]} |
|
|
602 | } |
|
|
603 | |
| 393 | sub process_res { |
604 | sub process_res { |
| 394 | while (@res) { |
605 | while (my $job = $c_res->get) { |
| 395 | my ($dir, $file) = @{pop @res}; |
606 | my ($dir, $file, $type) = @$job; |
| 396 | |
607 | |
| 397 | my $data; |
608 | my $data; |
| 398 | aio_load "$dir/$file", $data; |
609 | aio_load "$dir/$file", $data; |
| 399 | |
610 | |
| 400 | my $copyright; |
611 | my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; |
| 401 | aio_load "$dir/copyright", $copyright; |
612 | |
|
|
613 | utf8::decode $dir; |
|
|
614 | utf8::decode $file; |
|
|
615 | |
|
|
616 | # a meta file for resources is now mandatory |
|
|
617 | unless (exists $meta->{$file}) { |
|
|
618 | warn "skipping $dir/$file\n" if $VERBOSE >= 3; |
|
|
619 | next; |
|
|
620 | } |
|
|
621 | |
|
|
622 | $meta = { |
|
|
623 | %{ $meta->{"" } || {} }, |
|
|
624 | %{ $meta->{$file} || {} }, |
|
|
625 | }; |
|
|
626 | |
|
|
627 | if ($meta->{license} =~ s/^#//) { |
|
|
628 | $meta->{license} = ({ |
|
|
629 | "pd" => "Public Domain", |
|
|
630 | "gpl" => "GNU General Public License, version 3.0 or any later", |
|
|
631 | "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", |
|
|
632 | "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", |
|
|
633 | "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", |
|
|
634 | "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", |
|
|
635 | })->{$meta->{license}} |
|
|
636 | || warn "$dir/$file: license tag '$meta->{license}' not found."; |
|
|
637 | } |
|
|
638 | |
|
|
639 | if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { |
|
|
640 | ($meta->{author} = $1) =~ s/_/ /g; |
|
|
641 | } |
| 402 | |
642 | |
| 403 | $file =~ s/\.res$//; |
643 | $file =~ s/\.res$//; |
| 404 | $file =~ /\.([^.]+)$/ |
644 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
| 405 | or next; |
|
|
| 406 | |
|
|
| 407 | my $type = $1; |
|
|
| 408 | |
645 | |
| 409 | substr $dir, 0, 1 + length $PATH, ""; |
646 | substr $dir, 0, 1 + length $PATH, ""; |
| 410 | |
647 | |
|
|
648 | if (my $filter = $meta->{cfutil_filter}) { |
|
|
649 | if ($filter eq "yaml2json") { |
|
|
650 | $data = JSON::XS::encode_json YAML::XS::Load $data; |
|
|
651 | } elsif ($filter eq "json2json") { |
|
|
652 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
|
|
653 | } elsif ($filter eq "perl2json") { |
|
|
654 | $data = eval $data; die if $@; |
|
|
655 | $data = JSON::XS::encode_json $data; |
|
|
656 | } else { |
|
|
657 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
|
|
658 | } |
|
|
659 | } |
|
|
660 | |
| 411 | $RESOURCE{"$dir/$file"} = { |
661 | $RESOURCE{"$dir/$file"} = { |
| 412 | type => $1, |
662 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
| 413 | copyright => $copyright, |
|
|
| 414 | data => $data, |
663 | data => $data, |
| 415 | chksum => Digest::MD5::md5 $data, |
664 | %$meta ? (meta => $meta) : (), |
| 416 | }; |
665 | }; |
| 417 | } |
666 | } |
| 418 | } |
667 | } |
| 419 | |
668 | |
| 420 | sub find_files; |
669 | sub find_files; |
| … | |
… | |
| 424 | IO::AIO::aioreq_pri 4; |
673 | IO::AIO::aioreq_pri 4; |
| 425 | IO::AIO::aio_scandir $path, 4, sub { |
674 | IO::AIO::aio_scandir $path, 4, sub { |
| 426 | my ($dirs, $nondirs) = @_; |
675 | my ($dirs, $nondirs) = @_; |
| 427 | |
676 | |
| 428 | find_files "$path/$_" |
677 | find_files "$path/$_" |
| 429 | for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; |
678 | for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; |
| 430 | |
679 | |
| 431 | my $dir = $path; |
680 | my $dir = $path; |
| 432 | substr $dir, 0, 1 + length $PATH, ""; |
681 | substr $dir, 0, 1 + length $PATH, ""; |
| 433 | |
682 | |
| 434 | for my $file (@$nondirs) { |
683 | for my $file (@$nondirs) { |
| 435 | if ($file =~ /\.(ogg|jpg|res)$/ || $dir =~ /^res(?:\/|$)/) { |
684 | if ($dir =~ /^music(?:\/|$)/) { |
| 436 | push @res, [$path, $file]; |
685 | $c_res->put ([$path, $file, 3]) # FT_MUSIC |
|
|
686 | if $file =~ /\.(ogg)$/; |
|
|
687 | |
|
|
688 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
|
|
689 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
|
|
690 | if $file =~ /\.(wav|ogg)$/; |
|
|
691 | |
|
|
692 | } elsif ($dir =~ /^res(?:\/|$)/) { |
|
|
693 | if ($file =~ /\.(jpg|png)$/) { |
|
|
694 | $c_res->put ([$path, $file, 0]) # FT_FACE |
|
|
695 | } elsif ($file =~ /\.(res)$/) { |
|
|
696 | $c_res->put ([$path, $file, 6]) # FT_RSRC |
|
|
697 | } else { |
|
|
698 | $c_res->put ([$path, $file, undef]); |
|
|
699 | } |
|
|
700 | |
| 437 | } elsif ($file =~ /\.png$/) { |
701 | } elsif ($file =~ /\.png$/) { |
| 438 | push @png, ["$path/$file", 0]; |
702 | push @c_png, ["$path/$file", 0]; |
|
|
703 | |
| 439 | } elsif ($file =~ /\.trs$/) { |
704 | } elsif ($file =~ /\.trs$/) { |
| 440 | push @trs, [$path, $file]; |
705 | $c_trs->put ([$path, $file]); |
|
|
706 | |
| 441 | } elsif ($file =~ /\.arc$/) { |
707 | } elsif ($file =~ /\.arc$/) { |
| 442 | push @arc, [$path, $file]; |
708 | $c_arc->put ([$path, $file]); |
|
|
709 | |
| 443 | } else { |
710 | } else { |
| 444 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
711 | warn "ignoring $path/$file\n" if $VERBOSE >= 3; |
| 445 | } |
712 | } |
| 446 | } |
713 | } |
| 447 | }; |
714 | }; |
|
|
715 | } |
|
|
716 | |
|
|
717 | sub generate_plurals { |
|
|
718 | # use Lingua::EN::Inflect (); |
|
|
719 | # Lingua::EN::Inflect::classical; |
|
|
720 | # Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy |
|
|
721 | # Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack |
|
|
722 | # |
|
|
723 | # for my $a (@ARC) { |
|
|
724 | # my $name = $a->{name} || $a->{_name}; |
|
|
725 | # |
|
|
726 | # next unless $a->{name_pl}; |
|
|
727 | # next if $a->{invisible}; |
|
|
728 | # next if $a->{is_floor}; |
|
|
729 | # next if $a->{no_pick}; |
|
|
730 | # |
|
|
731 | # my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name; |
|
|
732 | # my $pl = $test =~ /^(?:eq|p:.)$/ |
|
|
733 | # ? $name |
|
|
734 | # : Lingua::EN::Inflect::PL $name; |
|
|
735 | # |
|
|
736 | # if ($pl ne $a->{name_pl}) { |
|
|
737 | # warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n"; |
|
|
738 | # } |
|
|
739 | # } |
| 448 | } |
740 | } |
| 449 | |
741 | |
| 450 | sub inst_arch($) { |
742 | sub inst_arch($) { |
| 451 | my (undef, $path) = @_; |
743 | my (undef, $path) = @_; |
| 452 | |
744 | |
| … | |
… | |
| 465 | if (!-d "$path/treasures") { |
757 | if (!-d "$path/treasures") { |
| 466 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
758 | warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; |
| 467 | exit 1 unless $FORCE; |
759 | exit 1 unless $FORCE; |
| 468 | } |
760 | } |
| 469 | |
761 | |
|
|
762 | print "scanning files...\n" if $VERBOSE; |
|
|
763 | |
| 470 | find_files $path; |
764 | find_files $path; |
|
|
765 | |
|
|
766 | my @a_arc = map +(async \&process_arc), 1..2; |
|
|
767 | my @a_res = map +(async \&process_res), 1..2; |
|
|
768 | my @a_trs = map +(async \&process_trs), 1..2; |
|
|
769 | |
| 471 | IO::AIO::flush; |
770 | IO::AIO::flush; |
| 472 | |
771 | |
| 473 | $_->join for ( |
772 | $c_res->shutdown; |
|
|
773 | $c_arc->shutdown; |
|
|
774 | $c_trs->shutdown; |
|
|
775 | |
|
|
776 | print "start file scan, arc, res processing...\n" if $VERBOSE; |
|
|
777 | |
|
|
778 | $_->join for @a_arc; # need to parse all archetypes before png processing |
|
|
779 | |
|
|
780 | print "end arc, start png processing...\n" if $VERBOSE; |
|
|
781 | |
| 474 | # four png crunchers work fine for my 2x smp machine |
782 | # eight png crunchers work fine for my 4x smp machine |
| 475 | (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), |
783 | my @a_png = map +(async \&process_png), 1..8; |
| 476 | (async \&process_trs), (async \&process_trs), |
|
|
| 477 | (async \&process_arc), (async \&process_arc), |
|
|
| 478 | (async \&process_res), (async \&process_res), |
|
|
| 479 | ); |
|
|
| 480 | |
784 | |
|
|
785 | $_->join for (@a_trs, @a_res, @a_png); |
|
|
786 | |
|
|
787 | print "scanning done, processing results...\n" if $VERBOSE; |
| 481 | { |
788 | { |
| 482 | # remove path prefix from editor_folder |
789 | # remove path prefix from editor_folder |
|
|
790 | $_->{editor_folder} =~ /^\x00/ |
| 483 | substr $_->{editor_folder}, 0, 1 + length $path, "" |
791 | and substr $_->{editor_folder}, 0, 2 + length $path, "" |
| 484 | for values %ARC; |
792 | for values %ARC; |
| 485 | |
793 | |
|
|
794 | print "resolving inheritance tree...\n" if $VERBOSE; |
| 486 | # resolve inherit |
795 | # resolve inherit |
| 487 | while () { |
796 | while () { |
| 488 | my $progress; |
797 | my $progress; |
| 489 | my $loop; |
798 | my $loop; |
| 490 | |
799 | |
| 491 | for my $o (values %ARC) { |
800 | for my $o (values %ARC) { |
| 492 | if (my $other = $o->{inherit}) { |
801 | for my $other (split /,/, $o->{inherit}) { |
| 493 | if (my $s = $ARC{$other}) { |
802 | if (my $s = $ARC{$other}) { |
| 494 | if ($s->{inherit}) { |
803 | if ($s->{inherit}) { |
| 495 | $loop = $s; |
804 | $loop = $s; |
| 496 | } else { |
805 | } else { |
| 497 | delete $o->{inherit}; |
806 | delete $o->{inherit}; |
| … | |
… | |
| 516 | } |
825 | } |
| 517 | |
826 | |
| 518 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
827 | # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit |
| 519 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
828 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
| 520 | |
829 | |
|
|
830 | print "generating plurals...\n" if $VERBOSE; |
|
|
831 | generate_plurals; |
|
|
832 | |
|
|
833 | printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; |
| 521 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
834 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
| 522 | or die "$DATADIR/archetypes~: $!"; |
835 | or die "$DATADIR/archetypes~: $!"; |
| 523 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
836 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
| 524 | } |
837 | } |
| 525 | |
838 | |
| 526 | { |
839 | { |
|
|
840 | printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE; |
| 527 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
841 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
| 528 | or die "$DATADIR/treasures~: $!"; |
842 | or die "$DATADIR/treasures~: $!"; |
| 529 | print $fh $TRS; |
843 | print $fh $TRS; |
| 530 | } |
844 | } |
| 531 | |
845 | |
| 532 | { |
846 | { |
|
|
847 | print "processing facedata...\n" if $VERBOSE; |
| 533 | while (my ($k, $v) = each %FACEINFO) { |
848 | while (my ($k, $v) = each %FACEINFO) { |
| 534 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
849 | length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; |
| 535 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
850 | length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; |
| 536 | |
851 | |
|
|
852 | make_hash $k, $v->{data32}, $v->{hash32}; |
|
|
853 | make_hash $k, $v->{data64}, $v->{hash64}; |
|
|
854 | |
| 537 | length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
855 | #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; |
| 538 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
856 | #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; |
| 539 | |
|
|
| 540 | $v->{chksum32} = Digest::MD5::md5 $v->{data32}; |
|
|
| 541 | $v->{chksum64} = Digest::MD5::md5 $v->{data64}; |
|
|
| 542 | |
857 | |
| 543 | if (my $magicmap = $v->{magicmap}) { |
858 | if (my $magicmap = $v->{magicmap}) { |
| 544 | $magicmap =~ y/A-Z_\-/a-z/d; |
859 | $magicmap =~ y/A-Z_\-/a-z/d; |
| 545 | $v->{magicmap} = $COLOR{$magicmap}; |
860 | $v->{magicmap} = $COLOR{$magicmap}; |
| 546 | } |
861 | } |
|
|
862 | |
|
|
863 | my $stem = delete $v->{stem}; |
|
|
864 | $v->{glyph} //= autoglyph $stem, $v; |
|
|
865 | utf8::encode $v->{glyph}; |
|
|
866 | $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph}; |
|
|
867 | |
|
|
868 | delete $v->{arc}; |
|
|
869 | } |
|
|
870 | |
|
|
871 | print "processing resources...\n" if $VERBOSE; |
|
|
872 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
|
|
873 | while (my ($k, $v) = each %RESOURCE) { |
|
|
874 | |
|
|
875 | if ($v->{meta} && $v->{meta}{datadir}) { |
|
|
876 | delete $RESOURCE{$k}; |
|
|
877 | |
|
|
878 | $k =~ s/^res\/// or die "$k: datadir files must be in res/"; |
|
|
879 | |
|
|
880 | printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE; |
|
|
881 | open my $fh, ">:raw", "$DATADIR/$k~" |
|
|
882 | or die "$DATADIR/$k~: $!"; |
|
|
883 | syswrite $fh, $v->{data}; |
|
|
884 | push @COMMIT, $k; |
|
|
885 | |
|
|
886 | } else { |
|
|
887 | if ($v->{type} & 1) { |
|
|
888 | # prepend meta info |
|
|
889 | |
|
|
890 | my $meta = $enc->encode ({ |
|
|
891 | name => $k, |
|
|
892 | %{ $v->{meta} || {} }, |
|
|
893 | }); |
|
|
894 | |
|
|
895 | $v->{data} = pack "(w/a*)*", $meta, $v->{data}; |
|
|
896 | } |
|
|
897 | |
|
|
898 | make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients |
| 547 | } |
899 | } |
|
|
900 | } |
|
|
901 | |
|
|
902 | printf "writing facedata (%d faces, %d anims, %d resources)...\n", |
|
|
903 | scalar keys %FACEINFO, |
|
|
904 | scalar keys %ANIMINFO, |
|
|
905 | scalar keys %RESOURCE |
|
|
906 | if $VERBOSE; |
| 548 | |
907 | |
| 549 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
908 | open my $fh, ">:perlio", "$DATADIR/facedata~" |
| 550 | or die "$DATADIR/facedata~: $!"; |
909 | or die "$DATADIR/facedata~: $!"; |
| 551 | |
910 | |
| 552 | print $fh freeze { |
911 | print $fh nfreeze { |
| 553 | version => 2, |
912 | version => 2, |
| 554 | faceinfo => \%FACEINFO, |
913 | faceinfo => \%FACEINFO, |
| 555 | animinfo => \%ANIMINFO, |
914 | animinfo => \%ANIMINFO, |
| 556 | resource => \%RESOURCE, |
915 | resource => \%RESOURCE, |
| 557 | }; |
916 | }; |
| 558 | } |
|
|
| 559 | |
917 | |
|
|
918 | } |
|
|
919 | |
|
|
920 | print "committing files...\n" if $VERBOSE; |
|
|
921 | |
| 560 | for (qw(archetypes facedata treasures)) { |
922 | for (qw(archetypes facedata treasures), @COMMIT) { |
| 561 | chmod 0644, "$DATADIR/$_~"; |
923 | chmod 0644, "$DATADIR/$_~"; |
| 562 | rename "$DATADIR/$_~", "$DATADIR/$_" |
924 | rename "$DATADIR/$_~", "$DATADIR/$_" |
| 563 | or die "$DATADIR/$_: $!"; |
925 | or die "$DATADIR/$_: $!"; |
| 564 | } |
926 | } |
| 565 | |
927 | |
