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.74 by root, Wed Oct 28 04:10:46 2009 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@";
… …
21use Coro::EV; 43use Coro::EV;
22use AnyEvent; 44use AnyEvent;
23use YAML::XS (); 45use YAML::XS ();
24use JSON::XS (); 46use JSON::XS ();
25use IO::AIO (); 47use IO::AIO ();
48use Digest::MD5 ();
26 49
27use Coro 5.12; 50use Coro 5.12;
28use Coro::AIO; 51use Coro::AIO;
29use Coro::Util; 52use Coro::Util;
30use Coro::Channel; 53use Coro::Channel;
… …
51my $VERBOSE = 1; 74my $VERBOSE = 1;
52my $CACHE = 0; 75my $CACHE = 0;
53my $FORCE; 76my $FORCE;
54my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
55my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
56 80
57our %COLOR = ( 81our %COLOR = (
58 black => 0, 82 black => 0,
59 white => 1, 83 white => 1,
60 navy => 2, 84 navy => 2,
… …
72 96
73END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
74 98
75my $s_INT = EV::signal INT => sub { exit 1 }; 99my $s_INT = EV::signal INT => sub { exit 1 };
76my $s_TERM = EV::signal TERM => 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}
77 123
78mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
79 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
80 126
81sub fork_sub(&) { 127sub fork_sub(&) {
… …
383 push @ARC, $o; 429 push @ARC, $o;
384 for (my $m = $o; $m; $m = $m->{more}) { 430 for (my $m = $o; $m; $m = $m->{more}) {
385 $ARC{$m->{_name}} = $m; 431 $ARC{$m->{_name}} = $m;
386 } 432 }
387 433
388 $o->{editor_folder} = $dir; 434 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
389 435
390 my $visibility = delete $o->{visibility}; 436 my $visibility = delete $o->{visibility};
391 my $magicmap = delete $o->{magicmap}; 437 my $magicmap = delete $o->{magicmap};
392 438
393 # find upper left corner :/ 439 # find upper left corner :/
… …
565 IO::AIO::aioreq_pri 4; 611 IO::AIO::aioreq_pri 4;
566 IO::AIO::aio_scandir $path, 4, sub { 612 IO::AIO::aio_scandir $path, 4, sub {
567 my ($dirs, $nondirs) = @_; 613 my ($dirs, $nondirs) = @_;
568 614
569 find_files "$path/$_" 615 find_files "$path/$_"
570 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 616 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
571 617
572 my $dir = $path; 618 my $dir = $path;
573 substr $dir, 0, 1 + length $PATH, ""; 619 substr $dir, 0, 1 + length $PATH, "";
574 620
575 for my $file (@$nondirs) { 621 for my $file (@$nondirs) {
… …
677 $_->join for (@a_trs, @a_res, @a_png); 723 $_->join for (@a_trs, @a_res, @a_png);
678 724
679 print "scanning done, processing results...\n" if $VERBOSE; 725 print "scanning done, processing results...\n" if $VERBOSE;
680 { 726 {
681 # remove path prefix from editor_folder 727 # remove path prefix from editor_folder
728 $_->{editor_folder} =~ /^\x00/
682 substr $_->{editor_folder}, 0, 1 + length $path, "" 729 and substr $_->{editor_folder}, 0, 2 + length $path, ""
683 for values %ARC; 730 for values %ARC;
684 731
685 print "resolving inheritance tree...\n" if $VERBOSE; 732 print "resolving inheritance tree...\n" if $VERBOSE;
686 # resolve inherit 733 # resolve inherit
687 while () { 734 while () {
688 my $progress; 735 my $progress;
689 my $loop; 736 my $loop;
690 737
691 for my $o (values %ARC) { 738 for my $o (values %ARC) {
692 if (my $other = $o->{inherit}) { 739 for my $other (split /,/, $o->{inherit}) {
693 if (my $s = $ARC{$other}) { 740 if (my $s = $ARC{$other}) {
694 if ($s->{inherit}) { 741 if ($s->{inherit}) {
695 $loop = $s; 742 $loop = $s;
696 } else { 743 } else {
697 delete $o->{inherit}; 744 delete $o->{inherit};
… …
719 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 766 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
720 767
721 print "generating plurals...\n" if $VERBOSE; 768 print "generating plurals...\n" if $VERBOSE;
722 generate_plurals; 769 generate_plurals;
723 770
724 print "writing archetypes...\n" if $VERBOSE; 771 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
725 open my $fh, ">:utf8", "$DATADIR/archetypes~" 772 open my $fh, ">:utf8", "$DATADIR/archetypes~"
726 or die "$DATADIR/archetypes~: $!"; 773 or die "$DATADIR/archetypes~: $!";
727 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 774 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
728 } 775 }
729 776
730 { 777 {
731 print "writing treasures...\n" if $VERBOSE; 778 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
732 open my $fh, ">:utf8", "$DATADIR/treasures~" 779 open my $fh, ">:utf8", "$DATADIR/treasures~"
733 or die "$DATADIR/treasures~: $!"; 780 or die "$DATADIR/treasures~: $!";
734 print $fh $TRS; 781 print $fh $TRS;
735 } 782 }
736 783
… …
738 print "processing facedata...\n" if $VERBOSE; 785 print "processing facedata...\n" if $VERBOSE;
739 while (my ($k, $v) = each %FACEINFO) { 786 while (my ($k, $v) = each %FACEINFO) {
740 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";
741 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";
742 789
790 make_hash $k, $v->{data32}, $v->{hash32};
791 make_hash $k, $v->{data64}, $v->{hash64};
792
743 #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";
744 #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";
745 795
746 if (my $magicmap = $v->{magicmap}) { 796 if (my $magicmap = $v->{magicmap}) {
747 $magicmap =~ y/A-Z_\-/a-z/d; 797 $magicmap =~ y/A-Z_\-/a-z/d;
… …
749 } 799 }
750 800
751 delete $v->{arc}; 801 delete $v->{arc};
752 } 802 }
753 803
754 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
755 open my $fh, ">:perlio", "$DATADIR/facedata~" 841 open my $fh, ">:perlio", "$DATADIR/facedata~"
756 or die "$DATADIR/facedata~: $!"; 842 or die "$DATADIR/facedata~: $!";
757 843
758 print $fh freeze { 844 print $fh nfreeze {
759 version => 2, 845 version => 2,
760 faceinfo => \%FACEINFO, 846 faceinfo => \%FACEINFO,
761 animinfo => \%ANIMINFO, 847 animinfo => \%ANIMINFO,
762 resource => \%RESOURCE, 848 resource => \%RESOURCE,
763 }; 849 };
850
764 } 851 }
765 852
766 print "committing files...\n" if $VERBOSE; 853 print "committing files...\n" if $VERBOSE;
767 854
768 for (qw(archetypes facedata treasures)) { 855 for (qw(archetypes facedata treasures), @COMMIT) {
769 chmod 0644, "$DATADIR/$_~"; 856 chmod 0644, "$DATADIR/$_~";
770 rename "$DATADIR/$_~", "$DATADIR/$_" 857 rename "$DATADIR/$_~", "$DATADIR/$_"
771 or die "$DATADIR/$_: $!"; 858 or die "$DATADIR/$_: $!";
772 } 859 }
773 860

Diff Legend

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