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.73 by root, Mon Oct 26 11:31:39 2009 UTC vs.
Revision 1.88 by root, Tue Oct 5 23:26:44 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 # 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
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
161sub autoglyph {
162 my ($stem, $face) = @_;
163
164 if ($stem =~ /^wall\/|Nimwall/) {
165# warn $stem;
166 "+"
167 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
168 "."
169 } elsif ($stem =~ /^player\//) {
170 "@"
171 } else {
172 substr $stem, 0, 1
173 }
174}
175
115{ 176{
116 our %ANIMINFO; 177 our %ANIMINFO;
117 our %FACEINFO; 178 our %FACEINFO;
118 our %RESOURCE; 179 our %RESOURCE;
119 our @ARC; 180 our @ARC;
… …
128 our $c_trs = new Coro::Channel; 189 our $c_trs = new Coro::Channel;
129 our $c_res = new Coro::Channel; 190 our $c_res = new Coro::Channel;
130 191
131 our @c_png; 192 our @c_png;
132 193
133 sub commit_png($$$) { 194 sub commit_png($$$$) {
134 my ($name, $data, $T) = @_; 195 my ($stem, $name, $data, $T) = @_;
135 196
197 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
136 $FACEINFO{$name}{"data$T"} = $data; 198 $FACEINFO{$name}{"data$T"} = $data;
137 } 199 }
138 200
139 sub process_png { 201 sub process_png {
140 while (@c_png) { 202 while (@c_png) {
… …
358 420
359 if (0 > aio_load $file, $tile) { 421 if (0 > aio_load $file, $tile) {
360 die "$path: unable to read tile +$x+$y, aborting.\n"; 422 die "$path: unable to read tile +$x+$y, aborting.\n";
361 } 423 }
362 IO::AIO::aio_unlink $file unless $CACHE; 424 IO::AIO::aio_unlink $file unless $CACHE;
363 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 425 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
364 } 426 }
365 } else { 427 } else {
366 # use as-is (either small, use smooth) 428 # use as-is (either small, use smooth)
367 commit_png $face, $png, $T; 429 commit_png $stem, $face, $png, $T;
368 } 430 }
369 431
370 aio_unlink $path if $delete; 432 aio_unlink $path if $delete;
371 } 433 }
372 } 434 }
… …
383 push @ARC, $o; 445 push @ARC, $o;
384 for (my $m = $o; $m; $m = $m->{more}) { 446 for (my $m = $o; $m; $m = $m->{more}) {
385 $ARC{$m->{_name}} = $m; 447 $ARC{$m->{_name}} = $m;
386 } 448 }
387 449
388 $o->{editor_folder} = $dir; 450 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
389 451
390 my $visibility = delete $o->{visibility}; 452 my $visibility = delete $o->{visibility};
391 my $magicmap = delete $o->{magicmap}; 453 my $magicmap = delete $o->{magicmap};
454 my $glyph = delete $o->{glyph};
392 455
393 # find upper left corner :/ 456 # find upper left corner :/
394 # omg, this is sooo broken 457 # omg, this is sooo broken
395 my ($dx, $dy); 458 my ($dx, $dy);
396 for (my $o = $o; $o; $o = $o->{more}) { 459 for (my $o = $o; $o; $o = $o->{more}) {
… …
406 469
407 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 470 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
408 471
409 $visibility = delete $o->{visibility} if exists $o->{visibility}; 472 $visibility = delete $o->{visibility} if exists $o->{visibility};
410 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 473 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
474 $glyph = delete $o->{glyph} if exists $o->{glyph};
411 475
412 my $anim = delete $o->{anim}; 476 my $anim = delete $o->{anim};
413 477
414 if ($anim) { 478 if ($anim) {
415 # possibly add $ext to the animation name to avoid 479 # possibly add $ext to the animation name to avoid
… …
446 510
447 next if $face =~ /^blank.x11$|^empty.x11$/; 511 next if $face =~ /^blank.x11$|^empty.x11$/;
448 512
449 $info->{visibility} = $visibility if defined $visibility; 513 $info->{visibility} = $visibility if defined $visibility;
450 $info->{magicmap} = $magicmap if defined $magicmap; 514 $info->{magicmap} = $magicmap if defined $magicmap;
515 $info->{glyph} = $glyph if defined $glyph;
451 } 516 }
452 517
453 if (my $smooth = delete $o->{smoothface}) { 518 if (my $smooth = delete $o->{smoothface}) {
454 my %kv = split /\s+/, $smooth; 519 my %kv = split /\s+/, $smooth;
455 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 520 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
524 if ($meta->{license} =~ s/^#//) { 589 if ($meta->{license} =~ s/^#//) {
525 $meta->{license} = ({ 590 $meta->{license} = ({
526 "pd" => "Public Domain", 591 "pd" => "Public Domain",
527 "gpl" => "GNU General Public License, version 3.0 or any later", 592 "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/", 593 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
594 "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/", 595 "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/", 596 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
531 })->{$meta->{license}} 597 })->{$meta->{license}}
532 || warn "$dir/$file: license tag '$meta->{license}' not found."; 598 || warn "$dir/$file: license tag '$meta->{license}' not found.";
599 }
600
601 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
602 ($meta->{author} = $1) =~ s/_/ /g;
533 } 603 }
534 604
535 $file =~ s/\.res$//; 605 $file =~ s/\.res$//;
536 $file =~ s/\.(ogg|wav|jpg|png)$//; 606 $file =~ s/\.(ogg|wav|jpg|png)$//;
537 607
… …
565 IO::AIO::aioreq_pri 4; 635 IO::AIO::aioreq_pri 4;
566 IO::AIO::aio_scandir $path, 4, sub { 636 IO::AIO::aio_scandir $path, 4, sub {
567 my ($dirs, $nondirs) = @_; 637 my ($dirs, $nondirs) = @_;
568 638
569 find_files "$path/$_" 639 find_files "$path/$_"
570 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 640 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
571 641
572 my $dir = $path; 642 my $dir = $path;
573 substr $dir, 0, 1 + length $PATH, ""; 643 substr $dir, 0, 1 + length $PATH, "";
574 644
575 for my $file (@$nondirs) { 645 for my $file (@$nondirs) {
… …
607 } 677 }
608 678
609 sub generate_plurals { 679 sub generate_plurals {
610# use Lingua::EN::Inflect (); 680# use Lingua::EN::Inflect ();
611# Lingua::EN::Inflect::classical; 681# Lingua::EN::Inflect::classical;
612# Lingua::EN::Inflect::def_noun 'talisman' => 'talismans'; 682# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
613# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack 683# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
614# 684#
615# for my $a (@ARC) { 685# for my $a (@ARC) {
616# my $name = $a->{name} || $a->{_name}; 686# my $name = $a->{name} || $a->{_name};
617# 687#
618# next unless $a->{name_pl}; 688# next unless $a->{name_pl};
619# 689# next if $a->{invisible};
690# next if $a->{is_floor};
691# next if $a->{no_pick};
620# 692#
621# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name; 693# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
622# my $pl = $test =~ /^(?:eq|p:.)$/ 694# my $pl = $test =~ /^(?:eq|p:.)$/
623# ? $name 695# ? $name
624# : Lingua::EN::Inflect::PL $name; 696# : Lingua::EN::Inflect::PL $name;
625# die "$test $pl" if $pl =~ /bootss/;#d#
626# 697#
627# if ($pl ne $a->{name_pl}) { 698# if ($pl ne $a->{name_pl}) {
628# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n"; 699# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
629# } 700# }
630# } 701# }
… …
676 $_->join for (@a_trs, @a_res, @a_png); 747 $_->join for (@a_trs, @a_res, @a_png);
677 748
678 print "scanning done, processing results...\n" if $VERBOSE; 749 print "scanning done, processing results...\n" if $VERBOSE;
679 { 750 {
680 # remove path prefix from editor_folder 751 # remove path prefix from editor_folder
752 $_->{editor_folder} =~ /^\x00/
681 substr $_->{editor_folder}, 0, 1 + length $path, "" 753 and substr $_->{editor_folder}, 0, 2 + length $path, ""
682 for values %ARC; 754 for values %ARC;
683 755
684 print "resolving inheritance tree...\n" if $VERBOSE; 756 print "resolving inheritance tree...\n" if $VERBOSE;
685 # resolve inherit 757 # resolve inherit
686 while () { 758 while () {
687 my $progress; 759 my $progress;
688 my $loop; 760 my $loop;
689 761
690 for my $o (values %ARC) { 762 for my $o (values %ARC) {
691 if (my $other = $o->{inherit}) { 763 for my $other (split /,/, $o->{inherit}) {
692 if (my $s = $ARC{$other}) { 764 if (my $s = $ARC{$other}) {
693 if ($s->{inherit}) { 765 if ($s->{inherit}) {
694 $loop = $s; 766 $loop = $s;
695 } else { 767 } else {
696 delete $o->{inherit}; 768 delete $o->{inherit};
… …
718 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 790 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
719 791
720 print "generating plurals...\n" if $VERBOSE; 792 print "generating plurals...\n" if $VERBOSE;
721 generate_plurals; 793 generate_plurals;
722 794
723 print "writing archetypes...\n" if $VERBOSE; 795 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
724 open my $fh, ">:utf8", "$DATADIR/archetypes~" 796 open my $fh, ">:utf8", "$DATADIR/archetypes~"
725 or die "$DATADIR/archetypes~: $!"; 797 or die "$DATADIR/archetypes~: $!";
726 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 798 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
727 } 799 }
728 800
729 { 801 {
730 print "writing treasures...\n" if $VERBOSE; 802 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
731 open my $fh, ">:utf8", "$DATADIR/treasures~" 803 open my $fh, ">:utf8", "$DATADIR/treasures~"
732 or die "$DATADIR/treasures~: $!"; 804 or die "$DATADIR/treasures~: $!";
733 print $fh $TRS; 805 print $fh $TRS;
734 } 806 }
735 807
… …
737 print "processing facedata...\n" if $VERBOSE; 809 print "processing facedata...\n" if $VERBOSE;
738 while (my ($k, $v) = each %FACEINFO) { 810 while (my ($k, $v) = each %FACEINFO) {
739 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 811 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
740 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 812 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
741 813
814 make_hash $k, $v->{data32}, $v->{hash32};
815 make_hash $k, $v->{data64}, $v->{hash64};
816
742 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 817 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
743 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 818 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
819
820 my $stem = delete $v->{stem};
821 $v->{glyph} //= autoglyph $stem, $v;
744 822
745 if (my $magicmap = $v->{magicmap}) { 823 if (my $magicmap = $v->{magicmap}) {
746 $magicmap =~ y/A-Z_\-/a-z/d; 824 $magicmap =~ y/A-Z_\-/a-z/d;
747 $v->{magicmap} = $COLOR{$magicmap}; 825 $v->{magicmap} = $COLOR{$magicmap};
748 } 826 }
749 827
750 delete $v->{arc}; 828 delete $v->{arc};
751 } 829 }
752 830
753 print "writing facedata...\n" if $VERBOSE; 831 print "processing resources...\n" if $VERBOSE;
832 my $enc = JSON::XS->new->utf8->canonical->relaxed;
833 while (my ($k, $v) = each %RESOURCE) {
834
835 if ($v->{meta} && $v->{meta}{datadir}) {
836 delete $RESOURCE{$k};
837
838 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
839
840 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
841 open my $fh, ">:raw", "$DATADIR/$k~"
842 or die "$DATADIR/$k~: $!";
843 syswrite $fh, $v->{data};
844 push @COMMIT, $k;
845
846 } else {
847 if ($v->{type} & 1) {
848 # prepend meta info
849
850 my $meta = $enc->encode ({
851 name => $k,
852 %{ $v->{meta} || {} },
853 });
854
855 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
856 }
857
858 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
859 }
860 }
861
862 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
863 scalar keys %FACEINFO,
864 scalar keys %ANIMINFO,
865 scalar keys %RESOURCE
866 if $VERBOSE;
867
754 open my $fh, ">:perlio", "$DATADIR/facedata~" 868 open my $fh, ">:perlio", "$DATADIR/facedata~"
755 or die "$DATADIR/facedata~: $!"; 869 or die "$DATADIR/facedata~: $!";
756 870
757 print $fh freeze { 871 print $fh nfreeze {
758 version => 2, 872 version => 2,
759 faceinfo => \%FACEINFO, 873 faceinfo => \%FACEINFO,
760 animinfo => \%ANIMINFO, 874 animinfo => \%ANIMINFO,
761 resource => \%RESOURCE, 875 resource => \%RESOURCE,
762 }; 876 };
877
763 } 878 }
764 879
765 print "committing files...\n" if $VERBOSE; 880 print "committing files...\n" if $VERBOSE;
766 881
767 for (qw(archetypes facedata treasures)) { 882 for (qw(archetypes facedata treasures), @COMMIT) {
768 chmod 0644, "$DATADIR/$_~"; 883 chmod 0644, "$DATADIR/$_~";
769 rename "$DATADIR/$_~", "$DATADIR/$_" 884 rename "$DATADIR/$_~", "$DATADIR/$_"
770 or die "$DATADIR/$_: $!"; 885 or die "$DATADIR/$_: $!";
771 } 886 }
772 887

Diff Legend

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