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.71 by root, Sat Feb 7 21:40:54 2009 UTC vs.
Revision 1.85 by root, Fri May 14 22:56:47 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@";
… …
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
15 37
16use Getopt::Long; 38use Getopt::Long;
39use File::Temp;
40use POSIX ();
41use Carp;
42
17use Coro::EV; 43use Coro::EV;
18use AnyEvent; 44use AnyEvent;
19use YAML (); 45use YAML::XS ();
20use JSON::XS (); 46use JSON::XS ();
21use IO::AIO (); 47use IO::AIO ();
22use File::Temp; 48use Digest::MD5 ();
23use Deliantra; 49
24use Coro 5.12; 50use Coro 5.12;
25use Coro::AIO; 51use Coro::AIO;
26use Coro::Util; 52use Coro::Util;
27use POSIX ();
28use Carp;
29use Coro::Channel; 53use Coro::Channel;
30use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
31 57
32$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
33 59
34sub usage { 60sub usage {
35 warn <<EOF; 61 warn <<EOF;
… …
48my $VERBOSE = 1; 74my $VERBOSE = 1;
49my $CACHE = 0; 75my $CACHE = 0;
50my $FORCE; 76my $FORCE;
51my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
52my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
53 80
54our %COLOR = ( 81our %COLOR = (
55 black => 0, 82 black => 0,
56 white => 1, 83 white => 1,
57 navy => 2, 84 navy => 2,
… …
69 96
70END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
71 98
72my $s_INT = EV::signal INT => sub { exit 1 }; 99my $s_INT = EV::signal INT => sub { exit 1 };
73my $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}
74 123
75mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
76 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
77 126
78sub fork_sub(&) { 127sub fork_sub(&) {
… …
380 push @ARC, $o; 429 push @ARC, $o;
381 for (my $m = $o; $m; $m = $m->{more}) { 430 for (my $m = $o; $m; $m = $m->{more}) {
382 $ARC{$m->{_name}} = $m; 431 $ARC{$m->{_name}} = $m;
383 } 432 }
384 433
385 $o->{editor_folder} = $dir; 434 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
386 435
387 my $visibility = delete $o->{visibility}; 436 my $visibility = delete $o->{visibility};
388 my $magicmap = delete $o->{magicmap}; 437 my $magicmap = delete $o->{magicmap};
389 438
390 # find upper left corner :/ 439 # find upper left corner :/
… …
521 if ($meta->{license} =~ s/^#//) { 570 if ($meta->{license} =~ s/^#//) {
522 $meta->{license} = ({ 571 $meta->{license} = ({
523 "pd" => "Public Domain", 572 "pd" => "Public Domain",
524 "gpl" => "GNU General Public License, version 3.0 or any later", 573 "gpl" => "GNU General Public License, version 3.0 or any later",
525 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 574 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
575 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
526 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 576 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
527 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 577 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
528 })->{$meta->{license}} 578 })->{$meta->{license}}
529 || warn "$dir/$file: license tag '$meta->{license}' not found."; 579 || warn "$dir/$file: license tag '$meta->{license}' not found.";
530 } 580 }
531 581
582 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
583 ($meta->{author} = $1) =~ s/_/ /g;
584 }
585
532 $file =~ s/\.res$//; 586 $file =~ s/\.res$//;
533 $file =~ s/\.(ogg|wav|jpg|png)$//; 587 $file =~ s/\.(ogg|wav|jpg|png)$//;
534 588
535 substr $dir, 0, 1 + length $PATH, ""; 589 substr $dir, 0, 1 + length $PATH, "";
536 590
537 if (my $filter = $meta->{cfutil_filter}) { 591 if (my $filter = $meta->{cfutil_filter}) {
538 if ($filter eq "yaml2json") { 592 if ($filter eq "yaml2json") {
539 $data = JSON::XS::encode_json YAML::Load $data; 593 $data = JSON::XS::encode_json YAML::XS::Load $data;
540 } elsif ($filter eq "json2json") { 594 } elsif ($filter eq "json2json") {
541 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 595 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
542 } elsif ($filter eq "perl2json") { 596 } elsif ($filter eq "perl2json") {
543 $data = eval $data; die if $@; 597 $data = eval $data; die if $@;
544 $data = JSON::XS::encode_json $data; 598 $data = JSON::XS::encode_json $data;
… …
562 IO::AIO::aioreq_pri 4; 616 IO::AIO::aioreq_pri 4;
563 IO::AIO::aio_scandir $path, 4, sub { 617 IO::AIO::aio_scandir $path, 4, sub {
564 my ($dirs, $nondirs) = @_; 618 my ($dirs, $nondirs) = @_;
565 619
566 find_files "$path/$_" 620 find_files "$path/$_"
567 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 621 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
568 622
569 my $dir = $path; 623 my $dir = $path;
570 substr $dir, 0, 1 + length $PATH, ""; 624 substr $dir, 0, 1 + length $PATH, "";
571 625
572 for my $file (@$nondirs) { 626 for my $file (@$nondirs) {
… …
599 } else { 653 } else {
600 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 654 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
601 } 655 }
602 } 656 }
603 }; 657 };
658 }
659
660 sub generate_plurals {
661# use Lingua::EN::Inflect ();
662# Lingua::EN::Inflect::classical;
663# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
664# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
665#
666# for my $a (@ARC) {
667# my $name = $a->{name} || $a->{_name};
668#
669# next unless $a->{name_pl};
670# next if $a->{invisible};
671# next if $a->{is_floor};
672# next if $a->{no_pick};
673#
674# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
675# my $pl = $test =~ /^(?:eq|p:.)$/
676# ? $name
677# : Lingua::EN::Inflect::PL $name;
678#
679# if ($pl ne $a->{name_pl}) {
680# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
681# }
682# }
604 } 683 }
605 684
606 sub inst_arch($) { 685 sub inst_arch($) {
607 my (undef, $path) = @_; 686 my (undef, $path) = @_;
608 687
… …
649 $_->join for (@a_trs, @a_res, @a_png); 728 $_->join for (@a_trs, @a_res, @a_png);
650 729
651 print "scanning done, processing results...\n" if $VERBOSE; 730 print "scanning done, processing results...\n" if $VERBOSE;
652 { 731 {
653 # remove path prefix from editor_folder 732 # remove path prefix from editor_folder
733 $_->{editor_folder} =~ /^\x00/
654 substr $_->{editor_folder}, 0, 1 + length $path, "" 734 and substr $_->{editor_folder}, 0, 2 + length $path, ""
655 for values %ARC; 735 for values %ARC;
656 736
657 print "resolving inheritance tree...\n" if $VERBOSE; 737 print "resolving inheritance tree...\n" if $VERBOSE;
658 # resolve inherit 738 # resolve inherit
659 while () { 739 while () {
660 my $progress; 740 my $progress;
661 my $loop; 741 my $loop;
662 742
663 for my $o (values %ARC) { 743 for my $o (values %ARC) {
664 if (my $other = $o->{inherit}) { 744 for my $other (split /,/, $o->{inherit}) {
665 if (my $s = $ARC{$other}) { 745 if (my $s = $ARC{$other}) {
666 if ($s->{inherit}) { 746 if ($s->{inherit}) {
667 $loop = $s; 747 $loop = $s;
668 } else { 748 } else {
669 delete $o->{inherit}; 749 delete $o->{inherit};
… …
688 } 768 }
689 769
690 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 770 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
691 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 771 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
692 772
773 print "generating plurals...\n" if $VERBOSE;
774 generate_plurals;
775
693 print "writing archetypes...\n" if $VERBOSE; 776 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
694 open my $fh, ">:utf8", "$DATADIR/archetypes~" 777 open my $fh, ">:utf8", "$DATADIR/archetypes~"
695 or die "$DATADIR/archetypes~: $!"; 778 or die "$DATADIR/archetypes~: $!";
696 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 779 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
697 } 780 }
698 781
699 { 782 {
700 print "writing treasures...\n" if $VERBOSE; 783 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
701 open my $fh, ">:utf8", "$DATADIR/treasures~" 784 open my $fh, ">:utf8", "$DATADIR/treasures~"
702 or die "$DATADIR/treasures~: $!"; 785 or die "$DATADIR/treasures~: $!";
703 print $fh $TRS; 786 print $fh $TRS;
704 } 787 }
705 788
… …
707 print "processing facedata...\n" if $VERBOSE; 790 print "processing facedata...\n" if $VERBOSE;
708 while (my ($k, $v) = each %FACEINFO) { 791 while (my ($k, $v) = each %FACEINFO) {
709 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 792 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
710 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 793 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
711 794
795 make_hash $k, $v->{data32}, $v->{hash32};
796 make_hash $k, $v->{data64}, $v->{hash64};
797
712 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 798 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
713 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 799 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
714 800
715 if (my $magicmap = $v->{magicmap}) { 801 if (my $magicmap = $v->{magicmap}) {
716 $magicmap =~ y/A-Z_\-/a-z/d; 802 $magicmap =~ y/A-Z_\-/a-z/d;
… …
718 } 804 }
719 805
720 delete $v->{arc}; 806 delete $v->{arc};
721 } 807 }
722 808
723 print "writing facedata...\n" if $VERBOSE; 809 print "processing resources...\n" if $VERBOSE;
810 my $enc = JSON::XS->new->utf8->canonical->relaxed;
811 while (my ($k, $v) = each %RESOURCE) {
812
813 if ($v->{meta} && $v->{meta}{datadir}) {
814 delete $RESOURCE{$k};
815
816 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
817
818 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
819 open my $fh, ">:raw", "$DATADIR/$k~"
820 or die "$DATADIR/$k~: $!";
821 syswrite $fh, $v->{data};
822 push @COMMIT, $k;
823
824 } else {
825 if ($v->{type} & 1) {
826 # prepend meta info
827
828 my $meta = $enc->encode ({
829 name => $k,
830 %{ $v->{meta} || {} },
831 });
832
833 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
834 }
835
836 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
837 }
838 }
839
840 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
841 scalar keys %FACEINFO,
842 scalar keys %ANIMINFO,
843 scalar keys %RESOURCE
844 if $VERBOSE;
845
724 open my $fh, ">:perlio", "$DATADIR/facedata~" 846 open my $fh, ">:perlio", "$DATADIR/facedata~"
725 or die "$DATADIR/facedata~: $!"; 847 or die "$DATADIR/facedata~: $!";
726 848
727 print $fh freeze { 849 print $fh nfreeze {
728 version => 2, 850 version => 2,
729 faceinfo => \%FACEINFO, 851 faceinfo => \%FACEINFO,
730 animinfo => \%ANIMINFO, 852 animinfo => \%ANIMINFO,
731 resource => \%RESOURCE, 853 resource => \%RESOURCE,
732 }; 854 };
855
733 } 856 }
734 857
735 print "committing files...\n" if $VERBOSE; 858 print "committing files...\n" if $VERBOSE;
736 859
737 for (qw(archetypes facedata treasures)) { 860 for (qw(archetypes facedata treasures), @COMMIT) {
738 chmod 0644, "$DATADIR/$_~"; 861 chmod 0644, "$DATADIR/$_~";
739 rename "$DATADIR/$_~", "$DATADIR/$_" 862 rename "$DATADIR/$_~", "$DATADIR/$_"
740 or die "$DATADIR/$_: $!"; 863 or die "$DATADIR/$_: $!";
741 } 864 }
742 865

Diff Legend

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