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.86 by root, Tue Oct 5 22:33: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 # 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) = @_;
… …
128 our $c_trs = new Coro::Channel; 174 our $c_trs = new Coro::Channel;
129 our $c_res = new Coro::Channel; 175 our $c_res = new Coro::Channel;
130 176
131 our @c_png; 177 our @c_png;
132 178
133 sub commit_png($$$) { 179 sub commit_png($$$$) {
134 my ($name, $data, $T) = @_; 180 my ($stem, $name, $data, $T) = @_;
135 181
182 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
136 $FACEINFO{$name}{"data$T"} = $data; 183 $FACEINFO{$name}{"data$T"} = $data;
137 } 184 }
138 185
139 sub process_png { 186 sub process_png {
140 while (@c_png) { 187 while (@c_png) {
… …
358 405
359 if (0 > aio_load $file, $tile) { 406 if (0 > aio_load $file, $tile) {
360 die "$path: unable to read tile +$x+$y, aborting.\n"; 407 die "$path: unable to read tile +$x+$y, aborting.\n";
361 } 408 }
362 IO::AIO::aio_unlink $file unless $CACHE; 409 IO::AIO::aio_unlink $file unless $CACHE;
363 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 410 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
364 } 411 }
365 } else { 412 } else {
366 # use as-is (either small, use smooth) 413 # use as-is (either small, use smooth)
367 commit_png $face, $png, $T; 414 commit_png $stem, $face, $png, $T;
368 } 415 }
369 416
370 aio_unlink $path if $delete; 417 aio_unlink $path if $delete;
371 } 418 }
372 } 419 }
… …
383 push @ARC, $o; 430 push @ARC, $o;
384 for (my $m = $o; $m; $m = $m->{more}) { 431 for (my $m = $o; $m; $m = $m->{more}) {
385 $ARC{$m->{_name}} = $m; 432 $ARC{$m->{_name}} = $m;
386 } 433 }
387 434
388 $o->{editor_folder} = $dir; 435 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
389 436
390 my $visibility = delete $o->{visibility}; 437 my $visibility = delete $o->{visibility};
391 my $magicmap = delete $o->{magicmap}; 438 my $magicmap = delete $o->{magicmap};
439 my $glyph = delete $o->{glyph};
392 440
393 # find upper left corner :/ 441 # find upper left corner :/
394 # omg, this is sooo broken 442 # omg, this is sooo broken
395 my ($dx, $dy); 443 my ($dx, $dy);
396 for (my $o = $o; $o; $o = $o->{more}) { 444 for (my $o = $o; $o; $o = $o->{more}) {
… …
406 454
407 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 455 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
408 456
409 $visibility = delete $o->{visibility} if exists $o->{visibility}; 457 $visibility = delete $o->{visibility} if exists $o->{visibility};
410 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 458 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
459 $glyph = delete $o->{glyph} if exists $o->{glyph};
411 460
412 my $anim = delete $o->{anim}; 461 my $anim = delete $o->{anim};
413 462
414 if ($anim) { 463 if ($anim) {
415 # possibly add $ext to the animation name to avoid 464 # possibly add $ext to the animation name to avoid
… …
446 495
447 next if $face =~ /^blank.x11$|^empty.x11$/; 496 next if $face =~ /^blank.x11$|^empty.x11$/;
448 497
449 $info->{visibility} = $visibility if defined $visibility; 498 $info->{visibility} = $visibility if defined $visibility;
450 $info->{magicmap} = $magicmap if defined $magicmap; 499 $info->{magicmap} = $magicmap if defined $magicmap;
500 $info->{glyph} = $glyph if defined $glyph;
451 } 501 }
452 502
453 if (my $smooth = delete $o->{smoothface}) { 503 if (my $smooth = delete $o->{smoothface}) {
454 my %kv = split /\s+/, $smooth; 504 my %kv = split /\s+/, $smooth;
455 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 505 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
524 if ($meta->{license} =~ s/^#//) { 574 if ($meta->{license} =~ s/^#//) {
525 $meta->{license} = ({ 575 $meta->{license} = ({
526 "pd" => "Public Domain", 576 "pd" => "Public Domain",
527 "gpl" => "GNU General Public License, version 3.0 or any later", 577 "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/", 578 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
579 "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/", 580 "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/", 581 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
531 })->{$meta->{license}} 582 })->{$meta->{license}}
532 || warn "$dir/$file: license tag '$meta->{license}' not found."; 583 || warn "$dir/$file: license tag '$meta->{license}' not found.";
584 }
585
586 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
587 ($meta->{author} = $1) =~ s/_/ /g;
533 } 588 }
534 589
535 $file =~ s/\.res$//; 590 $file =~ s/\.res$//;
536 $file =~ s/\.(ogg|wav|jpg|png)$//; 591 $file =~ s/\.(ogg|wav|jpg|png)$//;
537 592
… …
565 IO::AIO::aioreq_pri 4; 620 IO::AIO::aioreq_pri 4;
566 IO::AIO::aio_scandir $path, 4, sub { 621 IO::AIO::aio_scandir $path, 4, sub {
567 my ($dirs, $nondirs) = @_; 622 my ($dirs, $nondirs) = @_;
568 623
569 find_files "$path/$_" 624 find_files "$path/$_"
570 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 625 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
571 626
572 my $dir = $path; 627 my $dir = $path;
573 substr $dir, 0, 1 + length $PATH, ""; 628 substr $dir, 0, 1 + length $PATH, "";
574 629
575 for my $file (@$nondirs) { 630 for my $file (@$nondirs) {
… …
607 } 662 }
608 663
609 sub generate_plurals { 664 sub generate_plurals {
610# use Lingua::EN::Inflect (); 665# use Lingua::EN::Inflect ();
611# Lingua::EN::Inflect::classical; 666# Lingua::EN::Inflect::classical;
612# Lingua::EN::Inflect::def_noun 'talisman' => 'talismans'; 667# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
613# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack 668# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
614# 669#
615# for my $a (@ARC) { 670# for my $a (@ARC) {
616# my $name = $a->{name} || $a->{_name}; 671# my $name = $a->{name} || $a->{_name};
617# 672#
618# next unless $a->{name_pl}; 673# next unless $a->{name_pl};
619# 674# next if $a->{invisible};
675# next if $a->{is_floor};
676# next if $a->{no_pick};
620# 677#
621# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name; 678# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
622# my $pl = $test =~ /^(?:eq|p:.)$/ 679# my $pl = $test =~ /^(?:eq|p:.)$/
623# ? $name 680# ? $name
624# : Lingua::EN::Inflect::PL $name; 681# : Lingua::EN::Inflect::PL $name;
625# die "$test $pl" if $pl =~ /bootss/;#d#
626# 682#
627# if ($pl ne $a->{name_pl}) { 683# if ($pl ne $a->{name_pl}) {
628# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n"; 684# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
629# } 685# }
630# } 686# }
… …
676 $_->join for (@a_trs, @a_res, @a_png); 732 $_->join for (@a_trs, @a_res, @a_png);
677 733
678 print "scanning done, processing results...\n" if $VERBOSE; 734 print "scanning done, processing results...\n" if $VERBOSE;
679 { 735 {
680 # remove path prefix from editor_folder 736 # remove path prefix from editor_folder
737 $_->{editor_folder} =~ /^\x00/
681 substr $_->{editor_folder}, 0, 1 + length $path, "" 738 and substr $_->{editor_folder}, 0, 2 + length $path, ""
682 for values %ARC; 739 for values %ARC;
683 740
684 print "resolving inheritance tree...\n" if $VERBOSE; 741 print "resolving inheritance tree...\n" if $VERBOSE;
685 # resolve inherit 742 # resolve inherit
686 while () { 743 while () {
687 my $progress; 744 my $progress;
688 my $loop; 745 my $loop;
689 746
690 for my $o (values %ARC) { 747 for my $o (values %ARC) {
691 if (my $other = $o->{inherit}) { 748 for my $other (split /,/, $o->{inherit}) {
692 if (my $s = $ARC{$other}) { 749 if (my $s = $ARC{$other}) {
693 if ($s->{inherit}) { 750 if ($s->{inherit}) {
694 $loop = $s; 751 $loop = $s;
695 } else { 752 } else {
696 delete $o->{inherit}; 753 delete $o->{inherit};
… …
718 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 775 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
719 776
720 print "generating plurals...\n" if $VERBOSE; 777 print "generating plurals...\n" if $VERBOSE;
721 generate_plurals; 778 generate_plurals;
722 779
723 print "writing archetypes...\n" if $VERBOSE; 780 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
724 open my $fh, ">:utf8", "$DATADIR/archetypes~" 781 open my $fh, ">:utf8", "$DATADIR/archetypes~"
725 or die "$DATADIR/archetypes~: $!"; 782 or die "$DATADIR/archetypes~: $!";
726 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 783 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
727 } 784 }
728 785
729 { 786 {
730 print "writing treasures...\n" if $VERBOSE; 787 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
731 open my $fh, ">:utf8", "$DATADIR/treasures~" 788 open my $fh, ">:utf8", "$DATADIR/treasures~"
732 or die "$DATADIR/treasures~: $!"; 789 or die "$DATADIR/treasures~: $!";
733 print $fh $TRS; 790 print $fh $TRS;
734 } 791 }
735 792
… …
737 print "processing facedata...\n" if $VERBOSE; 794 print "processing facedata...\n" if $VERBOSE;
738 while (my ($k, $v) = each %FACEINFO) { 795 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"; 796 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"; 797 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
741 798
799 make_hash $k, $v->{data32}, $v->{hash32};
800 make_hash $k, $v->{data64}, $v->{hash64};
801
742 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 802 #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"; 803 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
804
805 my $stem = delete $v->{stem};
806 $v->{glyph} //= substr $stem, 0, 1;
744 807
745 if (my $magicmap = $v->{magicmap}) { 808 if (my $magicmap = $v->{magicmap}) {
746 $magicmap =~ y/A-Z_\-/a-z/d; 809 $magicmap =~ y/A-Z_\-/a-z/d;
747 $v->{magicmap} = $COLOR{$magicmap}; 810 $v->{magicmap} = $COLOR{$magicmap};
748 } 811 }
749 812
750 delete $v->{arc}; 813 delete $v->{arc};
751 } 814 }
752 815
753 print "writing facedata...\n" if $VERBOSE; 816 print "processing resources...\n" if $VERBOSE;
817 my $enc = JSON::XS->new->utf8->canonical->relaxed;
818 while (my ($k, $v) = each %RESOURCE) {
819
820 if ($v->{meta} && $v->{meta}{datadir}) {
821 delete $RESOURCE{$k};
822
823 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
824
825 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
826 open my $fh, ">:raw", "$DATADIR/$k~"
827 or die "$DATADIR/$k~: $!";
828 syswrite $fh, $v->{data};
829 push @COMMIT, $k;
830
831 } else {
832 if ($v->{type} & 1) {
833 # prepend meta info
834
835 my $meta = $enc->encode ({
836 name => $k,
837 %{ $v->{meta} || {} },
838 });
839
840 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
841 }
842
843 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
844 }
845 }
846
847 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
848 scalar keys %FACEINFO,
849 scalar keys %ANIMINFO,
850 scalar keys %RESOURCE
851 if $VERBOSE;
852
754 open my $fh, ">:perlio", "$DATADIR/facedata~" 853 open my $fh, ">:perlio", "$DATADIR/facedata~"
755 or die "$DATADIR/facedata~: $!"; 854 or die "$DATADIR/facedata~: $!";
756 855
757 print $fh freeze { 856 print $fh nfreeze {
758 version => 2, 857 version => 2,
759 faceinfo => \%FACEINFO, 858 faceinfo => \%FACEINFO,
760 animinfo => \%ANIMINFO, 859 animinfo => \%ANIMINFO,
761 resource => \%RESOURCE, 860 resource => \%RESOURCE,
762 }; 861 };
862
763 } 863 }
764 864
765 print "committing files...\n" if $VERBOSE; 865 print "committing files...\n" if $VERBOSE;
766 866
767 for (qw(archetypes facedata treasures)) { 867 for (qw(archetypes facedata treasures), @COMMIT) {
768 chmod 0644, "$DATADIR/$_~"; 868 chmod 0644, "$DATADIR/$_~";
769 rename "$DATADIR/$_~", "$DATADIR/$_" 869 rename "$DATADIR/$_~", "$DATADIR/$_"
770 or die "$DATADIR/$_: $!"; 870 or die "$DATADIR/$_: $!";
771 } 871 }
772 872

Diff Legend

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