ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.53 by root, Sun Aug 19 09:27:08 2007 UTC vs.
Revision 1.114 by root, Sat May 14 17:13:38 2011 UTC

1#!@PERL@ 1#!@PERL@
2 2
3use strict; 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5#
6# Copyright (©) 2007,2008,2009,2010,2011 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
25use common::sense;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
9 31
10my $CONVERT = "@CONVERT@"; 32my $CONVERT = "@CONVERT@";
11#my $IDENTIFY = "@IDENTIFY@"; 33my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
15 37
16use Getopt::Long; 38use Getopt::Long;
17use Coro::Event; 39use File::Temp;
40use POSIX ();
41use Carp;
42
43use YAML::XS ();
44use Digest::MD5 ();
45use Storable ();
46use JSON::XS ();
47use IO::AIO ();
48use Compress::LZF ();
49
18use AnyEvent; 50use AnyEvent;
19use IO::AIO (); 51use Coro 5.12;
20use File::Temp;
21use Crossfire;
22use Coro; 52use Coro::EV;
23use Coro::AIO; 53use Coro::AIO;
24use Coro::Util; 54use Coro::Util;
25use POSIX ();
26use Digest::MD5;
27use Carp;
28use Coro::Channel; 55use Coro::Channel;
56use Coro::AnyEvent;
29use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
58
59use Deliantra;
30 60
31$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
32 62
33sub usage { 63sub usage {
34 warn <<EOF; 64 warn <<EOF;
… …
47my $VERBOSE = 1; 77my $VERBOSE = 1;
48my $CACHE = 0; 78my $CACHE = 0;
49my $FORCE; 79my $FORCE;
50my $TMPDIR = "/tmp/cfutil$$~"; 80my $TMPDIR = "/tmp/cfutil$$~";
51my $TMPFILE = "aaaa0"; 81my $TMPFILE = "aaaa0";
82my @COMMIT;
52 83
53our %COLOR = ( 84our %COLOR = (
85 # original cf colours
54 black => 0, 86 black => 0,
55 white => 1, 87 white => 1,
56 navy => 2, 88 navy => 2, # "dark blue"
57 red => 3, 89 red => 3,
58 orange => 4, 90 orange => 4,
59 blue => 5, 91 blue => 5, # "light blue"
60 darkorange => 6, 92 darkorange => 6,
61 green => 7, 93 green => 7,
62 lightgreen => 8, 94 lightgreen => 8,
63 grey => 9, 95 grey => 9,
96 brown => 10, # "yellow"
97 gold => 11, # "light yellow"
98 tan => 12, # yellowish gray
99
100 # new for deliantra
64 brown => 10, 101 none => 13,
102
103 # compatibility to existing archetypes
104 lightblue => 5,
65 gold => 11, 105 gray => 9,
106 yellow => 11,
66 tan => 12, 107 khaki => 12,
67); 108);
68 109
69END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
70 111
71Event->signal (signal => "INT", cb => sub { exit 1 }); 112my $s_INT = EV::signal INT => sub { exit 1 };
72Event->signal (signal => "TERM", cb => sub { exit 1 }); 113my $s_TERM = EV::signal TERM => sub { exit 1 };
114
115our %hash;
116
117# here we could try to avoid collisions and reduce chksum size further
118sub make_hash($\$\$;$) {
119 my ($id, $dataref, $hashref, $clen) = @_;
120
121 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5;
122
123 if (exists $hash{$hash}) {
124 # hash collision, but some files are simply identical
125 if (${$hash{$hash}[1]} ne $$dataref) {
126 warn "hash collision $hash{$hash}[0] vs. $id\n";
127 exit 1;
128 } else {
129 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
130 }
131 }
132 $hash{$hash} = [$id, $dataref, $hashref];
133
134 $$hashref = $hash;
135}
136
137sub optipng($) {
138 system $OPTIPNG, "-i0", "-q", $_[0];
139 die "$_[0] has zero size, aborting." unless -s $_[0];
140}
73 141
74mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
75 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
76 144
77sub fork_sub(&) { 145sub fork_exec(&) {
78 my ($cb) = @_; 146 my ($cb) = @_;
79 147
80 if (my $pid = fork) { 148 if (my $pid = fork) {
81 my $current = $Coro::current; 149 my $current = $Coro::current;
82 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 150 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
… …
87 warn $@; 155 warn $@;
88 POSIX::_exit 1; 156 POSIX::_exit 1;
89 } 157 }
90} 158}
91 159
160sub 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
172sub 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
92sub inst_maps($) { 189sub inst_maps($) {
93 my (undef, $path) = @_; 190 my (undef, $path) = @_;
94 191
95 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 192 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
96 193
97 if (!-f "$path/regions") { 194 if (!-f "$path/regions") {
98 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 195 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
99 exit 1 unless $FORCE; 196 exit 1 unless $FORCE;
100 } 197 }
101 198
102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 199 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
200 "$path/.", "$DATADIR/maps/.",
201 "--exclude", "CVS", "--exclude", "/world-precomposed",
202 "--delete", "--delete-excluded"
103 and die "map installation failed.\n"; 203 and die "map installation failed.\n";
104 204
105 print "maps installed successfully.\n"; 205 print "maps installed successfully.\n";
106} 206}
107 207
… …
116 our $PATH; 216 our $PATH;
117 217
118 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 218 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
119 219
120 our $c_arc = new Coro::Channel; 220 our $c_arc = new Coro::Channel;
121 our $c_trs = new Coro::Channel; 221 our $c_any = new Coro::Channel;
122 our $c_res = new Coro::Channel;
123 222
124 our @c_png; 223 our @c_png;
125 224
126 sub commit_png($$$) { 225 sub commit_png($$$$) {
127 my ($name, $data, $T) = @_; 226 my ($stem, $name, $data, $T) = @_;
128 227
228 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
129 $FACEINFO{$name}{"data$T"} = $data; 229 $FACEINFO{$name}{"data$T"} = $data;
130 } 230 }
131 231
132 sub process_png { 232 sub process_png {
133 while (@c_png) { 233 while (@c_png) {
… …
170 if ($w % $T || $h % $T) { 270 if ($w % $T || $h % $T) {
171 warn "$path: weird png size ($w $h), skipping.\n"; 271 warn "$path: weird png size ($w $h), skipping.\n";
172 next; 272 next;
173 } 273 }
174 274
275 (my $base = $stem) =~ s/^.*\///;
276
277 my $fi = $FACEINFO{$base};
278 unless ($fi) {
279 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
280 #next;
281 }
282
283 my $arc = $fi->{arc} || { };
284
175 unless ($path =~ /~$/) { 285 unless ($path =~ /~$/) {
176 # possibly enlarge 286 # possibly enlarge
177 if (0 > aio_stat "$stem.64x64.png") { 287 if (0 > aio_stat "$stem.64x64.png") {
178 my $other = "$stem.64x64.png~"; 288 my $other = "$stem.64x64.png~";
179 289
180 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 290 make_file $path, $other, sub {
181 fork_sub { 291 fork_exec {
182 my $CROP; 292 my $CROP;
183 my $SRC = "png:\Q$path\E"; 293 my $SRC = "png:\Q$path\E";
184 294
185 # check if this is a wall. ultra-ugly. ultra-ultra-ugly. 295 my $is_floor = $arc->{is_floor};
296 my $is_wall = 0;
297
298 my ($wall_pfx, $wall_dir, $wall_sfx);
299
300 if (
301 !$is_floor
302 && !$arc->{alive}
303 && $arc->{move_block} eq "all"
186 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { 304 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
305 ) {
187 my ($pfx, $dir, $sfx) = ($1, hex $2, $3); 306 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
188 #check for 0..F images to be sure(?) this is a wall 307
189 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { 308 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
309 $is_wall = 1;
310 }
311 }
312
313 if ($is_wall || $is_floor) {
190 # add a 4px border and add other images around it 314 # add a 4px border and add other images around it
191 $CROP = "-shave 8x8 +repage"; 315 $CROP = "-shave 8x8 +repage";
192 316
193 $w += 8; 317 $w += 8;
194 $h += 8; 318 $h += 8;
195 319
196 $SRC = "-size ${w}x${h} xc:transparent"; 320 $SRC = "-size ${w}x${h} xc:transparent";
197 $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; 321 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
198 322
199 # 8 surrounding images 323 # 8 surrounding images
200 for ( 324 for (
201 # x y b r0 r1 325 # x y b r0 r1
202 [-1, -1, 0, 6], 326 [-1, -1, 0, 6],
203 [ 0, -1, 1, 10, 14], 327 [ 0, -1, 1, 10, 14],
204 [+1, -1, 0, 12], 328 [+1, -1, 0, 12],
205 329
206 [-1, 0, 8, 5, 7], 330 [-1, 0, 8, 5, 7],
207 # 331 #
208 [+1, 0, 2, 5, 13], 332 [+1, 0, 2, 5, 13],
209 333
210 [-1, +1, 0, 3], 334 [-1, +1, 0, 3],
211 [ 0, +1, 4, 10, 11], 335 [ 0, +1, 4, 10, 11],
212 [+1, +1, 0, 9], 336 [+1, +1, 0, 9],
213 ) { 337 ) {
214 my ($x, $y, $d, $r0, $r1) = @$_; 338 my ($x, $y, $d, $r0, $r1) = @$_;
339
340 my $tile = $is_floor ? $path
341 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
342 : die;
343
215 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", 344 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
216 "\Q$pfx", 345 "\Q$tile",
217 ($dir & $d) ? $r1 : $r0,
218 "\Q$sfx",
219 $x * ($w - 8) + 4, 346 $x * ($w - 8) + 4,
220 $y * ($h - 8) + 4; 347 $y * ($h - 8) + 4;
221 }
222 } 348 }
223 } 349 }
224 350
225 system "convert -depth 8 $SRC rgba:-" 351 system "convert -depth 8 $SRC rgba:-"
226 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 352 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
227 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" 353 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
228 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 354 and die "convert/cfhq2xa pipeline error: status $? ($!)";
229 system $OPTIPNG, "-i0", "-q", "$other~"; 355 optipng "$other~";
230 die "$other~ has zero size, aborting." unless -s "$other~";
231 rename "$other~", $other; 356 rename "$other~", $other;
232 }; 357 };
233 } 358 };
234 359
235 push @c_png, [$other, !$CACHE]; 360 push @c_png, [$other, !$CACHE];
236 } 361 }
237 362
238 # possibly scale down 363 # possibly scale down
239 if (0 > aio_stat "$stem.32x32.png") { 364 if (0 > aio_stat "$stem.32x32.png") {
240 my $other = "$stem.32x32.png~"; 365 my $other = "$stem.32x32.png~";
241 366
242 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 367 make_file $path, $other, sub {
243 fork_sub { 368 fork_exec {
244 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 369 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
245 system $OPTIPNG, "-i0", "-q", "$other~"; 370 system $OPTIPNG, "-i0", "-q", "$other~";
246 371
247 # reduce smoothfaces >10000 bytes 372 # reduce smoothfaces >10000 bytes
373 # obsolete, no longer required
248 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 374 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
249 my $ncolor = 256; 375 my $ncolor = 256;
250 while () { 376 while () {
251 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 377 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
252 system $OPTIPNG, "-i0", "-q", "$other~~"; 378 system $OPTIPNG, "-i0", "-q", "$other~~";
253 last if 10000 > -s "$other~~"; 379 last if 10000 > -s "$other~~";
… …
262 } 388 }
263 389
264 die "$other~ has zero size, aborting." unless -s "$other~"; 390 die "$other~ has zero size, aborting." unless -s "$other~";
265 rename "$other~", $other; 391 rename "$other~", $other;
266 }; 392 };
267 } 393 };
268 394
269 #warn "scaled down $path to $other\n";#d# 395 #warn "scaled down $path to $other\n";#d#
270 push @c_png, [$other, !$CACHE]; 396 push @c_png, [$other, !$CACHE];
271 } 397 }
272 } 398 }
… …
286 } 412 }
287 413
288 my $mtime = (lstat $path)[9]; 414 my $mtime = (lstat $path)[9];
289 my @todo = grep { $_->[3] <= $mtime } @tile; 415 my @todo = grep { $_->[3] <= $mtime } @tile;
290 if (@todo) { 416 if (@todo) {
291 fork_sub { 417 fork_exec {
292 open my $convert, "|-", $CONVERT, 418 open my $convert, "|-", $CONVERT,
293 "png:-", 419 "png:-",
294 (map { 420 (map {
295 ( 421 (
296 "(", 422 "(",
… …
324 450
325 if (0 > aio_load $file, $tile) { 451 if (0 > aio_load $file, $tile) {
326 die "$path: unable to read tile +$x+$y, aborting.\n"; 452 die "$path: unable to read tile +$x+$y, aborting.\n";
327 } 453 }
328 IO::AIO::aio_unlink $file unless $CACHE; 454 IO::AIO::aio_unlink $file unless $CACHE;
329 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 455 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
330 } 456 }
331 } else { 457 } else {
332 # use as-is (either small, use smooth) 458 # use as-is (either small, use smooth)
333 commit_png $face, $png, $T; 459 commit_png $stem, $face, $png, $T;
334 } 460 }
335 461
336 aio_unlink $path if $delete; 462 aio_unlink $path if $delete;
337 } 463 }
338 } 464 }
339 465
466 sub process_faceinfo {
467 my ($dir, $file) = @_;
468 my $path = "$dir/$file";
469
470 my $data;
471 if (0 > aio_load $path, $data) {
472 warn "$path: $!, skipping.\n";
473 return;
474 }
475
476 for (split /\n/, $data) {
477 chomp;
478 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5;
479 # bg not used except for text clients
480
481 utf8::decode $glyph;
482 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
483 $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting
484
485 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
486
487 (my $fgi = $COLOR{$fg})
488 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
489 (my $bgi = $COLOR{$bg})
490 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
491
492 my $fi = $FACEINFO{$face} ||= { };
493 $fi->{visibility} = $visibility * 1;
494 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
495
496 $glyph .= " " if 2 > length $glyph; # TODO kanji
497 die "glyph $face too long" if 2 < length $glyph;
498
499 $fi->{glyph} = "";
500 for (split //, $glyph) {
501 utf8::encode $_;
502 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
503 }
504 }
505 }
506
340 sub process_arc { 507 sub process_arc {
341 while (my $job = $c_arc->get) { 508 while (my ($dir, $file) = @{ $c_arc->get }) {
342 my ($dir, $file) = @$job;
343
344 my $arc; 509 my $arc;
345 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 510 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
346 511
347 my $arc = read_arch "$dir/$file"; 512 my $arc = read_arch "$dir/$file";
348 for my $o (values %$arc) { 513 for my $o (values %$arc) {
349 push @ARC, $o; 514 push @ARC, $o;
350 for (my $m = $o; $m; $m = $m->{more}) { 515 for (my $m = $o; $m; $m = $m->{more}) {
351 $ARC{$m->{_name}} = $m; 516 $ARC{$m->{_name}} = $m;
352 } 517 }
353 518
354 $o->{editor_folder} = $dir; 519 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
355
356 my $visibility = delete $o->{visibility};
357 my $magicmap = delete $o->{magicmap};
358 520
359 # find upper left corner :/ 521 # find upper left corner :/
360 # omg, this is sooo broken 522 # omg, this is sooo broken
361 my ($dx, $dy); 523 my ($dx, $dy);
362 for (my $o = $o; $o; $o = $o->{more}) { 524 for (my $o = $o; $o; $o = $o->{more}) {
… …
369 my $y = $o->{y} - $dy; 531 my $y = $o->{y} - $dy;
370 532
371 my $ext = $x|$y ? "+$x+$y" : ""; 533 my $ext = $x|$y ? "+$x+$y" : "";
372 534
373 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 535 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
374
375 $visibility = delete $o->{visibility} if exists $o->{visibility};
376 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
377 536
378 my $anim = delete $o->{anim}; 537 my $anim = delete $o->{anim};
379 538
380 if ($anim) { 539 if ($anim) {
381 # possibly add $ext to the animation name to avoid 540 # possibly add $ext to the animation name to avoid
… …
399 facings => $facings, 558 facings => $facings,
400 frames => \@frames, 559 frames => \@frames,
401 }; 560 };
402 } 561 }
403 562
404 for my $face ($o->{face} || (), @{$anim || []}) { 563 for ($o->{face} || (), @{$anim || []}) {
405 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 564 next if /^facings\s/;
406 565
566 my $face = $_;
567 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
568
407 my $info = $FACEINFO{$face} ||= {}; 569 my $info = $FACEINFO{$face} ||= { };
408
409 $info->{arc} = $o; 570 $info->{arc} = $o;
410 $info->{visibility} = $visibility if defined $visibility; 571
411 $info->{magicmap} = $magicmap if defined $magicmap; 572 next if $face =~ /^blank.x11$|^empty.x11$/;
412 } 573 }
413 574
414 if (my $smooth = delete $o->{smoothface}) { 575 if (my $smooth = delete $o->{smoothface}) {
415 my %kv =split /\s+/, $smooth; 576 my %kv = split /\s+/, $smooth;
416 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 577 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
417 while (my ($face, $smooth) = each %kv) { 578 while (my ($face, $smooth) = each %kv) {
579 $FACEINFO{$smooth}{arc} = $o;
580
418 $FACEINFO{$face}{smooth} = $smooth; 581 $FACEINFO{$face}{smooth} = $smooth;
419 $FACEINFO{$face}{smoothlevel} = $level; 582 $FACEINFO{$face}{smoothlevel} = $level;
420 } 583 }
421 } 584 }
422 } 585 }
423 } 586 }
424 } 587 }
425 } 588 }
426 589
427 sub process_trs { 590 sub process_trs {
428 while (my $job = $c_trs->get) {
429 my ($dir, $file) = @$job; 591 my ($dir, $file) = @_;
430 my $path = "$dir/$file"; 592 my $path = "$dir/$file";
431 593
432 my $trs; 594 my $trs;
433 if (0 > aio_load $path, $trs) { 595 if (0 > aio_load $path, $trs) {
434 warn "$path: $!, skipping.\n"; 596 warn "$path: $!, skipping.\n";
435 next; 597 return;
436 } 598 }
437 599
438 $TRS .= $trs; 600 $TRS .= $trs;
439 }
440 } 601 }
441 602
442 my %FILECACHE; 603 my %FILECACHE;
443 604
444 sub load_cached($;$) { 605 sub load_cached($;$) {
… …
455 } 616 }
456 617
457 $FILECACHE{$_[0]} 618 $FILECACHE{$_[0]}
458 } 619 }
459 620
621 # convert an image and a palette to some indexed 2d-matrix structure
622 sub process_plt {
623 my ($base, $plt) = @_;
624
625 my ($w, $h) = imgsize "$base.png";
626
627 $w * $h
628 or die "$base.png: unable to identify correct size\n";
629
630 my @plt;
631 my %map;
632
633 for (split /\n/, $plt) {
634 next unless /\S/;
635 next if /^\s*#/;
636
637 /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/
638 or die "unparseable palette entry for $base.plt: $_";
639
640 my ($rgb, $name) = ($1, $2);
641
642 $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/;
643
644 $map{pack "H*", $rgb} = chr @plt;
645 push @plt, $name;
646 }
647
648 make_file ["$base.plt", "$base.png"], "$base.tbl~", sub {
649 warn "building $base\n" if $VERBOSE >= 3;
650
651 fork_exec {
652 open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:"
653 or die "$base.png: $!";
654
655 local $/;
656 $png = <$png>;
657
658 $w * $h * 3 == length $png
659 or die "$base.png: failed to read enough data from file\n";
660
661 $png =~ s/(...)/$map{$1}/ge;
662
663 $w * $h == length $png
664 or die "$base.png: failed to map all data - wrong palette?\n";
665
666 {
667 open my $fh, ">:raw", "$base.tbl~~"
668 or die "$base.tbl~~: $!";
669 syswrite $fh, $png;
670 }
671
672 rename "$base.tbl~~", "$base.tbl~";
673 };
674 };
675
676 0 <= aio_load "$base.tbl~", my $tbl
677 or die "$base.tbl~: $!";
678
679 IO::AIO::aio_unlink "$base.tbl~" unless $CACHE;
680
681 Compress::LZF::compress nfreeze {
682 w => $w,
683 h => $h,
684 plt => \@plt,
685 tbl => $tbl,
686 }
687 }
688
460 sub process_res { 689 sub process_res {
461 while (my $job = $c_res->get) {
462 my ($dir, $file, $type) = @$job; 690 my ($dir, $file, $type) = @_;
463 691
464 my $data;
465 aio_load "$dir/$file", $data; 692 0 <= aio_load "$dir/$file", my $data
693 or die "$dir/$file: $!";
466 694
467 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 695 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
468 696
469 next if $meta && !exists $meta->{$file}; 697 utf8::decode $dir;
698 utf8::decode $file;
470 699
700 # a meta file for resources is now mandatory
701 unless (exists $meta->{$file}) {
702 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
703 return;
704 }
705
471 $meta = { 706 $meta = {
472 %{ $meta->{"" } || {} }, 707 %{ $meta->{"" } || {} },
473 %{ $meta->{$file} || {} }, 708 %{ $meta->{$file} || {} },
474 }; 709 };
475 710
476 if ($meta->{license} =~ s/^#//) { 711 if ($meta->{license} =~ s/^#//) {
477 $meta->{license} = ({ 712 $meta->{license} = ({
478 "pd" => "Public Domain", 713 "pd" => "Public Domain",
479 "gpl" => "GNU General Public License, version 3.0 or any later", 714 "gpl" => "GNU General Public License, version 3.0 or any later",
480 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 715 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
716 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
481 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 717 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
482 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 718 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
483 })->{$meta->{license}} 719 })->{$meta->{license}}
484 || warn "$dir/$file: license tag '$meta->{license}' not found."; 720 || warn "$dir/$file: license tag '$meta->{license}' not found.";
485 } 721 }
486 722
723 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
724 ($meta->{author} = $1) =~ s/_/ /g;
725 }
726
487 $file =~ s/\.res$//; 727 $file =~ s/\.res$//;
488 $file =~ s/\.(ogg|wav|jpg|png)$//; 728 $file =~ s/\.(ogg|wav|jpg|png)$//;
489 729
730 if ($file =~ s/\.plt$//) {
731 $data = process_plt "$dir/$file", $data;
732 } elsif (my $filter = $meta->{cfutil_filter}) {
733 if ($filter eq "yaml2json") {
734 $data = JSON::XS::encode_json YAML::XS::Load $data;
735 } elsif ($filter eq "json2json") {
736 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
737 } elsif ($filter eq "perl2json") {
738 $data = eval $data; die if $@;
739 $data = JSON::XS::encode_json $data;
740 } else {
741 warn "$dir/$file: unknown filter $filter, skipping\n";
742 }
743 }
744
490 substr $dir, 0, 1 + length $PATH, ""; 745 substr $dir, 0, 1 + length $PATH, "";
491 746
492 $RESOURCE{"$dir/$file"} = { 747 $RESOURCE{"$dir/$file"} = {
493 type => (delete $meta->{type}) || $type, 748 type => (exists $meta->{type} ? delete $meta->{type} : $type),
494 data => $data, 749 data => $data,
495 chksum => (Digest::MD5::md5 $data),
496 %$meta ? (meta => $meta) : (), 750 %$meta ? (meta => $meta) : (),
497 }; 751 };
752 }
753
754 sub process_any {
755 while (my ($func, @args) = @{ $c_any->get }) {
756 $func->(@args);
498 } 757 }
499 } 758 }
500 759
501 sub find_files; 760 sub find_files;
502 sub find_files { 761 sub find_files {
503 my ($path) = @_; 762 my ($path) = @_;
504 763
764 my $grp = IO::AIO::aio_group;
765
766 my $scandir; $scandir = sub {
767 my ($path) = @_;
768
505 IO::AIO::aioreq_pri 4; 769 IO::AIO::aioreq_pri 4;
506 IO::AIO::aio_scandir $path, 4, sub { 770 add $grp IO::AIO::aio_scandir $path, 4, sub {
507 my ($dirs, $nondirs) = @_; 771 my ($dirs, $nondirs) = @_;
508 772
509 find_files "$path/$_" 773 $scandir->("$path/$_")
510 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 774 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
511 775
512 my $dir = $path; 776 my $dir = $path;
513 substr $dir, 0, 1 + length $PATH, ""; 777 substr $dir, 0, 1 + length $PATH, "";
514 778
515 for my $file (@$nondirs) { 779 for my $file (@$nondirs) {
516 if ($dir =~ /^music(?:\/|$)/) { 780 if ($dir =~ /^music(?:\/|$)/) {
517 $c_res->put ([$path, $file, 3]) # FT_MUSIC 781 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
518 if $file =~ /\.(ogg)$/; 782 if $file =~ /\.(ogg)$/;
519 783
520 } elsif ($dir =~ /^sound(?:\/|$)/) { 784 } elsif ($dir =~ /^sound(?:\/|$)/) {
521 $c_res->put ([$path, $file, 5]) # FT_SOUND 785 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
522 if $file =~ /\.(wav|ogg)$/; 786 if $file =~ /\.(wav|ogg)$/;
523 787
524 } elsif ($dir =~ /^res(?:\/|$)/) { 788 } elsif ($dir =~ /^res(?:\/|$)/) {
525 $c_res->put ([$path, $file, 0]) # FT_FACE
526 if $file =~ /\.(jpg|png)$/; 789 if ($file =~ /\.(jpg|png)$/) {
527 $c_res->put ([$path, $file, 7]) # FT_RSRC 790 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
528 if $file =~ /\.(res)$/; 791 } elsif ($file =~ /\.(res)$/) {
792 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
793 } else {
794 $c_any->put ([\&process_res, $path, $file, undef]);
795 }
529 796
530 } elsif ($file =~ /\.png$/) { 797 } elsif ($file =~ /\.png$/) {
531 push @c_png, ["$path/$file", 0]; 798 push @c_png, ["$path/$file", 0];
532 799
800 } elsif ($file =~ /\.faceinfo$/) {
801 $c_any->put ([\&process_faceinfo, $path, $file]);
802
533 } elsif ($file =~ /\.trs$/) { 803 } elsif ($file =~ /\.trs$/) {
534 $c_trs->put ([$path, $file]); 804 $c_any->put ([\&process_trs, $path, $file]);
535 805
536 } elsif ($file =~ /\.arc$/) { 806 } elsif ($file =~ /\.arc$/) {
537 $c_arc->put ([$path, $file]); 807 $c_arc->put ([$path, $file]);
538 808
539 } else { 809 } else {
540 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 810 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
541 } 811 }
812 }
542 } 813 };
543 }; 814 };
815
816 $scandir->($path);
817 aio_wait $grp;
818 }
819
820 sub generate_plurals {
821# use Lingua::EN::Inflect ();
822# Lingua::EN::Inflect::classical;
823# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
824# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
825#
826# for my $a (@ARC) {
827# my $name = $a->{name} || $a->{_name};
828#
829# next unless $a->{name_pl};
830# next if $a->{invisible};
831# next if $a->{is_floor};
832# next if $a->{no_pick};
833#
834# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
835# my $pl = $test =~ /^(?:eq|p:.)$/
836# ? $name
837# : Lingua::EN::Inflect::PL $name;
838#
839# if ($pl ne $a->{name_pl}) {
840# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
841# }
842# }
544 } 843 }
545 844
546 sub inst_arch($) { 845 sub inst_arch($) {
547 my (undef, $path) = @_; 846 my (undef, $path) = @_;
548 847
… …
561 if (!-d "$path/treasures") { 860 if (!-d "$path/treasures") {
562 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 861 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
563 exit 1 unless $FORCE; 862 exit 1 unless $FORCE;
564 } 863 }
565 864
566 print "scanning files...\n" if $VERBOSE; 865 print "starting file scan, arc, any processing...\n" if $VERBOSE;
866
867 my @a_arc = map +(async \&process_arc), 1..2;
868 my @a_any = map +(async \&process_any), 1..4;
567 869
568 find_files $path; 870 find_files $path;
569 871
570 my @a_arc = map +(async \&process_arc), 1..2; 872 $c_arc->shutdown;
571 my @a_res = map +(async \&process_res), 1..2; 873 $c_any->shutdown;
572 my @a_trs = map +(async \&process_trs), 1..2;
573
574 IO::AIO::flush;
575
576 $c_res->put (undef) for @a_res;
577 $c_arc->put (undef) for @a_arc;
578 $c_trs->put (undef) for @a_trs;
579
580 print "start file scan, arc, res processing...\n" if $VERBOSE;
581 874
582 $_->join for @a_arc; # need to parse all archetypes before png processing 875 $_->join for @a_arc; # need to parse all archetypes before png processing
876 print "ended arc processing...\n" if $VERBOSE;
583 877
584 print "end arc, start png processing...\n" if $VERBOSE; 878 print "starting png processing...\n" if $VERBOSE;
585 879
586 # four png crunchers work fine for my 2x smp machine 880 # eight png crunchers work fine for my 4x smp machine
587 my @a_png = map +(async \&process_png), 1..4; 881 my @a_png = map +(async \&process_png), 1..8;
588 882
589 $_->join for (@a_trs, @a_res, @a_png); 883 $_->join for @a_any;
884 print "ended any processing...\n" if $VERBOSE;
885
886 $_->join for @a_png;
887 print "ended png processing...\n" if $VERBOSE;
590 888
591 print "scanning done, processing results...\n" if $VERBOSE; 889 print "scanning done, processing results...\n" if $VERBOSE;
592 { 890 {
593 # remove path prefix from editor_folder 891 # remove path prefix from editor_folder
892 $_->{editor_folder} =~ /^\x00/
594 substr $_->{editor_folder}, 0, 1 + length $path, "" 893 and substr $_->{editor_folder}, 0, 2 + length $path, ""
595 for values %ARC; 894 for values %ARC;
596 895
597 print "resolving inheritance tree...\n" if $VERBOSE; 896 print "resolving inheritance tree...\n" if $VERBOSE;
598 # resolve inherit 897 # resolve inherit
599 while () { 898 while () {
600 my $progress; 899 my $progress;
601 my $loop; 900 my $loop;
602 901
603 for my $o (values %ARC) { 902 for my $o (values %ARC) {
604 if (my $other = $o->{inherit}) { 903 for my $other (split /,/, $o->{inherit}) {
605 if (my $s = $ARC{$other}) { 904 if (my $s = $ARC{$other}) {
606 if ($s->{inherit}) { 905 if ($s->{inherit}) {
607 $loop = $s; 906 $loop = $s;
608 } else { 907 } else {
609 delete $o->{inherit}; 908 delete $o->{inherit};
… …
611 delete @s{qw(_name more name name_pl)}; 910 delete @s{qw(_name more name name_pl)};
612 %$o = ( %s, %$o ); 911 %$o = ( %s, %$o );
613 ++$progress; 912 ++$progress;
614 } 913 }
615 } else { 914 } else {
616 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 915 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
617 delete $ARC{$o->{_name}}; 916 delete $ARC{$o->{_name}};
618 } 917 }
619 } 918 }
620 } 919 }
621 920
… …
628 } 927 }
629 928
630 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 929 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
631 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 930 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
632 931
932 # fix up archetypes without names, where the archanme doesn't work at all
933 for (@ARC) {
934 if (!exists $_->{name} and $_->{_name} =~ /_/) {
935 for ($_->{name} = $_->{_name}) {
936 s/(?:_\d+)+$//;
937 s/_[nesw]+$//;
938 y/_/ /;
939 }
940 }
941 }
942
943 #print "generating plurals...\n" if $VERBOSE;
944 #generate_plurals;
945
633 print "writing archetypes...\n" if $VERBOSE; 946 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
634 open my $fh, ">:utf8", "$DATADIR/archetypes~" 947 open my $fh, ">:utf8", "$DATADIR/archetypes~"
635 or die "$DATADIR/archetypes~: $!"; 948 or die "$DATADIR/archetypes~: $!";
636 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 949 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
637 } 950 }
638 951
639 { 952 {
640 print "writing treasures...\n" if $VERBOSE; 953 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
641 open my $fh, ">:utf8", "$DATADIR/treasures~" 954 open my $fh, ">:utf8", "$DATADIR/treasures~"
642 or die "$DATADIR/treasures~: $!"; 955 or die "$DATADIR/treasures~: $!";
643 print $fh $TRS; 956 print $fh $TRS;
644 } 957 }
645 958
646 { 959 {
647 print "processing facedata...\n" if $VERBOSE; 960 print "processing facedata...\n" if $VERBOSE;
648 while (my ($k, $v) = each %FACEINFO) { 961 while (my ($k, $v) = each %FACEINFO) {
649 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 962 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
650 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 963 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
651 964
965 make_hash $k, $v->{data32}, $v->{hash32};
966 make_hash $k, $v->{data64}, $v->{hash64};
967
652 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 968 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
653 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 969 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
654 970
655 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 971 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
656 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 972 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
973 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
657 974
658 if (my $magicmap = $v->{magicmap}) { 975 delete @$v{qw(arc stem)}; # not used by the server
659 $magicmap =~ y/A-Z_\-/a-z/d; 976 }
660 $v->{magicmap} = $COLOR{$magicmap}; 977
978 print "processing resources...\n" if $VERBOSE;
979 my $enc = JSON::XS->new->utf8->canonical->relaxed;
980 while (my ($k, $v) = each %RESOURCE) {
981
982 if ($v->{meta} && $v->{meta}{datadir}) {
983 delete $RESOURCE{$k};
984
985 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
986
987 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
988 open my $fh, ">:raw", "$DATADIR/$k~"
989 or die "$DATADIR/$k~: $!";
990 syswrite $fh, $v->{data};
991 push @COMMIT, $k;
992
993 } else {
994 if ($v->{type} & 1) {
995 # prepend meta info
996
997 my $meta = $enc->encode ({
998 name => $k,
999 %{ $v->{meta} || {} },
1000 });
1001
1002 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
661 } 1003 }
662 1004
663 delete $v->{arc}; 1005 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
664 } 1006 }
1007 }
665 1008
666 print "writing facedata...\n" if $VERBOSE; 1009 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
1010 scalar keys %FACEINFO,
1011 scalar keys %ANIMINFO,
1012 scalar keys %RESOURCE
1013 if $VERBOSE;
1014
667 open my $fh, ">:perlio", "$DATADIR/facedata~" 1015 open my $fh, ">:perlio", "$DATADIR/facedata~"
668 or die "$DATADIR/facedata~: $!"; 1016 or die "$DATADIR/facedata~: $!";
669 1017
670 print $fh freeze { 1018 print $fh nfreeze {
671 version => 2, 1019 version => 2,
672 faceinfo => \%FACEINFO, 1020 faceinfo => \%FACEINFO,
673 animinfo => \%ANIMINFO, 1021 animinfo => \%ANIMINFO,
674 resource => \%RESOURCE, 1022 resource => \%RESOURCE,
675 }; 1023 };
676 } 1024 }
677 1025
678 print "committing files...\n" if $VERBOSE; 1026 print "committing files...\n" if $VERBOSE;
679 1027
680 for (qw(archetypes facedata treasures)) { 1028 for (qw(archetypes facedata treasures), @COMMIT) {
681 chmod 0644, "$DATADIR/$_~"; 1029 chmod 0644, "$DATADIR/$_~";
682 rename "$DATADIR/$_~", "$DATADIR/$_" 1030 rename "$DATADIR/$_~", "$DATADIR/$_"
683 or die "$DATADIR/$_: $!"; 1031 or die "$DATADIR/$_: $!";
684 } 1032 }
685 1033

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines