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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines