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.43 by root, Mon Jul 23 23:38:18 2007 UTC vs.
Revision 1.110 by root, Mon Feb 7 20:27:11 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 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@";
… …
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;
39use File::Temp;
40use POSIX ();
41use Carp;
42
17use Coro::Event; 43use Coro::EV;
18use AnyEvent; 44use AnyEvent;
45use YAML::XS ();
46use JSON::XS ();
19use IO::AIO (); 47use IO::AIO ();
20use File::Temp; 48use Digest::MD5 ();
21use Crossfire; 49
22use Coro; 50use Coro 5.12;
23use Coro::AIO; 51use Coro::AIO;
24use POSIX (); 52use Coro::Util;
25use Digest::MD5; 53use Coro::Channel;
26use Carp;
27use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
28 57
29$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
30 59
31sub usage { 60sub usage {
32 warn <<EOF; 61 warn <<EOF;
… …
45my $VERBOSE = 1; 74my $VERBOSE = 1;
46my $CACHE = 0; 75my $CACHE = 0;
47my $FORCE; 76my $FORCE;
48my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
49my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
50 80
51our %COLOR = ( 81our %COLOR = (
82 # original cf colours
52 black => 0, 83 black => 0,
53 white => 1, 84 white => 1,
54 navy => 2, 85 navy => 2, # "dark blue"
55 red => 3, 86 red => 3,
56 orange => 4, 87 orange => 4,
57 blue => 5, 88 blue => 5, # "light blue"
58 darkorange => 6, 89 darkorange => 6,
59 green => 7, 90 green => 7,
60 lightgreen => 8, 91 lightgreen => 8,
61 grey => 9, 92 grey => 9,
93 brown => 10, # "yellow"
94 gold => 11, # "light yellow"
95 tan => 12, # yellowish gray
96
97 # new for deliantra
62 brown => 10, 98 none => 13,
99
100 # compatibility to existing archetypes
101 lightblue => 5,
63 gold => 11, 102 gray => 9,
103 yellow => 11,
64 tan => 12, 104 khaki => 12,
65); 105);
66 106
67END { system "rm", "-rf", $TMPDIR } 107END { system "rm", "-rf", $TMPDIR }
68 108
69Event->signal (signal => "INT", cb => sub { exit 1 }); 109my $s_INT = EV::signal INT => sub { exit 1 };
70Event->signal (signal => "TERM", cb => sub { exit 1 }); 110my $s_TERM = EV::signal TERM => sub { exit 1 };
111
112our %hash;
113
114# here we could try to avoid collisions and reduce chksum size further
115sub make_hash($\$\$;$) {
116 my ($id, $dataref, $hashref, $clen) = @_;
117
118 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
119
120 if (exists $hash{$hash}) {
121 # hash collision, but some files are simply identical
122 if (${$hash{$hash}[1]} ne $$dataref) {
123 warn "hash collision $hash{$hash}[0] vs. $id\n";
124 exit 1;
125 } else {
126 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
127 }
128 }
129 $hash{$hash} = [$id, $dataref, $hashref];
130
131 $$hashref = $hash;
132}
71 133
72mkdir $TMPDIR, 0700 134mkdir $TMPDIR, 0700
73 or die "$TMPDIR: $!"; 135 or die "$TMPDIR: $!";
74 136
75sub fork_sub(&) { 137sub fork_sub(&) {
… …
95 if (!-f "$path/regions") { 157 if (!-f "$path/regions") {
96 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 158 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
97 exit 1 unless $FORCE; 159 exit 1 unless $FORCE;
98 } 160 }
99 161
100 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 162 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
163 "$path/.", "$DATADIR/maps/.",
164 "--exclude", "CVS", "--exclude", "/world-precomposed",
165 "--delete", "--delete-excluded"
101 and die "map installation failed.\n"; 166 and die "map installation failed.\n";
102 167
103 print "maps installed successfully.\n"; 168 print "maps installed successfully.\n";
104} 169}
105 170
… …
113 our $NFILE; 178 our $NFILE;
114 our $PATH; 179 our $PATH;
115 180
116 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 181 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
117 182
118 our (@png, @trs, @arc, @res); # files we are interested in 183 our $c_arc = new Coro::Channel;
184 our $c_any = new Coro::Channel;
119 185
186 our @c_png;
187
120 sub commit_png($$$) { 188 sub commit_png($$$$) {
121 my ($name, $data, $T) = @_; 189 my ($stem, $name, $data, $T) = @_;
122 190
191 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
123 $FACEINFO{$name}{"data$T"} = $data; 192 $FACEINFO{$name}{"data$T"} = $data;
124 } 193 }
125 194
126 sub process_png { 195 sub process_png {
127 while (@png) { 196 while (@c_png) {
128 my ($path, $delete) = @{pop @png}; 197 my ($path, $delete) = @{pop @c_png};
129 198
130 my $png; 199 my $png;
131 aio_lstat $path; 200 aio_lstat $path;
132 my ($size, $mtime) = (stat _)[7,9]; 201 my ($size, $mtime) = (stat _)[7,9];
133 202
… …
164 if ($w % $T || $h % $T) { 233 if ($w % $T || $h % $T) {
165 warn "$path: weird png size ($w $h), skipping.\n"; 234 warn "$path: weird png size ($w $h), skipping.\n";
166 next; 235 next;
167 } 236 }
168 237
238 (my $base = $stem) =~ s/^.*\///;
239
240 my $fi = $FACEINFO{$base};
241 unless ($fi) {
242 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
243 #next;
244 }
245
246 my $arc = $fi->{arc} || { };
247
169 unless ($path =~ /~$/) { 248 unless ($path =~ /~$/) {
170 # possibly enlarge 249 # possibly enlarge
171 if (0 > aio_stat "$stem.64x64.png") { 250 if (0 > aio_stat "$stem.64x64.png") {
172 my $other = "$stem.64x64.png~"; 251 my $other = "$stem.64x64.png~";
173 252
174 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 253 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175 my $wrap = 0; # for the time being
176 fork_sub { 254 fork_sub {
255 my $CROP;
256 my $SRC = "png:\Q$path\E";
257
258 my $is_floor = $arc->{is_floor};
259 my $is_wall = 0;
260
261 my ($wall_pfx, $wall_dir, $wall_sfx);
262
263 if (
264 !$is_floor
265 && !$arc->{alive}
266 && $arc->{move_block} eq "all"
267 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
268 ) {
269 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
270
271 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
272 $is_wall = 1;
273 }
274 }
275
276 if ($is_wall || $is_floor) {
277 # add a 4px border and add other images around it
278 $CROP = "-shave 8x8 +repage";
279
280 $w += 8;
281 $h += 8;
282
283 $SRC = "-size ${w}x${h} xc:transparent";
284 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
285
286 # 8 surrounding images
287 for (
288 # x y b r0 r1
289 [-1, -1, 0, 6],
290 [ 0, -1, 1, 10, 14],
291 [+1, -1, 0, 12],
292
293 [-1, 0, 8, 5, 7],
294 #
295 [+1, 0, 2, 5, 13],
296
297 [-1, +1, 0, 3],
298 [ 0, +1, 4, 10, 11],
299 [+1, +1, 0, 9],
300 ) {
301 my ($x, $y, $d, $r0, $r1) = @$_;
302
303 my $tile = $is_floor ? $path
304 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
305 : die;
306
307 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
308 "\Q$tile",
309 $x * ($w - 8) + 4,
310 $y * ($h - 8) + 4;
311 }
312 }
313
177 system "convert png:\Q$path\E -depth 8 rgba:-" 314 system "convert -depth 8 $SRC rgba:-"
178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 315 . "| $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~" 316 . "| 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 $? ($!)"; 317 and die "convert/cfhq2xa pipeline error: status $? ($!)";
181 system $OPTIPNG, "-i0", "-q", "$other~"; 318 system $OPTIPNG, "-i0", "-q", "$other~";
182 die "$other~ has zero size, aborting." unless -s "$other~"; 319 die "$other~ has zero size, aborting." unless -s "$other~";
183 rename "$other~", $other; 320 rename "$other~", $other;
184 }; 321 };
185 } 322 }
186 323
187 push @png, [$other, !$CACHE]; 324 push @c_png, [$other, !$CACHE];
188 } 325 }
189 326
190 # possibly scale down 327 # possibly scale down
191 if (0 > aio_stat "$stem.32x32.png") { 328 if (0 > aio_stat "$stem.32x32.png") {
192 my $other = "$stem.32x32.png~"; 329 my $other = "$stem.32x32.png~";
… …
195 fork_sub { 332 fork_sub {
196 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 333 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
197 system $OPTIPNG, "-i0", "-q", "$other~"; 334 system $OPTIPNG, "-i0", "-q", "$other~";
198 335
199 # reduce smoothfaces >10000 bytes 336 # reduce smoothfaces >10000 bytes
337 # obsolete, no longer required
200 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 338 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
201 my $ncolor = 256; 339 my $ncolor = 256;
202 while () { 340 while () {
203 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 341 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
204 system $OPTIPNG, "-i0", "-q", "$other~~"; 342 system $OPTIPNG, "-i0", "-q", "$other~~";
205 last if 10000 > -s "$other~~"; 343 last if 10000 > -s "$other~~";
… …
217 rename "$other~", $other; 355 rename "$other~", $other;
218 }; 356 };
219 } 357 }
220 358
221 #warn "scaled down $path to $other\n";#d# 359 #warn "scaled down $path to $other\n";#d#
222 push @png, [$other, !$CACHE]; 360 push @c_png, [$other, !$CACHE];
223 } 361 }
224 } 362 }
225 363
226 (my $face = $stem) =~ s/^.*\///; 364 (my $face = $stem) =~ s/^.*\///;
227 365
… …
276 414
277 if (0 > aio_load $file, $tile) { 415 if (0 > aio_load $file, $tile) {
278 die "$path: unable to read tile +$x+$y, aborting.\n"; 416 die "$path: unable to read tile +$x+$y, aborting.\n";
279 } 417 }
280 IO::AIO::aio_unlink $file unless $CACHE; 418 IO::AIO::aio_unlink $file unless $CACHE;
281 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 419 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
282 } 420 }
283 } else { 421 } else {
284 # use as-is (either small, use smooth) 422 # use as-is (either small, use smooth)
285 commit_png $face, $png, $T; 423 commit_png $stem, $face, $png, $T;
286 } 424 }
287 425
288 aio_unlink $path if $delete; 426 aio_unlink $path if $delete;
289 } 427 }
290 } 428 }
291 429
430 sub process_faceinfo {
431 my ($dir, $file) = @_;
432 my $path = "$dir/$file";
433
434 my $data;
435 if (0 > aio_load $path, $data) {
436 warn "$path: $!, skipping.\n";
437 return;
438 }
439
440 for (split /\n/, $data) {
441 chomp;
442 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5;
443 # bg not used except for text clients
444
445 utf8::decode $glyph;
446 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
447 $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting
448
449 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
450
451 (my $fgi = $COLOR{$fg})
452 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
453 (my $bgi = $COLOR{$bg})
454 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
455
456 my $fi = $FACEINFO{$face} ||= { };
457 $fi->{visibility} = $visibility * 1;
458 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
459
460 $glyph .= " " if 2 > length $glyph; # TODO kanji
461 die "glyph $face too long" if 2 < length $glyph;
462
463 $fi->{glyph} = "";
464 for (split //, $glyph) {
465 utf8::encode $_;
466 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
467 }
468 }
469 }
470
292 sub process_arc { 471 sub process_arc {
293 while (@arc) { 472 while (my ($dir, $file) = @{ $c_arc->get }) {
294 my ($dir, $file) = @{pop @arc};
295
296 my $arc; 473 my $arc;
297 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 474 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
298 475
299 my $arc = read_arch "$dir/$file"; 476 my $arc = read_arch "$dir/$file";
300 for my $o (values %$arc) { 477 for my $o (values %$arc) {
301 push @ARC, $o; 478 push @ARC, $o;
302 for (my $m = $o; $m; $m = $m->{more}) { 479 for (my $m = $o; $m; $m = $m->{more}) {
303 $ARC{$m->{_name}} = $m; 480 $ARC{$m->{_name}} = $m;
304 } 481 }
305 482
306 $o->{editor_folder} = $dir; 483 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
307
308 my $visibility = delete $o->{visibility};
309 my $magicmap = delete $o->{magicmap};
310 484
311 # find upper left corner :/ 485 # find upper left corner :/
312 # omg, this is sooo broken 486 # omg, this is sooo broken
313 my ($dx, $dy); 487 my ($dx, $dy);
314 for (my $o = $o; $o; $o = $o->{more}) { 488 for (my $o = $o; $o; $o = $o->{more}) {
… …
321 my $y = $o->{y} - $dy; 495 my $y = $o->{y} - $dy;
322 496
323 my $ext = $x|$y ? "+$x+$y" : ""; 497 my $ext = $x|$y ? "+$x+$y" : "";
324 498
325 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 499 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
326
327 $visibility = delete $o->{visibility} if exists $o->{visibility};
328 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
329 500
330 my $anim = delete $o->{anim}; 501 my $anim = delete $o->{anim};
331 502
332 if ($anim) { 503 if ($anim) {
333 # possibly add $ext to the animation name to avoid 504 # possibly add $ext to the animation name to avoid
… …
351 facings => $facings, 522 facings => $facings,
352 frames => \@frames, 523 frames => \@frames,
353 }; 524 };
354 } 525 }
355 526
356 for my $face ($o->{face} || (), @{$anim || []}) { 527 for ($o->{face} || (), @{$anim || []}) {
357 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 528 next if /^facings\s/;
358 529
530 my $face = $_;
531 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
532
359 my $info = $FACEINFO{$face} ||= {}; 533 my $info = $FACEINFO{$face} ||= { };
534 $info->{arc} = $o;
360 535
361 $info->{visibility} = $visibility if defined $visibility; 536 next if $face =~ /^blank.x11$|^empty.x11$/;
362 $info->{magicmap} = $magicmap if defined $magicmap;
363 } 537 }
364 538
365 if (my $smooth = delete $o->{smoothface}) { 539 if (my $smooth = delete $o->{smoothface}) {
366 my %kv =split /\s+/, $smooth; 540 my %kv = split /\s+/, $smooth;
367 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 541 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
368 while (my ($face, $smooth) = each %kv) { 542 while (my ($face, $smooth) = each %kv) {
543 $FACEINFO{$smooth}{arc} = $o;
544
369 $FACEINFO{$face}{smooth} = $smooth; 545 $FACEINFO{$face}{smooth} = $smooth;
370 $FACEINFO{$face}{smoothlevel} = $level; 546 $FACEINFO{$face}{smoothlevel} = $level;
371 } 547 }
372 } 548 }
373 } 549 }
374 } 550 }
375 } 551 }
376 } 552 }
377 553
378 sub process_trs { 554 sub process_trs {
379 while (@trs) {
380 my ($dir, $file) = @{pop @trs}; 555 my ($dir, $file) = @_;
381 my $path = "$dir/$file"; 556 my $path = "$dir/$file";
382 557
383 my $trs; 558 my $trs;
384 if (0 > aio_load $path, $trs) { 559 if (0 > aio_load $path, $trs) {
385 warn "$path: $!, skipping.\n"; 560 warn "$path: $!, skipping.\n";
386 next; 561 return;
387 } 562 }
388 563
389 $TRS .= $trs; 564 $TRS .= $trs;
565 }
566
567 my %FILECACHE;
568
569 sub load_cached($;$) {
570 unless (exists $FILECACHE{$_[0]}) {
571 my $data;
572 if (0 < aio_load $_[0], $data) {
573 if ($_[1]) {
574 $data = eval { $_[1]->($data) };
575 warn "$_[0]: $@" if $@;
576 }
390 } 577 }
578
579 $FILECACHE{$_[0]} = $data;
580 }
581
582 $FILECACHE{$_[0]}
391 } 583 }
392 584
393 sub process_res { 585 sub process_res {
394 while (@res) { 586 my ($dir, $file, $type) = @_;
395 my ($dir, $file) = @{pop @res};
396 587
397 my $data; 588 my $data;
398 aio_load "$dir/$file", $data; 589 aio_load "$dir/$file", $data;
399 590
400 my $copyright; 591 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
401 aio_load "$dir/copyright", $copyright;
402 592
593 utf8::decode $dir;
594 utf8::decode $file;
595
596 # a meta file for resources is now mandatory
597 unless (exists $meta->{$file}) {
598 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
599 return;
600 }
601
602 $meta = {
603 %{ $meta->{"" } || {} },
604 %{ $meta->{$file} || {} },
605 };
606
607 if ($meta->{license} =~ s/^#//) {
608 $meta->{license} = ({
609 "pd" => "Public Domain",
610 "gpl" => "GNU General Public License, version 3.0 or any later",
611 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
612 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
613 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
614 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
615 })->{$meta->{license}}
616 || warn "$dir/$file: license tag '$meta->{license}' not found.";
617 }
618
619 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
620 ($meta->{author} = $1) =~ s/_/ /g;
621 }
622
403 $file =~ s/\.res$//; 623 $file =~ s/\.res$//;
404 $file =~ /\.([^.]+)$/ 624 $file =~ s/\.(ogg|wav|jpg|png)$//;
405 or next;
406 625
407 my $type = $1;
408
409 substr $dir, 0, 1 + length $PATH, ""; 626 substr $dir, 0, 1 + length $PATH, "";
410 627
628 if (my $filter = $meta->{cfutil_filter}) {
629 if ($filter eq "yaml2json") {
630 $data = JSON::XS::encode_json YAML::XS::Load $data;
631 } elsif ($filter eq "json2json") {
632 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
633 } elsif ($filter eq "perl2json") {
634 $data = eval $data; die if $@;
635 $data = JSON::XS::encode_json $data;
636 } else {
637 warn "$dir/$file: unknown filter $filter, skipping\n";
638 }
639 }
640
411 $RESOURCE{"$dir/$file"} = { 641 $RESOURCE{"$dir/$file"} = {
412 type => $1, 642 type => (exists $meta->{type} ? delete $meta->{type} : $type),
413 copyright => $copyright,
414 data => $data, 643 data => $data,
415 chksum => Digest::MD5::md5 $data, 644 %$meta ? (meta => $meta) : (),
416 }; 645 };
646 }
647
648 sub process_any {
649 while (my ($func, @args) = @{ $c_any->get }) {
650 $func->(@args);
417 } 651 }
418 } 652 }
419 653
420 sub find_files; 654 sub find_files;
421 sub find_files { 655 sub find_files {
422 my ($path) = @_; 656 my ($path) = @_;
423 657
658 my $grp = IO::AIO::aio_group;
659
660 my $scandir; $scandir = sub {
661 my ($path) = @_;
662
424 IO::AIO::aioreq_pri 4; 663 IO::AIO::aioreq_pri 4;
425 IO::AIO::aio_scandir $path, 4, sub { 664 add $grp IO::AIO::aio_scandir $path, 4, sub {
426 my ($dirs, $nondirs) = @_; 665 my ($dirs, $nondirs) = @_;
427 666
428 find_files "$path/$_" 667 $scandir->("$path/$_")
429 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 668 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
430 669
431 my $dir = $path; 670 my $dir = $path;
432 substr $dir, 0, 1 + length $PATH, ""; 671 substr $dir, 0, 1 + length $PATH, "";
433 672
434 for my $file (@$nondirs) { 673 for my $file (@$nondirs) {
435 if ($file =~ /\.(ogg|jpg|res)$/ || $dir =~ /^res(?:\/|$)/) { 674 if ($dir =~ /^music(?:\/|$)/) {
436 push @res, [$path, $file]; 675 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
676 if $file =~ /\.(ogg)$/;
677
678 } elsif ($dir =~ /^sound(?:\/|$)/) {
679 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
680 if $file =~ /\.(wav|ogg)$/;
681
682 } elsif ($dir =~ /^res(?:\/|$)/) {
683 if ($file =~ /\.(jpg|png)$/) {
684 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
685 } elsif ($file =~ /\.(res)$/) {
686 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
687 } else {
688 $c_any->put ([\&process_res, $path, $file, undef]);
689 }
690
437 } elsif ($file =~ /\.png$/) { 691 } elsif ($file =~ /\.png$/) {
438 push @png, ["$path/$file", 0]; 692 push @c_png, ["$path/$file", 0];
693
694 } elsif ($file =~ /\.faceinfo$/) {
695 $c_any->put ([\&process_faceinfo, $path, $file]);
696
439 } elsif ($file =~ /\.trs$/) { 697 } elsif ($file =~ /\.trs$/) {
440 push @trs, [$path, $file]; 698 $c_any->put ([\&process_trs, $path, $file]);
699
441 } elsif ($file =~ /\.arc$/) { 700 } elsif ($file =~ /\.arc$/) {
442 push @arc, [$path, $file]; 701 $c_arc->put ([$path, $file]);
702
443 } else { 703 } else {
444 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 704 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
445 } 705 }
706 }
446 } 707 };
447 }; 708 };
709
710 $scandir->($path);
711 aio_wait $grp;
712 }
713
714 sub generate_plurals {
715# use Lingua::EN::Inflect ();
716# Lingua::EN::Inflect::classical;
717# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
718# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
719#
720# for my $a (@ARC) {
721# my $name = $a->{name} || $a->{_name};
722#
723# next unless $a->{name_pl};
724# next if $a->{invisible};
725# next if $a->{is_floor};
726# next if $a->{no_pick};
727#
728# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
729# my $pl = $test =~ /^(?:eq|p:.)$/
730# ? $name
731# : Lingua::EN::Inflect::PL $name;
732#
733# if ($pl ne $a->{name_pl}) {
734# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
735# }
736# }
448 } 737 }
449 738
450 sub inst_arch($) { 739 sub inst_arch($) {
451 my (undef, $path) = @_; 740 my (undef, $path) = @_;
452 741
… …
465 if (!-d "$path/treasures") { 754 if (!-d "$path/treasures") {
466 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 755 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
467 exit 1 unless $FORCE; 756 exit 1 unless $FORCE;
468 } 757 }
469 758
759 print "start file scan, arc, any processing...\n" if $VERBOSE;
760
761 my @a_arc = map +(async \&process_arc), 1..2;
762 my @a_any = map +(async \&process_any), 1..4;
763
470 find_files $path; 764 find_files $path;
471 IO::AIO::flush;
472 765
473 $_->join for ( 766 $c_arc->shutdown;
767 $c_any->shutdown;
768
769 $_->join for @a_arc; # need to parse all archetypes before png processing
770
771 print "end arc, start png processing...\n" if $VERBOSE;
772
474 # four png crunchers work fine for my 2x smp machine 773 # eight png crunchers work fine for my 4x smp machine
475 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 774 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 775
776 print "end any processing...\n" if $VERBOSE;
777 $_->join for @a_any;
778
779 print "end png processing...\n" if $VERBOSE;
780 $_->join for @a_png;
781
782 print "scanning done, processing results...\n" if $VERBOSE;
481 { 783 {
482 # remove path prefix from editor_folder 784 # remove path prefix from editor_folder
785 $_->{editor_folder} =~ /^\x00/
483 substr $_->{editor_folder}, 0, 1 + length $path, "" 786 and substr $_->{editor_folder}, 0, 2 + length $path, ""
484 for values %ARC; 787 for values %ARC;
485 788
789 print "resolving inheritance tree...\n" if $VERBOSE;
486 # resolve inherit 790 # resolve inherit
487 while () { 791 while () {
488 my $progress; 792 my $progress;
489 my $loop; 793 my $loop;
490 794
491 for my $o (values %ARC) { 795 for my $o (values %ARC) {
492 if (my $other = $o->{inherit}) { 796 for my $other (split /,/, $o->{inherit}) {
493 if (my $s = $ARC{$other}) { 797 if (my $s = $ARC{$other}) {
494 if ($s->{inherit}) { 798 if ($s->{inherit}) {
495 $loop = $s; 799 $loop = $s;
496 } else { 800 } else {
497 delete $o->{inherit}; 801 delete $o->{inherit};
… …
499 delete @s{qw(_name more name name_pl)}; 803 delete @s{qw(_name more name name_pl)};
500 %$o = ( %s, %$o ); 804 %$o = ( %s, %$o );
501 ++$progress; 805 ++$progress;
502 } 806 }
503 } else { 807 } else {
504 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 808 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
505 delete $ARC{$o->{_name}}; 809 delete $ARC{$o->{_name}};
506 } 810 }
507 } 811 }
508 } 812 }
509 813
… …
516 } 820 }
517 821
518 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 822 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
519 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 823 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
520 824
825 # fix up archetypes without names, where the archanme doesn't work at all
826 for (@ARC) {
827 if (!exists $_->{name} and $_->{_name} =~ /_/) {
828 for ($_->{name} = $_->{_name}) {
829 s/(?:_\d+)+$//;
830 s/_[nesw]+$//;
831 y/_/ /;
832 }
833 }
834 }
835
836 #print "generating plurals...\n" if $VERBOSE;
837 #generate_plurals;
838
839 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
521 open my $fh, ">:utf8", "$DATADIR/archetypes~" 840 open my $fh, ">:utf8", "$DATADIR/archetypes~"
522 or die "$DATADIR/archetypes~: $!"; 841 or die "$DATADIR/archetypes~: $!";
523 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 842 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
524 } 843 }
525 844
526 { 845 {
846 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
527 open my $fh, ">:utf8", "$DATADIR/treasures~" 847 open my $fh, ">:utf8", "$DATADIR/treasures~"
528 or die "$DATADIR/treasures~: $!"; 848 or die "$DATADIR/treasures~: $!";
529 print $fh $TRS; 849 print $fh $TRS;
530 } 850 }
531 851
532 { 852 {
853 print "processing facedata...\n" if $VERBOSE;
533 while (my ($k, $v) = each %FACEINFO) { 854 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"; 855 length $v->{data32} or warn "WARNING: face '$k' 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"; 856 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
536 857
858 make_hash $k, $v->{data32}, $v->{hash32};
859 make_hash $k, $v->{data64}, $v->{hash64};
860
537 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 861 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has 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"; 862 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
539 863
540 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 864 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
541 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 865 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
866 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
542 867
543 if (my $magicmap = $v->{magicmap}) { 868 delete @$v{qw(arc stem)}; # not used by the server
544 $magicmap =~ y/A-Z_\-/a-z/d; 869 }
545 $v->{magicmap} = $COLOR{$magicmap}; 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};
546 } 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

Diff Legend

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