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.75 by root, Mon Nov 2 11:50:20 2009 UTC vs.
Revision 1.92 by root, Tue Oct 5 23:59:10 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,
… …
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 };
77 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 # hash collision, 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
78mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
79 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
80 126
81sub fork_sub(&) { 127sub fork_sub(&) {
82 my ($cb) = @_; 128 my ($cb) = @_;
… …
110 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
111 157
112 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
113} 159}
114 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 if ($stem =~ /((?:_[0-4])+).x11/) {
188 return $WALL_SUFFIX{$1} if exists $WALL_SUFFIX{$1};
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
115{ 204{
116 our %ANIMINFO; 205 our %ANIMINFO;
117 our %FACEINFO; 206 our %FACEINFO;
118 our %RESOURCE; 207 our %RESOURCE;
119 our @ARC; 208 our @ARC;
… …
128 our $c_trs = new Coro::Channel; 217 our $c_trs = new Coro::Channel;
129 our $c_res = new Coro::Channel; 218 our $c_res = new Coro::Channel;
130 219
131 our @c_png; 220 our @c_png;
132 221
133 sub commit_png($$$) { 222 sub commit_png($$$$) {
134 my ($name, $data, $T) = @_; 223 my ($stem, $name, $data, $T) = @_;
135 224
225 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
136 $FACEINFO{$name}{"data$T"} = $data; 226 $FACEINFO{$name}{"data$T"} = $data;
137 } 227 }
138 228
139 sub process_png { 229 sub process_png {
140 while (@c_png) { 230 while (@c_png) {
… …
358 448
359 if (0 > aio_load $file, $tile) { 449 if (0 > aio_load $file, $tile) {
360 die "$path: unable to read tile +$x+$y, aborting.\n"; 450 die "$path: unable to read tile +$x+$y, aborting.\n";
361 } 451 }
362 IO::AIO::aio_unlink $file unless $CACHE; 452 IO::AIO::aio_unlink $file unless $CACHE;
363 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 453 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
364 } 454 }
365 } else { 455 } else {
366 # use as-is (either small, use smooth) 456 # use as-is (either small, use smooth)
367 commit_png $face, $png, $T; 457 commit_png $stem, $face, $png, $T;
368 } 458 }
369 459
370 aio_unlink $path if $delete; 460 aio_unlink $path if $delete;
371 } 461 }
372 } 462 }
… …
383 push @ARC, $o; 473 push @ARC, $o;
384 for (my $m = $o; $m; $m = $m->{more}) { 474 for (my $m = $o; $m; $m = $m->{more}) {
385 $ARC{$m->{_name}} = $m; 475 $ARC{$m->{_name}} = $m;
386 } 476 }
387 477
388 $o->{editor_folder} ||= $dir; 478 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
389 479
390 my $visibility = delete $o->{visibility}; 480 my $visibility = delete $o->{visibility};
391 my $magicmap = delete $o->{magicmap}; 481 my $magicmap = delete $o->{magicmap};
482 my $glyph = delete $o->{glyph};
392 483
393 # find upper left corner :/ 484 # find upper left corner :/
394 # omg, this is sooo broken 485 # omg, this is sooo broken
395 my ($dx, $dy); 486 my ($dx, $dy);
396 for (my $o = $o; $o; $o = $o->{more}) { 487 for (my $o = $o; $o; $o = $o->{more}) {
… …
406 497
407 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
408 499
409 $visibility = delete $o->{visibility} if exists $o->{visibility}; 500 $visibility = delete $o->{visibility} if exists $o->{visibility};
410 $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};
411 503
412 my $anim = delete $o->{anim}; 504 my $anim = delete $o->{anim};
413 505
414 if ($anim) { 506 if ($anim) {
415 # possibly add $ext to the animation name to avoid 507 # possibly add $ext to the animation name to avoid
… …
446 538
447 next if $face =~ /^blank.x11$|^empty.x11$/; 539 next if $face =~ /^blank.x11$|^empty.x11$/;
448 540
449 $info->{visibility} = $visibility if defined $visibility; 541 $info->{visibility} = $visibility if defined $visibility;
450 $info->{magicmap} = $magicmap if defined $magicmap; 542 $info->{magicmap} = $magicmap if defined $magicmap;
543 $info->{glyph} = $glyph if defined $glyph;
451 } 544 }
452 545
453 if (my $smooth = delete $o->{smoothface}) { 546 if (my $smooth = delete $o->{smoothface}) {
454 my %kv = split /\s+/, $smooth; 547 my %kv = split /\s+/, $smooth;
455 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 548 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
524 if ($meta->{license} =~ s/^#//) { 617 if ($meta->{license} =~ s/^#//) {
525 $meta->{license} = ({ 618 $meta->{license} = ({
526 "pd" => "Public Domain", 619 "pd" => "Public Domain",
527 "gpl" => "GNU General Public License, version 3.0 or any later", 620 "gpl" => "GNU General Public License, version 3.0 or any later",
528 "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/",
529 "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/",
530 "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/",
531 })->{$meta->{license}} 625 })->{$meta->{license}}
532 || 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;
533 } 631 }
534 632
535 $file =~ s/\.res$//; 633 $file =~ s/\.res$//;
536 $file =~ s/\.(ogg|wav|jpg|png)$//; 634 $file =~ s/\.(ogg|wav|jpg|png)$//;
537 635
… …
565 IO::AIO::aioreq_pri 4; 663 IO::AIO::aioreq_pri 4;
566 IO::AIO::aio_scandir $path, 4, sub { 664 IO::AIO::aio_scandir $path, 4, sub {
567 my ($dirs, $nondirs) = @_; 665 my ($dirs, $nondirs) = @_;
568 666
569 find_files "$path/$_" 667 find_files "$path/$_"
570 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 668 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
571 669
572 my $dir = $path; 670 my $dir = $path;
573 substr $dir, 0, 1 + length $PATH, ""; 671 substr $dir, 0, 1 + length $PATH, "";
574 672
575 for my $file (@$nondirs) { 673 for my $file (@$nondirs) {
… …
677 $_->join for (@a_trs, @a_res, @a_png); 775 $_->join for (@a_trs, @a_res, @a_png);
678 776
679 print "scanning done, processing results...\n" if $VERBOSE; 777 print "scanning done, processing results...\n" if $VERBOSE;
680 { 778 {
681 # remove path prefix from editor_folder 779 # remove path prefix from editor_folder
780 $_->{editor_folder} =~ /^\x00/
682 substr $_->{editor_folder}, 0, 1 + length $path, "" 781 and substr $_->{editor_folder}, 0, 2 + length $path, ""
683 for values %ARC; 782 for values %ARC;
684 783
685 print "resolving inheritance tree...\n" if $VERBOSE; 784 print "resolving inheritance tree...\n" if $VERBOSE;
686 # resolve inherit 785 # resolve inherit
687 while () { 786 while () {
688 my $progress; 787 my $progress;
689 my $loop; 788 my $loop;
690 789
691 for my $o (values %ARC) { 790 for my $o (values %ARC) {
692 if (my $other = $o->{inherit}) { 791 for my $other (split /,/, $o->{inherit}) {
693 if (my $s = $ARC{$other}) { 792 if (my $s = $ARC{$other}) {
694 if ($s->{inherit}) { 793 if ($s->{inherit}) {
695 $loop = $s; 794 $loop = $s;
696 } else { 795 } else {
697 delete $o->{inherit}; 796 delete $o->{inherit};
… …
719 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 818 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
720 819
721 print "generating plurals...\n" if $VERBOSE; 820 print "generating plurals...\n" if $VERBOSE;
722 generate_plurals; 821 generate_plurals;
723 822
724 print "writing archetypes...\n" if $VERBOSE; 823 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
725 open my $fh, ">:utf8", "$DATADIR/archetypes~" 824 open my $fh, ">:utf8", "$DATADIR/archetypes~"
726 or die "$DATADIR/archetypes~: $!"; 825 or die "$DATADIR/archetypes~: $!";
727 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];
728 } 827 }
729 828
730 { 829 {
731 print "writing treasures...\n" if $VERBOSE; 830 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
732 open my $fh, ">:utf8", "$DATADIR/treasures~" 831 open my $fh, ">:utf8", "$DATADIR/treasures~"
733 or die "$DATADIR/treasures~: $!"; 832 or die "$DATADIR/treasures~: $!";
734 print $fh $TRS; 833 print $fh $TRS;
735 } 834 }
736 835
… …
738 print "processing facedata...\n" if $VERBOSE; 837 print "processing facedata...\n" if $VERBOSE;
739 while (my ($k, $v) = each %FACEINFO) { 838 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"; 839 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"; 840 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
742 841
842 make_hash $k, $v->{data32}, $v->{hash32};
843 make_hash $k, $v->{data64}, $v->{hash64};
844
743 #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";
744 #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";
745 847
746 if (my $magicmap = $v->{magicmap}) { 848 if (my $magicmap = $v->{magicmap}) {
747 $magicmap =~ y/A-Z_\-/a-z/d; 849 $magicmap =~ y/A-Z_\-/a-z/d;
748 $v->{magicmap} = $COLOR{$magicmap}; 850 $v->{magicmap} = $COLOR{$magicmap};
749 } 851 }
750 852
853 my $stem = delete $v->{stem};
854 $v->{glyph} //= autoglyph $stem, $v;
855 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
856
751 delete $v->{arc}; 857 delete $v->{arc};
752 } 858 }
753 859
754 print "writing facedata...\n" if $VERBOSE; 860 print "processing resources...\n" if $VERBOSE;
861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
862 while (my ($k, $v) = each %RESOURCE) {
863
864 if ($v->{meta} && $v->{meta}{datadir}) {
865 delete $RESOURCE{$k};
866
867 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
868
869 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
870 open my $fh, ">:raw", "$DATADIR/$k~"
871 or die "$DATADIR/$k~: $!";
872 syswrite $fh, $v->{data};
873 push @COMMIT, $k;
874
875 } else {
876 if ($v->{type} & 1) {
877 # prepend meta info
878
879 my $meta = $enc->encode ({
880 name => $k,
881 %{ $v->{meta} || {} },
882 });
883
884 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
885 }
886
887 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
888 }
889 }
890
891 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
892 scalar keys %FACEINFO,
893 scalar keys %ANIMINFO,
894 scalar keys %RESOURCE
895 if $VERBOSE;
896
755 open my $fh, ">:perlio", "$DATADIR/facedata~" 897 open my $fh, ">:perlio", "$DATADIR/facedata~"
756 or die "$DATADIR/facedata~: $!"; 898 or die "$DATADIR/facedata~: $!";
757 899
758 print $fh freeze { 900 print $fh nfreeze {
759 version => 2, 901 version => 2,
760 faceinfo => \%FACEINFO, 902 faceinfo => \%FACEINFO,
761 animinfo => \%ANIMINFO, 903 animinfo => \%ANIMINFO,
762 resource => \%RESOURCE, 904 resource => \%RESOURCE,
763 }; 905 };
906
764 } 907 }
765 908
766 print "committing files...\n" if $VERBOSE; 909 print "committing files...\n" if $VERBOSE;
767 910
768 for (qw(archetypes facedata treasures)) { 911 for (qw(archetypes facedata treasures), @COMMIT) {
769 chmod 0644, "$DATADIR/$_~"; 912 chmod 0644, "$DATADIR/$_~";
770 rename "$DATADIR/$_~", "$DATADIR/$_" 913 rename "$DATADIR/$_~", "$DATADIR/$_"
771 or die "$DATADIR/$_: $!"; 914 or die "$DATADIR/$_: $!";
772 } 915 }
773 916

Diff Legend

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