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.58 by root, Tue Aug 21 19:44:57 2007 UTC vs.
Revision 1.78 by root, Wed Nov 4 13:46:37 2009 UTC

1#!@PERL@ 1#!@PERL@
2
3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7#
8# Deliantra is free software: you can redistribute it and/or modify it under
9# the terms of the Affero GNU General Public License as published by the
10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details.
17#
18# You should have received a copy of the Affero GNU General Public License
19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>.
21#
22# The authors can be reached via e-mail to <support@deliantra.net>
23#
2 24
3use strict; 25use strict;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
… …
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; 48
21use Crossfire;
22use Coro; 49use Coro 5.12;
23use Coro::AIO; 50use Coro::AIO;
24use Coro::Util; 51use Coro::Util;
25use POSIX ();
26use Carp;
27use Coro::Channel; 52use Coro::Channel;
28use Coro::Storable; $Storable::canonical = 1; 53use Coro::Storable; $Storable::canonical = 1;
54
55use Deliantra;
29 56
30$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 57$SIG{QUIT} = sub { Carp::cluck "QUIT" };
31 58
32sub usage { 59sub usage {
33 warn <<EOF; 60 warn <<EOF;
… …
65 tan => 12, 92 tan => 12,
66); 93);
67 94
68END { system "rm", "-rf", $TMPDIR } 95END { system "rm", "-rf", $TMPDIR }
69 96
70Event->signal (signal => "INT", cb => sub { exit 1 }); 97my $s_INT = EV::signal INT => sub { exit 1 };
71Event->signal (signal => "TERM", cb => sub { exit 1 }); 98my $s_TERM = EV::signal TERM => sub { exit 1 };
72 99
73mkdir $TMPDIR, 0700 100mkdir $TMPDIR, 0700
74 or die "$TMPDIR: $!"; 101 or die "$TMPDIR: $!";
75 102
76sub fork_sub(&) { 103sub fork_sub(&) {
… …
96 if (!-f "$path/regions") { 123 if (!-f "$path/regions") {
97 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 124 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
98 exit 1 unless $FORCE; 125 exit 1 unless $FORCE;
99 } 126 }
100 127
101 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 128 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
129 "$path/.", "$DATADIR/maps/.",
130 "--exclude", "CVS", "--exclude", "/world-precomposed",
131 "--delete", "--delete-excluded"
102 and die "map installation failed.\n"; 132 and die "map installation failed.\n";
103 133
104 print "maps installed successfully.\n"; 134 print "maps installed successfully.\n";
105} 135}
106 136
… …
173 203
174 (my $base = $stem) =~ s/^.*\///; 204 (my $base = $stem) =~ s/^.*\///;
175 205
176 my $fi = $FACEINFO{$base}; 206 my $fi = $FACEINFO{$base};
177 unless ($fi) { 207 unless ($fi) {
178 warn "$path: <$base> not referenced by any archetype, skipping.\n"; 208 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
179 next; 209 #next;
180 } 210 }
181 211
182 my $arc = $FACEINFO{$base}{arc} 212 my $arc = $fi->{arc} || { };
183 or die "FATAL: internal error <$base>, cannot continue";
184 213
185 unless ($path =~ /~$/) { 214 unless ($path =~ /~$/) {
186 # possibly enlarge 215 # possibly enlarge
187 if (0 > aio_stat "$stem.64x64.png") { 216 if (0 > aio_stat "$stem.64x64.png") {
188 my $other = "$stem.64x64.png~"; 217 my $other = "$stem.64x64.png~";
… …
269 fork_sub { 298 fork_sub {
270 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 299 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
271 system $OPTIPNG, "-i0", "-q", "$other~"; 300 system $OPTIPNG, "-i0", "-q", "$other~";
272 301
273 # reduce smoothfaces >10000 bytes 302 # reduce smoothfaces >10000 bytes
303 # obsolete, no longer required
274 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 304 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
275 my $ncolor = 256; 305 my $ncolor = 256;
276 while () { 306 while () {
277 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 307 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
278 system $OPTIPNG, "-i0", "-q", "$other~~"; 308 system $OPTIPNG, "-i0", "-q", "$other~~";
279 last if 10000 > -s "$other~~"; 309 last if 10000 > -s "$other~~";
… …
375 push @ARC, $o; 405 push @ARC, $o;
376 for (my $m = $o; $m; $m = $m->{more}) { 406 for (my $m = $o; $m; $m = $m->{more}) {
377 $ARC{$m->{_name}} = $m; 407 $ARC{$m->{_name}} = $m;
378 } 408 }
379 409
380 $o->{editor_folder} = $dir; 410 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
381 411
382 my $visibility = delete $o->{visibility}; 412 my $visibility = delete $o->{visibility};
383 my $magicmap = delete $o->{magicmap}; 413 my $magicmap = delete $o->{magicmap};
384 414
385 # find upper left corner :/ 415 # find upper left corner :/
… …
495 my ($dir, $file, $type) = @$job; 525 my ($dir, $file, $type) = @$job;
496 526
497 my $data; 527 my $data;
498 aio_load "$dir/$file", $data; 528 aio_load "$dir/$file", $data;
499 529
500 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 530 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
501 531
502 next if $meta && !exists $meta->{$file}; 532 utf8::decode $dir;
533 utf8::decode $file;
534
535 # a meta file for resources is now mandatory
536 unless (exists $meta->{$file}) {
537 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
538 next;
539 }
503 540
504 $meta = { 541 $meta = {
505 %{ $meta->{"" } || {} }, 542 %{ $meta->{"" } || {} },
506 %{ $meta->{$file} || {} }, 543 %{ $meta->{$file} || {} },
507 }; 544 };
… …
520 $file =~ s/\.res$//; 557 $file =~ s/\.res$//;
521 $file =~ s/\.(ogg|wav|jpg|png)$//; 558 $file =~ s/\.(ogg|wav|jpg|png)$//;
522 559
523 substr $dir, 0, 1 + length $PATH, ""; 560 substr $dir, 0, 1 + length $PATH, "";
524 561
562 if (my $filter = $meta->{cfutil_filter}) {
563 if ($filter eq "yaml2json") {
564 $data = JSON::XS::encode_json YAML::XS::Load $data;
565 } elsif ($filter eq "json2json") {
566 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
567 } elsif ($filter eq "perl2json") {
568 $data = eval $data; die if $@;
569 $data = JSON::XS::encode_json $data;
570 } else {
571 warn "$dir/$file: unknown filter $filter, skipping\n";
572 }
573 }
574
525 $RESOURCE{"$dir/$file"} = { 575 $RESOURCE{"$dir/$file"} = {
526 type => (delete $meta->{type}) || $type, 576 type => (exists $meta->{type} ? delete $meta->{type} : $type),
527 data => $data, 577 data => $data,
528 %$meta ? (meta => $meta) : (), 578 %$meta ? (meta => $meta) : (),
529 }; 579 };
530 } 580 }
531 } 581 }
… …
552 } elsif ($dir =~ /^sound(?:\/|$)/) { 602 } elsif ($dir =~ /^sound(?:\/|$)/) {
553 $c_res->put ([$path, $file, 5]) # FT_SOUND 603 $c_res->put ([$path, $file, 5]) # FT_SOUND
554 if $file =~ /\.(wav|ogg)$/; 604 if $file =~ /\.(wav|ogg)$/;
555 605
556 } elsif ($dir =~ /^res(?:\/|$)/) { 606 } elsif ($dir =~ /^res(?:\/|$)/) {
607 if ($file =~ /\.(jpg|png)$/) {
557 $c_res->put ([$path, $file, 0]) # FT_FACE 608 $c_res->put ([$path, $file, 0]) # FT_FACE
558 if $file =~ /\.(jpg|png)$/; 609 } elsif ($file =~ /\.(res)$/) {
559 $c_res->put ([$path, $file, 7]) # FT_RSRC 610 $c_res->put ([$path, $file, 6]) # FT_RSRC
560 if $file =~ /\.(res)$/; 611 } else {
612 $c_res->put ([$path, $file, undef]);
613 }
561 614
562 } elsif ($file =~ /\.png$/) { 615 } elsif ($file =~ /\.png$/) {
563 push @c_png, ["$path/$file", 0]; 616 push @c_png, ["$path/$file", 0];
564 617
565 } elsif ($file =~ /\.trs$/) { 618 } elsif ($file =~ /\.trs$/) {
… …
571 } else { 624 } else {
572 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 625 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
573 } 626 }
574 } 627 }
575 }; 628 };
629 }
630
631 sub generate_plurals {
632# use Lingua::EN::Inflect ();
633# Lingua::EN::Inflect::classical;
634# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
635# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
636#
637# for my $a (@ARC) {
638# my $name = $a->{name} || $a->{_name};
639#
640# next unless $a->{name_pl};
641# next if $a->{invisible};
642# next if $a->{is_floor};
643# next if $a->{no_pick};
644#
645# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
646# my $pl = $test =~ /^(?:eq|p:.)$/
647# ? $name
648# : Lingua::EN::Inflect::PL $name;
649#
650# if ($pl ne $a->{name_pl}) {
651# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
652# }
653# }
576 } 654 }
577 655
578 sub inst_arch($) { 656 sub inst_arch($) {
579 my (undef, $path) = @_; 657 my (undef, $path) = @_;
580 658
… …
603 my @a_res = map +(async \&process_res), 1..2; 681 my @a_res = map +(async \&process_res), 1..2;
604 my @a_trs = map +(async \&process_trs), 1..2; 682 my @a_trs = map +(async \&process_trs), 1..2;
605 683
606 IO::AIO::flush; 684 IO::AIO::flush;
607 685
608 $c_res->put (undef) for @a_res; 686 $c_res->shutdown;
609 $c_arc->put (undef) for @a_arc; 687 $c_arc->shutdown;
610 $c_trs->put (undef) for @a_trs; 688 $c_trs->shutdown;
611 689
612 print "start file scan, arc, res processing...\n" if $VERBOSE; 690 print "start file scan, arc, res processing...\n" if $VERBOSE;
613 691
614 $_->join for @a_arc; # need to parse all archetypes before png processing 692 $_->join for @a_arc; # need to parse all archetypes before png processing
615 693
616 print "end arc, start png processing...\n" if $VERBOSE; 694 print "end arc, start png processing...\n" if $VERBOSE;
617 695
618 # four png crunchers work fine for my 2x smp machine 696 # eight png crunchers work fine for my 4x smp machine
619 my @a_png = map +(async \&process_png), 1..4; 697 my @a_png = map +(async \&process_png), 1..8;
620 698
621 $_->join for (@a_trs, @a_res, @a_png); 699 $_->join for (@a_trs, @a_res, @a_png);
622 700
623 print "scanning done, processing results...\n" if $VERBOSE; 701 print "scanning done, processing results...\n" if $VERBOSE;
624 { 702 {
625 # remove path prefix from editor_folder 703 # remove path prefix from editor_folder
704 $_->{editor_folder} =~ /^\x00/
626 substr $_->{editor_folder}, 0, 1 + length $path, "" 705 and substr $_->{editor_folder}, 0, 2 + length $path, ""
627 for values %ARC; 706 for values %ARC;
628 707
629 print "resolving inheritance tree...\n" if $VERBOSE; 708 print "resolving inheritance tree...\n" if $VERBOSE;
630 # resolve inherit 709 # resolve inherit
631 while () { 710 while () {
632 my $progress; 711 my $progress;
… …
660 } 739 }
661 740
662 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 741 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
663 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 742 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
664 743
744 print "generating plurals...\n" if $VERBOSE;
745 generate_plurals;
746
665 print "writing archetypes...\n" if $VERBOSE; 747 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
666 open my $fh, ">:utf8", "$DATADIR/archetypes~" 748 open my $fh, ">:utf8", "$DATADIR/archetypes~"
667 or die "$DATADIR/archetypes~: $!"; 749 or die "$DATADIR/archetypes~: $!";
668 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 750 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
669 } 751 }
670 752
671 { 753 {
672 print "writing treasures...\n" if $VERBOSE; 754 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
673 open my $fh, ">:utf8", "$DATADIR/treasures~" 755 open my $fh, ">:utf8", "$DATADIR/treasures~"
674 or die "$DATADIR/treasures~: $!"; 756 or die "$DATADIR/treasures~: $!";
675 print $fh $TRS; 757 print $fh $TRS;
676 } 758 }
677 759
… …
679 print "processing facedata...\n" if $VERBOSE; 761 print "processing facedata...\n" if $VERBOSE;
680 while (my ($k, $v) = each %FACEINFO) { 762 while (my ($k, $v) = each %FACEINFO) {
681 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 763 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
682 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 764 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
683 765
684 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 766 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
685 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 767 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
686 768
687 if (my $magicmap = $v->{magicmap}) { 769 if (my $magicmap = $v->{magicmap}) {
688 $magicmap =~ y/A-Z_\-/a-z/d; 770 $magicmap =~ y/A-Z_\-/a-z/d;
689 $v->{magicmap} = $COLOR{$magicmap}; 771 $v->{magicmap} = $COLOR{$magicmap};
690 } 772 }
691 773
692 delete $v->{arc}; 774 delete $v->{arc};
693 } 775 }
694 776
695 print "writing facedata...\n" if $VERBOSE; 777 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
778 scalar keys %FACEINFO,
779 scalar keys %ANIMINFO,
780 scalar keys %RESOURCE
781 if $VERBOSE;
782
696 open my $fh, ">:perlio", "$DATADIR/facedata~" 783 open my $fh, ">:perlio", "$DATADIR/facedata~"
697 or die "$DATADIR/facedata~: $!"; 784 or die "$DATADIR/facedata~: $!";
698 785
699 print $fh freeze { 786 print $fh freeze {
700 version => 2, 787 version => 2,
701 faceinfo => \%FACEINFO, 788 faceinfo => \%FACEINFO,
702 animinfo => \%ANIMINFO, 789 animinfo => \%ANIMINFO,
703 resource => \%RESOURCE, 790 resource => \%RESOURCE,
704 }; 791 };
792
705 } 793 }
706 794
707 print "committing files...\n" if $VERBOSE; 795 print "committing files...\n" if $VERBOSE;
708 796
709 for (qw(archetypes facedata treasures)) { 797 for (qw(archetypes facedata treasures)) {

Diff Legend

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