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.97 by root, Wed Oct 6 01:23:11 2010 UTC vs.
Revision 1.112 by root, Fri Apr 22 02:15:45 2011 UTC

1#!@PERL@ 1#!@PERL@
2 2
3# 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG. 4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5# 5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 6# Copyright (©) 2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7# 7#
8# Deliantra is free software: you can redistribute it and/or modify it under 8# Deliantra is free software: you can redistribute it and/or modify it under
9# the terms of the Affero GNU General Public License as published by the 9# the terms of the Affero GNU General Public License as published by the
10# Free Software Foundation, either version 3 of the License, or (at your 10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version. 11# option) any later version.
28my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
29my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
30my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
31 31
32my $CONVERT = "@CONVERT@"; 32my $CONVERT = "@CONVERT@";
33#my $IDENTIFY = "@IDENTIFY@"; 33my $IDENTIFY = "@IDENTIFY@";
34my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
35my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
36my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
37 37
38use Getopt::Long; 38use Getopt::Long;
39use File::Temp; 39use File::Temp;
40use POSIX (); 40use POSIX ();
41use Carp; 41use Carp;
42 42
43use Coro::EV;
44use AnyEvent;
45use YAML::XS (); 43use YAML::XS ();
44use Digest::MD5 ();
45use Storable ();
46use JSON::XS (); 46use JSON::XS ();
47use IO::AIO (); 47use IO::AIO ();
48use Digest::MD5 (); 48use Compress::LZF ();
49 49
50use AnyEvent;
50use Coro 5.12; 51use Coro 5.12;
52use Coro::EV;
51use Coro::AIO; 53use Coro::AIO;
52use Coro::Util; 54use Coro::Util;
53use Coro::Channel; 55use Coro::Channel;
56use Coro::AnyEvent;
54use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
55 58
56use Deliantra; 59use Deliantra;
57 60
58$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
77my $TMPDIR = "/tmp/cfutil$$~"; 80my $TMPDIR = "/tmp/cfutil$$~";
78my $TMPFILE = "aaaa0"; 81my $TMPFILE = "aaaa0";
79my @COMMIT; 82my @COMMIT;
80 83
81our %COLOR = ( 84our %COLOR = (
85 # original cf colours
82 black => 0, 86 black => 0,
83 white => 1, 87 white => 1,
84 navy => 2, 88 navy => 2, # "dark blue"
85 red => 3, 89 red => 3,
86 orange => 4, 90 orange => 4,
87 blue => 5, 91 blue => 5, # "light blue"
88 darkorange => 6, 92 darkorange => 6,
89 green => 7, 93 green => 7,
90 lightgreen => 8, 94 lightgreen => 8,
91 grey => 9, 95 grey => 9,
96 brown => 10, # "yellow"
97 gold => 11, # "light yellow"
98 tan => 12, # yellowish gray
99
100 # new for deliantra
92 brown => 10, 101 none => 13,
102
103 # compatibility to existing archetypes
104 lightblue => 5,
93 gold => 11, 105 gray => 9,
106 yellow => 11,
94 tan => 12, 107 khaki => 12,
95); 108);
96 109
97END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
98 111
99my $s_INT = EV::signal INT => sub { exit 1 }; 112my $s_INT = EV::signal INT => sub { exit 1 };
122} 135}
123 136
124mkdir $TMPDIR, 0700 137mkdir $TMPDIR, 0700
125 or die "$TMPDIR: $!"; 138 or die "$TMPDIR: $!";
126 139
127sub fork_sub(&) { 140sub fork_exec(&) {
128 my ($cb) = @_; 141 my ($cb) = @_;
129 142
130 if (my $pid = fork) { 143 if (my $pid = fork) {
131 my $current = $Coro::current; 144 my $current = $Coro::current;
132 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 145 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
137 warn $@; 150 warn $@;
138 POSIX::_exit 1; 151 POSIX::_exit 1;
139 } 152 }
140} 153}
141 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
142sub inst_maps($) { 184sub inst_maps($) {
143 my (undef, $path) = @_; 185 my (undef, $path) = @_;
144 186
145 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 187 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
146 188
154 "--exclude", "CVS", "--exclude", "/world-precomposed", 196 "--exclude", "CVS", "--exclude", "/world-precomposed",
155 "--delete", "--delete-excluded" 197 "--delete", "--delete-excluded"
156 and die "map installation failed.\n"; 198 and die "map installation failed.\n";
157 199
158 print "maps installed successfully.\n"; 200 print "maps installed successfully.\n";
159}
160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163# used to create crude text glyphs for text-based clients
164sub autoglyph {
165 my ($stem, $face) = @_;
166
167 if ($stem =~ /^wall\/|Nimwall/) {
168 return $WALL_SUFFIX[hex $1]
169 if $stem =~ /(_[0-9A-F]).x11/;
170
171 "+"
172
173 } elsif ($stem =~ /^monster.*\/(.)/) {
174 $1
175
176 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
177 "."
178
179 } elsif ($stem =~ /^player\//) {
180 "\@"
181
182 } else {
183 substr $stem, 0, 1
184 }
185} 201}
186 202
187{ 203{
188 our %ANIMINFO; 204 our %ANIMINFO;
189 our %FACEINFO; 205 our %FACEINFO;
195 our $PATH; 211 our $PATH;
196 212
197 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 213 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
198 214
199 our $c_arc = new Coro::Channel; 215 our $c_arc = new Coro::Channel;
200 our $c_trs = new Coro::Channel; 216 our $c_any = new Coro::Channel;
201 our $c_res = new Coro::Channel;
202 217
203 our @c_png; 218 our @c_png;
204 219
205 sub commit_png($$$$) { 220 sub commit_png($$$$) {
206 my ($stem, $name, $data, $T) = @_; 221 my ($stem, $name, $data, $T) = @_;
265 unless ($path =~ /~$/) { 280 unless ($path =~ /~$/) {
266 # possibly enlarge 281 # possibly enlarge
267 if (0 > aio_stat "$stem.64x64.png") { 282 if (0 > aio_stat "$stem.64x64.png") {
268 my $other = "$stem.64x64.png~"; 283 my $other = "$stem.64x64.png~";
269 284
270 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 285 make_file $path, $other, sub {
271 fork_sub { 286 fork_exec {
272 my $CROP; 287 my $CROP;
273 my $SRC = "png:\Q$path\E"; 288 my $SRC = "png:\Q$path\E";
274 289
275 my $is_floor = $arc->{is_floor}; 290 my $is_floor = $arc->{is_floor};
276 my $is_wall = 0; 291 my $is_wall = 0;
334 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 349 and die "convert/cfhq2xa pipeline error: status $? ($!)";
335 system $OPTIPNG, "-i0", "-q", "$other~"; 350 system $OPTIPNG, "-i0", "-q", "$other~";
336 die "$other~ has zero size, aborting." unless -s "$other~"; 351 die "$other~ has zero size, aborting." unless -s "$other~";
337 rename "$other~", $other; 352 rename "$other~", $other;
338 }; 353 };
339 } 354 };
340 355
341 push @c_png, [$other, !$CACHE]; 356 push @c_png, [$other, !$CACHE];
342 } 357 }
343 358
344 # possibly scale down 359 # possibly scale down
345 if (0 > aio_stat "$stem.32x32.png") { 360 if (0 > aio_stat "$stem.32x32.png") {
346 my $other = "$stem.32x32.png~"; 361 my $other = "$stem.32x32.png~";
347 362
348 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 363 make_file $path, $other, sub {
349 fork_sub { 364 fork_exec {
350 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~";
351 system $OPTIPNG, "-i0", "-q", "$other~"; 366 system $OPTIPNG, "-i0", "-q", "$other~";
352 367
353 # reduce smoothfaces >10000 bytes 368 # reduce smoothfaces >10000 bytes
354 # obsolete, no longer required 369 # obsolete, no longer required
369 } 384 }
370 385
371 die "$other~ has zero size, aborting." unless -s "$other~"; 386 die "$other~ has zero size, aborting." unless -s "$other~";
372 rename "$other~", $other; 387 rename "$other~", $other;
373 }; 388 };
374 } 389 };
375 390
376 #warn "scaled down $path to $other\n";#d# 391 #warn "scaled down $path to $other\n";#d#
377 push @c_png, [$other, !$CACHE]; 392 push @c_png, [$other, !$CACHE];
378 } 393 }
379 } 394 }
393 } 408 }
394 409
395 my $mtime = (lstat $path)[9]; 410 my $mtime = (lstat $path)[9];
396 my @todo = grep { $_->[3] <= $mtime } @tile; 411 my @todo = grep { $_->[3] <= $mtime } @tile;
397 if (@todo) { 412 if (@todo) {
398 fork_sub { 413 fork_exec {
399 open my $convert, "|-", $CONVERT, 414 open my $convert, "|-", $CONVERT,
400 "png:-", 415 "png:-",
401 (map { 416 (map {
402 ( 417 (
403 "(", 418 "(",
442 457
443 aio_unlink $path if $delete; 458 aio_unlink $path if $delete;
444 } 459 }
445 } 460 }
446 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
447 sub process_arc { 503 sub process_arc {
448 while (my $job = $c_arc->get) { 504 while (my ($dir, $file) = @{ $c_arc->get }) {
449 my ($dir, $file) = @$job;
450
451 my $arc; 505 my $arc;
452 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 :/
453 507
454 my $arc = read_arch "$dir/$file"; 508 my $arc = read_arch "$dir/$file";
455 for my $o (values %$arc) { 509 for my $o (values %$arc) {
457 for (my $m = $o; $m; $m = $m->{more}) { 511 for (my $m = $o; $m; $m = $m->{more}) {
458 $ARC{$m->{_name}} = $m; 512 $ARC{$m->{_name}} = $m;
459 } 513 }
460 514
461 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 515 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
462
463 my $visibility = delete $o->{visibility};
464 my $magicmap = delete $o->{magicmap};
465 my $glyph = delete $o->{glyph};
466 516
467 # find upper left corner :/ 517 # find upper left corner :/
468 # omg, this is sooo broken 518 # omg, this is sooo broken
469 my ($dx, $dy); 519 my ($dx, $dy);
470 for (my $o = $o; $o; $o = $o->{more}) { 520 for (my $o = $o; $o; $o = $o->{more}) {
477 my $y = $o->{y} - $dy; 527 my $y = $o->{y} - $dy;
478 528
479 my $ext = $x|$y ? "+$x+$y" : ""; 529 my $ext = $x|$y ? "+$x+$y" : "";
480 530
481 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 531 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
482
483 $visibility = delete $o->{visibility} if exists $o->{visibility};
484 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
485 $glyph = delete $o->{glyph} if exists $o->{glyph};
486 532
487 my $anim = delete $o->{anim}; 533 my $anim = delete $o->{anim};
488 534
489 if ($anim) { 535 if ($anim) {
490 # possibly add $ext to the animation name to avoid 536 # possibly add $ext to the animation name to avoid
518 564
519 my $info = $FACEINFO{$face} ||= { }; 565 my $info = $FACEINFO{$face} ||= { };
520 $info->{arc} = $o; 566 $info->{arc} = $o;
521 567
522 next if $face =~ /^blank.x11$|^empty.x11$/; 568 next if $face =~ /^blank.x11$|^empty.x11$/;
523
524 $info->{visibility} = $visibility if defined $visibility;
525 $info->{magicmap} = $magicmap if defined $magicmap;
526 $info->{glyph} = $glyph if defined $glyph;
527 } 569 }
528 570
529 if (my $smooth = delete $o->{smoothface}) { 571 if (my $smooth = delete $o->{smoothface}) {
530 my %kv = split /\s+/, $smooth; 572 my %kv = split /\s+/, $smooth;
531 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 573 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
540 } 582 }
541 } 583 }
542 } 584 }
543 585
544 sub process_trs { 586 sub process_trs {
545 while (my $job = $c_trs->get) {
546 my ($dir, $file) = @$job; 587 my ($dir, $file) = @_;
547 my $path = "$dir/$file"; 588 my $path = "$dir/$file";
548 589
549 my $trs; 590 my $trs;
550 if (0 > aio_load $path, $trs) { 591 if (0 > aio_load $path, $trs) {
551 warn "$path: $!, skipping.\n"; 592 warn "$path: $!, skipping.\n";
552 next; 593 return;
553 } 594 }
554 595
555 $TRS .= $trs; 596 $TRS .= $trs;
556 }
557 } 597 }
558 598
559 my %FILECACHE; 599 my %FILECACHE;
560 600
561 sub load_cached($;$) { 601 sub load_cached($;$) {
572 } 612 }
573 613
574 $FILECACHE{$_[0]} 614 $FILECACHE{$_[0]}
575 } 615 }
576 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 next if /^\s*#/;
632
633 /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/
634 or die "unparseable palette entry for $base.plt: $_";
635
636 my ($rgb, $name) = ($1, $2);
637
638 $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/;
639
640 $map{pack "H*", $rgb} = chr @plt;
641 push @plt, $name;
642 }
643
644 make_file ["$base.plt", "$base.png"], "$base.tbl~", sub {
645 warn "building $base\n" if $VERBOSE >= 3;
646
647 fork_exec {
648 open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:"
649 or die "$base.png: $!";
650
651 local $/;
652 $png = <$png>;
653
654 $w * $h * 3 == length $png
655 or die "$base.png: failed to read enough data from file\n";
656
657 $png =~ s/(...)/$map{$1}/ge;
658
659 $w * $h == length $png
660 or die "$base.png: failed to map all data - wrong palette?\n";
661
662 {
663 open my $fh, ">:raw", "$base.tbl~~"
664 or die "$base.tbl~~: $!";
665 syswrite $fh, $png;
666 }
667
668 rename "$base.tbl~~", "$base.tbl~";
669 };
670 };
671
672 0 <= aio_load "$base.tbl~", my $tbl
673 or die "$base.tbl~: $!";
674
675 IO::AIO::aio_unlink "$base.tbl~" unless $CACHE;
676
677 Compress::LZF::compress nfreeze {
678 w => $w,
679 h => $h,
680 plt => \@plt,
681 tbl => $tbl,
682 }
683 }
684
577 sub process_res { 685 sub process_res {
578 while (my $job = $c_res->get) {
579 my ($dir, $file, $type) = @$job; 686 my ($dir, $file, $type) = @_;
580 687
581 my $data;
582 aio_load "$dir/$file", $data; 688 0 <= aio_load "$dir/$file", my $data
689 or die "$dir/$file: $!";
583 690
584 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 691 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
585 692
586 utf8::decode $dir; 693 utf8::decode $dir;
587 utf8::decode $file; 694 utf8::decode $file;
588 695
589 # a meta file for resources is now mandatory 696 # a meta file for resources is now mandatory
590 unless (exists $meta->{$file}) { 697 unless (exists $meta->{$file}) {
591 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 698 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
592 next; 699 return;
593 } 700 }
594 701
595 $meta = { 702 $meta = {
596 %{ $meta->{"" } || {} }, 703 %{ $meta->{"" } || {} },
597 %{ $meta->{$file} || {} }, 704 %{ $meta->{$file} || {} },
598 }; 705 };
599 706
600 if ($meta->{license} =~ s/^#//) { 707 if ($meta->{license} =~ s/^#//) {
601 $meta->{license} = ({ 708 $meta->{license} = ({
602 "pd" => "Public Domain", 709 "pd" => "Public Domain",
603 "gpl" => "GNU General Public License, version 3.0 or any later", 710 "gpl" => "GNU General Public License, version 3.0 or any later",
604 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 711 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
605 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", 712 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
606 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 713 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
607 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 714 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
608 })->{$meta->{license}} 715 })->{$meta->{license}}
609 || warn "$dir/$file: license tag '$meta->{license}' not found."; 716 || warn "$dir/$file: license tag '$meta->{license}' not found.";
610 } 717 }
611 718
612 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { 719 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
613 ($meta->{author} = $1) =~ s/_/ /g; 720 ($meta->{author} = $1) =~ s/_/ /g;
614 } 721 }
615 722
616 $file =~ s/\.res$//; 723 $file =~ s/\.res$//;
617 $file =~ s/\.(ogg|wav|jpg|png)$//; 724 $file =~ s/\.(ogg|wav|jpg|png)$//;
618 725
619 substr $dir, 0, 1 + length $PATH, ""; 726 if ($file =~ s/\.plt$//) {
620 727 $data = process_plt "$dir/$file", $data;
621 if (my $filter = $meta->{cfutil_filter}) { 728 } elsif (my $filter = $meta->{cfutil_filter}) {
622 if ($filter eq "yaml2json") { 729 if ($filter eq "yaml2json") {
623 $data = JSON::XS::encode_json YAML::XS::Load $data; 730 $data = JSON::XS::encode_json YAML::XS::Load $data;
624 } elsif ($filter eq "json2json") { 731 } elsif ($filter eq "json2json") {
625 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 732 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
626 } elsif ($filter eq "perl2json") { 733 } elsif ($filter eq "perl2json") {
627 $data = eval $data; die if $@; 734 $data = eval $data; die if $@;
628 $data = JSON::XS::encode_json $data; 735 $data = JSON::XS::encode_json $data;
629 } else { 736 } else {
630 warn "$dir/$file: unknown filter $filter, skipping\n"; 737 warn "$dir/$file: unknown filter $filter, skipping\n";
631 } 738 }
632 } 739 }
633 740
741 substr $dir, 0, 1 + length $PATH, "";
742
634 $RESOURCE{"$dir/$file"} = { 743 $RESOURCE{"$dir/$file"} = {
635 type => (exists $meta->{type} ? delete $meta->{type} : $type), 744 type => (exists $meta->{type} ? delete $meta->{type} : $type),
636 data => $data, 745 data => $data,
637 %$meta ? (meta => $meta) : (), 746 %$meta ? (meta => $meta) : (),
638 }; 747 };
748 }
749
750 sub process_any {
751 while (my ($func, @args) = @{ $c_any->get }) {
752 $func->(@args);
639 } 753 }
640 } 754 }
641 755
642 sub find_files; 756 sub find_files;
643 sub find_files { 757 sub find_files {
644 my ($path) = @_; 758 my ($path) = @_;
645 759
760 my $grp = IO::AIO::aio_group;
761
762 my $scandir; $scandir = sub {
763 my ($path) = @_;
764
646 IO::AIO::aioreq_pri 4; 765 IO::AIO::aioreq_pri 4;
647 IO::AIO::aio_scandir $path, 4, sub { 766 add $grp IO::AIO::aio_scandir $path, 4, sub {
648 my ($dirs, $nondirs) = @_; 767 my ($dirs, $nondirs) = @_;
649 768
650 find_files "$path/$_" 769 $scandir->("$path/$_")
651 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; 770 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
652 771
653 my $dir = $path; 772 my $dir = $path;
654 substr $dir, 0, 1 + length $PATH, ""; 773 substr $dir, 0, 1 + length $PATH, "";
655 774
656 for my $file (@$nondirs) { 775 for my $file (@$nondirs) {
657 if ($dir =~ /^music(?:\/|$)/) { 776 if ($dir =~ /^music(?:\/|$)/) {
658 $c_res->put ([$path, $file, 3]) # FT_MUSIC 777 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
659 if $file =~ /\.(ogg)$/; 778 if $file =~ /\.(ogg)$/;
660 779
661 } elsif ($dir =~ /^sound(?:\/|$)/) { 780 } elsif ($dir =~ /^sound(?:\/|$)/) {
662 $c_res->put ([$path, $file, 5]) # FT_SOUND 781 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
663 if $file =~ /\.(wav|ogg)$/; 782 if $file =~ /\.(wav|ogg)$/;
664 783
665 } elsif ($dir =~ /^res(?:\/|$)/) { 784 } elsif ($dir =~ /^res(?:\/|$)/) {
666 if ($file =~ /\.(jpg|png)$/) { 785 if ($file =~ /\.(jpg|png)$/) {
667 $c_res->put ([$path, $file, 0]) # FT_FACE 786 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
668 } elsif ($file =~ /\.(res)$/) { 787 } elsif ($file =~ /\.(res)$/) {
788 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
789 } else {
790 $c_any->put ([\&process_res, $path, $file, undef]);
791 }
792
793 } elsif ($file =~ /\.png$/) {
794 push @c_png, ["$path/$file", 0];
795
796 } elsif ($file =~ /\.faceinfo$/) {
797 $c_any->put ([\&process_faceinfo, $path, $file]);
798
799 } elsif ($file =~ /\.trs$/) {
800 $c_any->put ([\&process_trs, $path, $file]);
801
802 } elsif ($file =~ /\.arc$/) {
669 $c_res->put ([$path, $file, 6]) # FT_RSRC 803 $c_arc->put ([$path, $file]);
804
670 } else { 805 } else {
671 $c_res->put ([$path, $file, undef]); 806 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
672 } 807 }
673
674 } elsif ($file =~ /\.png$/) {
675 push @c_png, ["$path/$file", 0];
676
677 } elsif ($file =~ /\.trs$/) {
678 $c_trs->put ([$path, $file]);
679
680 } elsif ($file =~ /\.arc$/) {
681 $c_arc->put ([$path, $file]);
682
683 } else { 808 }
684 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
685 }
686 } 809 };
687 }; 810 };
811
812 $scandir->($path);
813 aio_wait $grp;
688 } 814 }
689 815
690 sub generate_plurals { 816 sub generate_plurals {
691# use Lingua::EN::Inflect (); 817# use Lingua::EN::Inflect ();
692# Lingua::EN::Inflect::classical; 818# Lingua::EN::Inflect::classical;
730 if (!-d "$path/treasures") { 856 if (!-d "$path/treasures") {
731 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 857 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
732 exit 1 unless $FORCE; 858 exit 1 unless $FORCE;
733 } 859 }
734 860
735 print "scanning files...\n" if $VERBOSE; 861 print "start file scan, arc, any processing...\n" if $VERBOSE;
862
863 my @a_arc = map +(async \&process_arc), 1..2;
864 my @a_any = map +(async \&process_any), 1..4;
736 865
737 find_files $path; 866 find_files $path;
738 867
739 my @a_arc = map +(async \&process_arc), 1..2;
740 my @a_res = map +(async \&process_res), 1..2;
741 my @a_trs = map +(async \&process_trs), 1..2;
742
743 IO::AIO::flush;
744
745 $c_res->shutdown;
746 $c_arc->shutdown; 868 $c_arc->shutdown;
747 $c_trs->shutdown; 869 $c_any->shutdown;
748
749 print "start file scan, arc, res processing...\n" if $VERBOSE;
750 870
751 $_->join for @a_arc; # need to parse all archetypes before png processing 871 $_->join for @a_arc; # need to parse all archetypes before png processing
752 872
753 print "end arc, start png processing...\n" if $VERBOSE; 873 print "end arc, start png processing...\n" if $VERBOSE;
754 874
755 # eight png crunchers work fine for my 4x smp machine 875 # eight png crunchers work fine for my 4x smp machine
756 my @a_png = map +(async \&process_png), 1..8; 876 my @a_png = map +(async \&process_png), 1..8;
757 877
758 $_->join for (@a_trs, @a_res, @a_png); 878 print "end any processing...\n" if $VERBOSE;
879 $_->join for @a_any;
880
881 print "end png processing...\n" if $VERBOSE;
882 $_->join for @a_png;
759 883
760 print "scanning done, processing results...\n" if $VERBOSE; 884 print "scanning done, processing results...\n" if $VERBOSE;
761 { 885 {
762 # remove path prefix from editor_folder 886 # remove path prefix from editor_folder
763 $_->{editor_folder} =~ /^\x00/ 887 $_->{editor_folder} =~ /^\x00/
781 delete @s{qw(_name more name name_pl)}; 905 delete @s{qw(_name more name name_pl)};
782 %$o = ( %s, %$o ); 906 %$o = ( %s, %$o );
783 ++$progress; 907 ++$progress;
784 } 908 }
785 } else { 909 } else {
786 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 910 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
787 delete $ARC{$o->{_name}}; 911 delete $ARC{$o->{_name}};
788 } 912 }
789 } 913 }
790 } 914 }
791 915
798 } 922 }
799 923
800 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 924 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
801 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 925 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
802 926
927 # fix up archetypes without names, where the archanme doesn't work at all
928 for (@ARC) {
929 if (!exists $_->{name} and $_->{_name} =~ /_/) {
930 for ($_->{name} = $_->{_name}) {
931 s/(?:_\d+)+$//;
932 s/_[nesw]+$//;
933 y/_/ /;
934 }
935 }
936 }
937
803 print "generating plurals...\n" if $VERBOSE; 938 #print "generating plurals...\n" if $VERBOSE;
804 generate_plurals; 939 #generate_plurals;
805 940
806 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 941 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
807 open my $fh, ">:utf8", "$DATADIR/archetypes~" 942 open my $fh, ">:utf8", "$DATADIR/archetypes~"
808 or die "$DATADIR/archetypes~: $!"; 943 or die "$DATADIR/archetypes~: $!";
809 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 944 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
817 } 952 }
818 953
819 { 954 {
820 print "processing facedata...\n" if $VERBOSE; 955 print "processing facedata...\n" if $VERBOSE;
821 while (my ($k, $v) = each %FACEINFO) { 956 while (my ($k, $v) = each %FACEINFO) {
822 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 957 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
823 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 958 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
824 959
825 make_hash $k, $v->{data32}, $v->{hash32}; 960 make_hash $k, $v->{data32}, $v->{hash32};
826 make_hash $k, $v->{data64}, $v->{hash64}; 961 make_hash $k, $v->{data64}, $v->{hash64};
827 962
828 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 963 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
829 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 964 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
830 965
831 if (my $magicmap = $v->{magicmap}) { 966 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
832 $magicmap =~ y/A-Z_\-/a-z/d; 967 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
833 $v->{magicmap} = $COLOR{$magicmap}; 968 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
834 }
835 969
836 my $stem = delete $v->{stem}; 970 delete @$v{qw(arc stem)}; # not used by the server
837 $v->{glyph} //= autoglyph $stem, $v;
838 utf8::encode $v->{glyph};
839 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
840
841 delete $v->{arc};
842 } 971 }
843 972
844 print "processing resources...\n" if $VERBOSE; 973 print "processing resources...\n" if $VERBOSE;
845 my $enc = JSON::XS->new->utf8->canonical->relaxed; 974 my $enc = JSON::XS->new->utf8->canonical->relaxed;
846 while (my ($k, $v) = each %RESOURCE) { 975 while (my ($k, $v) = each %RESOURCE) {
885 version => 2, 1014 version => 2,
886 faceinfo => \%FACEINFO, 1015 faceinfo => \%FACEINFO,
887 animinfo => \%ANIMINFO, 1016 animinfo => \%ANIMINFO,
888 resource => \%RESOURCE, 1017 resource => \%RESOURCE,
889 }; 1018 };
890
891 } 1019 }
892 1020
893 print "committing files...\n" if $VERBOSE; 1021 print "committing files...\n" if $VERBOSE;
894 1022
895 for (qw(archetypes facedata treasures), @COMMIT) { 1023 for (qw(archetypes facedata treasures), @COMMIT) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines