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.77 by root, Tue Nov 3 23:44:21 2009 UTC vs.
Revision 1.90 by root, Tue Oct 5 23:52:02 2010 UTC

… …
20# <http://www.gnu.org/licenses/>. 20# <http://www.gnu.org/licenses/>.
21# 21#
22# The authors can be reached via e-mail to <support@deliantra.net> 22# The authors can be reached via e-mail to <support@deliantra.net>
23# 23#
24 24
25use strict; 25use common::sense;
26 26
27my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
28my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
29my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
30my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
… …
43use Coro::EV; 43use Coro::EV;
44use AnyEvent; 44use AnyEvent;
45use YAML::XS (); 45use YAML::XS ();
46use JSON::XS (); 46use JSON::XS ();
47use IO::AIO (); 47use IO::AIO ();
48use Digest::MD5 ();
48 49
49use Coro 5.12; 50use Coro 5.12;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::Util; 52use Coro::Util;
52use Coro::Channel; 53use Coro::Channel;
… …
73my $VERBOSE = 1; 74my $VERBOSE = 1;
74my $CACHE = 0; 75my $CACHE = 0;
75my $FORCE; 76my $FORCE;
76my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
77my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
78 80
79our %COLOR = ( 81our %COLOR = (
80 black => 0, 82 black => 0,
81 white => 1, 83 white => 1,
82 navy => 2, 84 navy => 2,
… …
95END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
96 98
97my $s_INT = EV::signal INT => sub { exit 1 }; 99my $s_INT = EV::signal INT => sub { exit 1 };
98my $s_TERM = EV::signal TERM => sub { exit 1 }; 100my $s_TERM = EV::signal TERM => sub { exit 1 };
99 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}
123
100mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
101 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
102 126
103sub fork_sub(&) { 127sub fork_sub(&) {
104 my ($cb) = @_; 128 my ($cb) = @_;
… …
132 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
133 157
134 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
135} 159}
136 160
161our %WALL_SUFFIX = (
162 "0" => "⬤",
163 "1_3" => "╸",
164 "1_4" => "╺",
165 "2_1_2" => "━",
166
167 "1_2" => "╹",
168 "2_2_4" => "┛",
169 "2_2_1" => "┗",
170 "3_1" => "┻",
171
172 "1_1" => "╻",
173 "2_2_3" => "┓",
174 "2_2_2" => "┏",
175 "3_3" => "┳",
176
177 "2_1_1" => "┃",
178 "3_4" => "┫",
179 "3_2" => "┣",
180 "4" => "╋",
181);
182
183sub autoglyph {
184 my ($stem, $face) = @_;
185
186 if ($stem =~ /^wall\/|Nimwall/) {
187 while (my ($k, $v) = each %WALL_SUFFIX) {
188 return $v if $stem =~ /_$k.x11/;
189 }
190
191 "+"
192
193 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
194 "."
195
196 } elsif ($stem =~ /^player\//) {
197 "\@"
198
199 } else {
200 substr $stem, 0, 1
201 }
202}
203
137{ 204{
138 our %ANIMINFO; 205 our %ANIMINFO;
139 our %FACEINFO; 206 our %FACEINFO;
140 our %RESOURCE; 207 our %RESOURCE;
141 our @ARC; 208 our @ARC;
… …
150 our $c_trs = new Coro::Channel; 217 our $c_trs = new Coro::Channel;
151 our $c_res = new Coro::Channel; 218 our $c_res = new Coro::Channel;
152 219
153 our @c_png; 220 our @c_png;
154 221
155 sub commit_png($$$) { 222 sub commit_png($$$$) {
156 my ($name, $data, $T) = @_; 223 my ($stem, $name, $data, $T) = @_;
157 224
225 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
158 $FACEINFO{$name}{"data$T"} = $data; 226 $FACEINFO{$name}{"data$T"} = $data;
159 } 227 }
160 228
161 sub process_png { 229 sub process_png {
162 while (@c_png) { 230 while (@c_png) {
… …
380 448
381 if (0 > aio_load $file, $tile) { 449 if (0 > aio_load $file, $tile) {
382 die "$path: unable to read tile +$x+$y, aborting.\n"; 450 die "$path: unable to read tile +$x+$y, aborting.\n";
383 } 451 }
384 IO::AIO::aio_unlink $file unless $CACHE; 452 IO::AIO::aio_unlink $file unless $CACHE;
385 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 453 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
386 } 454 }
387 } else { 455 } else {
388 # use as-is (either small, use smooth) 456 # use as-is (either small, use smooth)
389 commit_png $face, $png, $T; 457 commit_png $stem, $face, $png, $T;
390 } 458 }
391 459
392 aio_unlink $path if $delete; 460 aio_unlink $path if $delete;
393 } 461 }
394 } 462 }
… …
409 477
410 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 478 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
411 479
412 my $visibility = delete $o->{visibility}; 480 my $visibility = delete $o->{visibility};
413 my $magicmap = delete $o->{magicmap}; 481 my $magicmap = delete $o->{magicmap};
482 my $glyph = delete $o->{glyph};
414 483
415 # find upper left corner :/ 484 # find upper left corner :/
416 # omg, this is sooo broken 485 # omg, this is sooo broken
417 my ($dx, $dy); 486 my ($dx, $dy);
418 for (my $o = $o; $o; $o = $o->{more}) { 487 for (my $o = $o; $o; $o = $o->{more}) {
… …
428 497
429 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
430 499
431 $visibility = delete $o->{visibility} if exists $o->{visibility}; 500 $visibility = delete $o->{visibility} if exists $o->{visibility};
432 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 501 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
502 $glyph = delete $o->{glyph} if exists $o->{glyph};
433 503
434 my $anim = delete $o->{anim}; 504 my $anim = delete $o->{anim};
435 505
436 if ($anim) { 506 if ($anim) {
437 # possibly add $ext to the animation name to avoid 507 # possibly add $ext to the animation name to avoid
… …
468 538
469 next if $face =~ /^blank.x11$|^empty.x11$/; 539 next if $face =~ /^blank.x11$|^empty.x11$/;
470 540
471 $info->{visibility} = $visibility if defined $visibility; 541 $info->{visibility} = $visibility if defined $visibility;
472 $info->{magicmap} = $magicmap if defined $magicmap; 542 $info->{magicmap} = $magicmap if defined $magicmap;
543 $info->{glyph} = $glyph if defined $glyph;
473 } 544 }
474 545
475 if (my $smooth = delete $o->{smoothface}) { 546 if (my $smooth = delete $o->{smoothface}) {
476 my %kv = split /\s+/, $smooth; 547 my %kv = split /\s+/, $smooth;
477 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 548 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
546 if ($meta->{license} =~ s/^#//) { 617 if ($meta->{license} =~ s/^#//) {
547 $meta->{license} = ({ 618 $meta->{license} = ({
548 "pd" => "Public Domain", 619 "pd" => "Public Domain",
549 "gpl" => "GNU General Public License, version 3.0 or any later", 620 "gpl" => "GNU General Public License, version 3.0 or any later",
550 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 621 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
622 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
551 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 623 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
552 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 624 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
553 })->{$meta->{license}} 625 })->{$meta->{license}}
554 || warn "$dir/$file: license tag '$meta->{license}' not found."; 626 || warn "$dir/$file: license tag '$meta->{license}' not found.";
627 }
628
629 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
630 ($meta->{author} = $1) =~ s/_/ /g;
555 } 631 }
556 632
557 $file =~ s/\.res$//; 633 $file =~ s/\.res$//;
558 $file =~ s/\.(ogg|wav|jpg|png)$//; 634 $file =~ s/\.(ogg|wav|jpg|png)$//;
559 635
… …
587 IO::AIO::aioreq_pri 4; 663 IO::AIO::aioreq_pri 4;
588 IO::AIO::aio_scandir $path, 4, sub { 664 IO::AIO::aio_scandir $path, 4, sub {
589 my ($dirs, $nondirs) = @_; 665 my ($dirs, $nondirs) = @_;
590 666
591 find_files "$path/$_" 667 find_files "$path/$_"
592 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 668 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
593 669
594 my $dir = $path; 670 my $dir = $path;
595 substr $dir, 0, 1 + length $PATH, ""; 671 substr $dir, 0, 1 + length $PATH, "";
596 672
597 for my $file (@$nondirs) { 673 for my $file (@$nondirs) {
… …
710 while () { 786 while () {
711 my $progress; 787 my $progress;
712 my $loop; 788 my $loop;
713 789
714 for my $o (values %ARC) { 790 for my $o (values %ARC) {
715 if (my $other = $o->{inherit}) { 791 for my $other (split /,/, $o->{inherit}) {
716 if (my $s = $ARC{$other}) { 792 if (my $s = $ARC{$other}) {
717 if ($s->{inherit}) { 793 if ($s->{inherit}) {
718 $loop = $s; 794 $loop = $s;
719 } else { 795 } else {
720 delete $o->{inherit}; 796 delete $o->{inherit};
… …
742 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 818 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
743 819
744 print "generating plurals...\n" if $VERBOSE; 820 print "generating plurals...\n" if $VERBOSE;
745 generate_plurals; 821 generate_plurals;
746 822
747 print "writing archetypes...\n" if $VERBOSE; 823 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
748 open my $fh, ">:utf8", "$DATADIR/archetypes~" 824 open my $fh, ">:utf8", "$DATADIR/archetypes~"
749 or die "$DATADIR/archetypes~: $!"; 825 or die "$DATADIR/archetypes~: $!";
750 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 826 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
751 } 827 }
752 828
753 { 829 {
754 print "writing treasures...\n" if $VERBOSE; 830 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
755 open my $fh, ">:utf8", "$DATADIR/treasures~" 831 open my $fh, ">:utf8", "$DATADIR/treasures~"
756 or die "$DATADIR/treasures~: $!"; 832 or die "$DATADIR/treasures~: $!";
757 print $fh $TRS; 833 print $fh $TRS;
758 } 834 }
759 835
… …
761 print "processing facedata...\n" if $VERBOSE; 837 print "processing facedata...\n" if $VERBOSE;
762 while (my ($k, $v) = each %FACEINFO) { 838 while (my ($k, $v) = each %FACEINFO) {
763 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 839 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
764 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 840 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
765 841
842 make_hash $k, $v->{data32}, $v->{hash32};
843 make_hash $k, $v->{data64}, $v->{hash64};
844
766 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 845 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
767 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 846 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
847
848 my $stem = delete $v->{stem};
849 $v->{glyph} //= autoglyph $stem, $v;
768 850
769 if (my $magicmap = $v->{magicmap}) { 851 if (my $magicmap = $v->{magicmap}) {
770 $magicmap =~ y/A-Z_\-/a-z/d; 852 $magicmap =~ y/A-Z_\-/a-z/d;
771 $v->{magicmap} = $COLOR{$magicmap}; 853 $v->{magicmap} = $COLOR{$magicmap};
772 } 854 }
773 855
774 delete $v->{arc}; 856 delete $v->{arc};
775 } 857 }
776 858
777 print "writing facedata...\n" if $VERBOSE; 859 print "processing resources...\n" if $VERBOSE;
860 my $enc = JSON::XS->new->utf8->canonical->relaxed;
861 while (my ($k, $v) = each %RESOURCE) {
862
863 if ($v->{meta} && $v->{meta}{datadir}) {
864 delete $RESOURCE{$k};
865
866 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
867
868 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
869 open my $fh, ">:raw", "$DATADIR/$k~"
870 or die "$DATADIR/$k~: $!";
871 syswrite $fh, $v->{data};
872 push @COMMIT, $k;
873
874 } else {
875 if ($v->{type} & 1) {
876 # prepend meta info
877
878 my $meta = $enc->encode ({
879 name => $k,
880 %{ $v->{meta} || {} },
881 });
882
883 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
884 }
885
886 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
887 }
888 }
889
890 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
891 scalar keys %FACEINFO,
892 scalar keys %ANIMINFO,
893 scalar keys %RESOURCE
894 if $VERBOSE;
895
778 open my $fh, ">:perlio", "$DATADIR/facedata~" 896 open my $fh, ">:perlio", "$DATADIR/facedata~"
779 or die "$DATADIR/facedata~: $!"; 897 or die "$DATADIR/facedata~: $!";
780 898
781 print $fh freeze { 899 print $fh nfreeze {
782 version => 2, 900 version => 2,
783 faceinfo => \%FACEINFO, 901 faceinfo => \%FACEINFO,
784 animinfo => \%ANIMINFO, 902 animinfo => \%ANIMINFO,
785 resource => \%RESOURCE, 903 resource => \%RESOURCE,
786 }; 904 };
905
787 } 906 }
788 907
789 print "committing files...\n" if $VERBOSE; 908 print "committing files...\n" if $VERBOSE;
790 909
791 for (qw(archetypes facedata treasures)) { 910 for (qw(archetypes facedata treasures), @COMMIT) {
792 chmod 0644, "$DATADIR/$_~"; 911 chmod 0644, "$DATADIR/$_~";
793 rename "$DATADIR/$_~", "$DATADIR/$_" 912 rename "$DATADIR/$_~", "$DATADIR/$_"
794 or die "$DATADIR/$_: $!"; 913 or die "$DATADIR/$_: $!";
795 } 914 }
796 915

Diff Legend

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