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

Diff Legend

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