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.66 by root, Thu Dec 27 15:43:11 2007 UTC vs.
Revision 1.82 by root, Sat Apr 3 22:30:21 2010 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;
19use YAML::Syck (); 45use YAML::XS ();
20use JSON::XS (); 46use JSON::XS ();
21use IO::AIO (); 47use IO::AIO ();
22use File::Temp; 48use Digest::MD5 ();
23use Deliantra; 49
24use Coro; 50use Coro 5.12;
25use Coro::AIO; 51use Coro::AIO;
26use Coro::Util; 52use Coro::Util;
27use POSIX ();
28use Carp;
29use Coro::Channel; 53use Coro::Channel;
30use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
31 57
32$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
33 59
34sub usage { 60sub usage {
35 warn <<EOF; 61 warn <<EOF;
… …
67 tan => 12, 93 tan => 12,
68); 94);
69 95
70END { system "rm", "-rf", $TMPDIR } 96END { system "rm", "-rf", $TMPDIR }
71 97
72Event->signal (signal => "INT", cb => sub { exit 1 }); 98my $s_INT = EV::signal INT => sub { exit 1 };
73Event->signal (signal => "TERM", cb => sub { exit 1 }); 99my $s_TERM = EV::signal TERM => sub { exit 1 };
100
101our %hash;
102
103# here we could try to avoid collisions and reduce chksum size further
104sub make_hash($\$\$;$) {
105 my ($id, $dataref, $hashref, $clen) = @_;
106
107 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
108
109 if (exists $hash{$hash}) {
110 # hahs collinion, but some files are simply identical
111 if (${$hash{$hash}[1]} ne $$dataref) {
112 warn "hash collision $hash{$hash}[0] vs. $id\n";
113 exit 1;
114 } else {
115 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
116 }
117 }
118 $hash{$hash} = [$id, $dataref, $hashref];
119
120 $$hashref = $hash;
121}
74 122
75mkdir $TMPDIR, 0700 123mkdir $TMPDIR, 0700
76 or die "$TMPDIR: $!"; 124 or die "$TMPDIR: $!";
77 125
78sub fork_sub(&) { 126sub fork_sub(&) {
… …
273 fork_sub { 321 fork_sub {
274 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 322 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
275 system $OPTIPNG, "-i0", "-q", "$other~"; 323 system $OPTIPNG, "-i0", "-q", "$other~";
276 324
277 # reduce smoothfaces >10000 bytes 325 # reduce smoothfaces >10000 bytes
326 # obsolete, no longer required
278 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 327 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
279 my $ncolor = 256; 328 my $ncolor = 256;
280 while () { 329 while () {
281 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 330 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
282 system $OPTIPNG, "-i0", "-q", "$other~~"; 331 system $OPTIPNG, "-i0", "-q", "$other~~";
283 last if 10000 > -s "$other~~"; 332 last if 10000 > -s "$other~~";
… …
379 push @ARC, $o; 428 push @ARC, $o;
380 for (my $m = $o; $m; $m = $m->{more}) { 429 for (my $m = $o; $m; $m = $m->{more}) {
381 $ARC{$m->{_name}} = $m; 430 $ARC{$m->{_name}} = $m;
382 } 431 }
383 432
384 $o->{editor_folder} = $dir; 433 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
385 434
386 my $visibility = delete $o->{visibility}; 435 my $visibility = delete $o->{visibility};
387 my $magicmap = delete $o->{magicmap}; 436 my $magicmap = delete $o->{magicmap};
388 437
389 # find upper left corner :/ 438 # find upper left corner :/
… …
533 582
534 substr $dir, 0, 1 + length $PATH, ""; 583 substr $dir, 0, 1 + length $PATH, "";
535 584
536 if (my $filter = $meta->{cfutil_filter}) { 585 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") { 586 if ($filter eq "yaml2json") {
538 $data = JSON::XS::encode_json YAML::Syck::Load $data; 587 $data = JSON::XS::encode_json YAML::XS::Load $data;
539 } elsif ($filter eq "json2json") { 588 } elsif ($filter eq "json2json") {
540 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 589 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
541 } elsif ($filter eq "perl2json") { 590 } elsif ($filter eq "perl2json") {
542 $data = eval $data; die if $@; 591 $data = eval $data; die if $@;
543 $data = JSON::XS::encode_json $data; 592 $data = JSON::XS::encode_json $data;
… …
561 IO::AIO::aioreq_pri 4; 610 IO::AIO::aioreq_pri 4;
562 IO::AIO::aio_scandir $path, 4, sub { 611 IO::AIO::aio_scandir $path, 4, sub {
563 my ($dirs, $nondirs) = @_; 612 my ($dirs, $nondirs) = @_;
564 613
565 find_files "$path/$_" 614 find_files "$path/$_"
566 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 615 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
567 616
568 my $dir = $path; 617 my $dir = $path;
569 substr $dir, 0, 1 + length $PATH, ""; 618 substr $dir, 0, 1 + length $PATH, "";
570 619
571 for my $file (@$nondirs) { 620 for my $file (@$nondirs) {
… …
579 628
580 } elsif ($dir =~ /^res(?:\/|$)/) { 629 } elsif ($dir =~ /^res(?:\/|$)/) {
581 if ($file =~ /\.(jpg|png)$/) { 630 if ($file =~ /\.(jpg|png)$/) {
582 $c_res->put ([$path, $file, 0]) # FT_FACE 631 $c_res->put ([$path, $file, 0]) # FT_FACE
583 } elsif ($file =~ /\.(res)$/) { 632 } elsif ($file =~ /\.(res)$/) {
584 $c_res->put ([$path, $file, 7]) # FT_RSRC 633 $c_res->put ([$path, $file, 6]) # FT_RSRC
585 } else { 634 } else {
586 $c_res->put ([$path, $file, undef]); 635 $c_res->put ([$path, $file, undef]);
587 } 636 }
588 637
589 } elsif ($file =~ /\.png$/) { 638 } elsif ($file =~ /\.png$/) {
… …
598 } else { 647 } else {
599 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 648 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
600 } 649 }
601 } 650 }
602 }; 651 };
652 }
653
654 sub generate_plurals {
655# use Lingua::EN::Inflect ();
656# Lingua::EN::Inflect::classical;
657# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
658# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
659#
660# for my $a (@ARC) {
661# my $name = $a->{name} || $a->{_name};
662#
663# next unless $a->{name_pl};
664# next if $a->{invisible};
665# next if $a->{is_floor};
666# next if $a->{no_pick};
667#
668# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
669# my $pl = $test =~ /^(?:eq|p:.)$/
670# ? $name
671# : Lingua::EN::Inflect::PL $name;
672#
673# if ($pl ne $a->{name_pl}) {
674# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
675# }
676# }
603 } 677 }
604 678
605 sub inst_arch($) { 679 sub inst_arch($) {
606 my (undef, $path) = @_; 680 my (undef, $path) = @_;
607 681
… …
630 my @a_res = map +(async \&process_res), 1..2; 704 my @a_res = map +(async \&process_res), 1..2;
631 my @a_trs = map +(async \&process_trs), 1..2; 705 my @a_trs = map +(async \&process_trs), 1..2;
632 706
633 IO::AIO::flush; 707 IO::AIO::flush;
634 708
635 $c_res->put (undef) for @a_res; 709 $c_res->shutdown;
636 $c_arc->put (undef) for @a_arc; 710 $c_arc->shutdown;
637 $c_trs->put (undef) for @a_trs; 711 $c_trs->shutdown;
638 712
639 print "start file scan, arc, res processing...\n" if $VERBOSE; 713 print "start file scan, arc, res processing...\n" if $VERBOSE;
640 714
641 $_->join for @a_arc; # need to parse all archetypes before png processing 715 $_->join for @a_arc; # need to parse all archetypes before png processing
642 716
643 print "end arc, start png processing...\n" if $VERBOSE; 717 print "end arc, start png processing...\n" if $VERBOSE;
644 718
645 # four png crunchers work fine for my 2x smp machine 719 # eight png crunchers work fine for my 4x smp machine
646 my @a_png = map +(async \&process_png), 1..4; 720 my @a_png = map +(async \&process_png), 1..8;
647 721
648 $_->join for (@a_trs, @a_res, @a_png); 722 $_->join for (@a_trs, @a_res, @a_png);
649 723
650 print "scanning done, processing results...\n" if $VERBOSE; 724 print "scanning done, processing results...\n" if $VERBOSE;
651 { 725 {
652 # remove path prefix from editor_folder 726 # remove path prefix from editor_folder
727 $_->{editor_folder} =~ /^\x00/
653 substr $_->{editor_folder}, 0, 1 + length $path, "" 728 and substr $_->{editor_folder}, 0, 2 + length $path, ""
654 for values %ARC; 729 for values %ARC;
655 730
656 print "resolving inheritance tree...\n" if $VERBOSE; 731 print "resolving inheritance tree...\n" if $VERBOSE;
657 # resolve inherit 732 # resolve inherit
658 while () { 733 while () {
659 my $progress; 734 my $progress;
660 my $loop; 735 my $loop;
661 736
662 for my $o (values %ARC) { 737 for my $o (values %ARC) {
663 if (my $other = $o->{inherit}) { 738 for my $other (split /,/, $o->{inherit}) {
664 if (my $s = $ARC{$other}) { 739 if (my $s = $ARC{$other}) {
665 if ($s->{inherit}) { 740 if ($s->{inherit}) {
666 $loop = $s; 741 $loop = $s;
667 } else { 742 } else {
668 delete $o->{inherit}; 743 delete $o->{inherit};
… …
687 } 762 }
688 763
689 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 764 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
690 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 765 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
691 766
767 print "generating plurals...\n" if $VERBOSE;
768 generate_plurals;
769
692 print "writing archetypes...\n" if $VERBOSE; 770 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
693 open my $fh, ">:utf8", "$DATADIR/archetypes~" 771 open my $fh, ">:utf8", "$DATADIR/archetypes~"
694 or die "$DATADIR/archetypes~: $!"; 772 or die "$DATADIR/archetypes~: $!";
695 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 773 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
696 } 774 }
697 775
698 { 776 {
699 print "writing treasures...\n" if $VERBOSE; 777 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
700 open my $fh, ">:utf8", "$DATADIR/treasures~" 778 open my $fh, ">:utf8", "$DATADIR/treasures~"
701 or die "$DATADIR/treasures~: $!"; 779 or die "$DATADIR/treasures~: $!";
702 print $fh $TRS; 780 print $fh $TRS;
703 } 781 }
704 782
… …
706 print "processing facedata...\n" if $VERBOSE; 784 print "processing facedata...\n" if $VERBOSE;
707 while (my ($k, $v) = each %FACEINFO) { 785 while (my ($k, $v) = each %FACEINFO) {
708 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 786 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
709 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 787 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
710 788
789 make_hash $k, $v->{data32}, $v->{hash32};
790 make_hash $k, $v->{data64}, $v->{hash64};
791
711 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 792 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
712 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 793 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
713 794
714 if (my $magicmap = $v->{magicmap}) { 795 if (my $magicmap = $v->{magicmap}) {
715 $magicmap =~ y/A-Z_\-/a-z/d; 796 $magicmap =~ y/A-Z_\-/a-z/d;
716 $v->{magicmap} = $COLOR{$magicmap}; 797 $v->{magicmap} = $COLOR{$magicmap};
717 } 798 }
718 799
719 delete $v->{arc}; 800 delete $v->{arc};
720 } 801 }
721 802
722 print "writing facedata...\n" if $VERBOSE; 803 print "processing resources...\n" if $VERBOSE;
804 my $enc = JSON::XS->new->utf8->canonical->relaxed;
805 while (my ($k, $v) = each %RESOURCE) {
806
807 if ($v->{type} & 1) {
808 # prepend meta info
809
810 my $meta = $enc->encode ({
811 name => $k,
812 %{ $v->{meta} || {} },
813 });
814
815 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
816 }
817
818 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
819 }
820
821 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
822 scalar keys %FACEINFO,
823 scalar keys %ANIMINFO,
824 scalar keys %RESOURCE
825 if $VERBOSE;
826
723 open my $fh, ">:perlio", "$DATADIR/facedata~" 827 open my $fh, ">:perlio", "$DATADIR/facedata~"
724 or die "$DATADIR/facedata~: $!"; 828 or die "$DATADIR/facedata~: $!";
725 829
726 print $fh freeze { 830 print $fh nfreeze {
727 version => 2, 831 version => 2,
728 faceinfo => \%FACEINFO, 832 faceinfo => \%FACEINFO,
729 animinfo => \%ANIMINFO, 833 animinfo => \%ANIMINFO,
730 resource => \%RESOURCE, 834 resource => \%RESOURCE,
731 }; 835 };
836
732 } 837 }
733 838
734 print "committing files...\n" if $VERBOSE; 839 print "committing files...\n" if $VERBOSE;
735 840
736 for (qw(archetypes facedata treasures)) { 841 for (qw(archetypes facedata treasures)) {

Diff Legend

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