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.67 by root, Fri Dec 28 12:44:45 2007 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::Event; 43use Coro::EV;
18use AnyEvent; 44use AnyEvent;
19use YAML::Syck (); 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; 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,
… …
67 tan => 12, 94 tan => 12,
68); 95);
69 96
70END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
71 98
72Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
73Event->signal (signal => "TERM", cb => 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(&) {
… …
273 fork_sub { 322 fork_sub {
274 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 323 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
275 system $OPTIPNG, "-i0", "-q", "$other~"; 324 system $OPTIPNG, "-i0", "-q", "$other~";
276 325
277 # reduce smoothfaces >10000 bytes 326 # reduce smoothfaces >10000 bytes
327 # obsolete, no longer required
278 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 328 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
279 my $ncolor = 256; 329 my $ncolor = 256;
280 while () { 330 while () {
281 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 331 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
282 system $OPTIPNG, "-i0", "-q", "$other~~"; 332 system $OPTIPNG, "-i0", "-q", "$other~~";
283 last if 10000 > -s "$other~~"; 333 last if 10000 > -s "$other~~";
… …
379 push @ARC, $o; 429 push @ARC, $o;
380 for (my $m = $o; $m; $m = $m->{more}) { 430 for (my $m = $o; $m; $m = $m->{more}) {
381 $ARC{$m->{_name}} = $m; 431 $ARC{$m->{_name}} = $m;
382 } 432 }
383 433
384 $o->{editor_folder} = $dir; 434 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
385 435
386 my $visibility = delete $o->{visibility}; 436 my $visibility = delete $o->{visibility};
387 my $magicmap = delete $o->{magicmap}; 437 my $magicmap = delete $o->{magicmap};
388 438
389 # find upper left corner :/ 439 # find upper left corner :/
… …
520 if ($meta->{license} =~ s/^#//) { 570 if ($meta->{license} =~ s/^#//) {
521 $meta->{license} = ({ 571 $meta->{license} = ({
522 "pd" => "Public Domain", 572 "pd" => "Public Domain",
523 "gpl" => "GNU General Public License, version 3.0 or any later", 573 "gpl" => "GNU General Public License, version 3.0 or any later",
524 "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/",
525 "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/",
526 "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/",
527 })->{$meta->{license}} 578 })->{$meta->{license}}
528 || warn "$dir/$file: license tag '$meta->{license}' not found."; 579 || warn "$dir/$file: license tag '$meta->{license}' not found.";
529 } 580 }
530 581
582 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
583 ($meta->{author} = $1) =~ s/_/ /g;
584 }
585
531 $file =~ s/\.res$//; 586 $file =~ s/\.res$//;
532 $file =~ s/\.(ogg|wav|jpg|png)$//; 587 $file =~ s/\.(ogg|wav|jpg|png)$//;
533 588
534 substr $dir, 0, 1 + length $PATH, ""; 589 substr $dir, 0, 1 + length $PATH, "";
535 590
536 if (my $filter = $meta->{cfutil_filter}) { 591 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") { 592 if ($filter eq "yaml2json") {
538 $data = JSON::XS::encode_json YAML::Syck::Load $data; 593 $data = JSON::XS::encode_json YAML::XS::Load $data;
539 } elsif ($filter eq "json2json") { 594 } elsif ($filter eq "json2json") {
540 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 595 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
541 } elsif ($filter eq "perl2json") { 596 } elsif ($filter eq "perl2json") {
542 $data = eval $data; die if $@; 597 $data = eval $data; die if $@;
543 $data = JSON::XS::encode_json $data; 598 $data = JSON::XS::encode_json $data;
… …
561 IO::AIO::aioreq_pri 4; 616 IO::AIO::aioreq_pri 4;
562 IO::AIO::aio_scandir $path, 4, sub { 617 IO::AIO::aio_scandir $path, 4, sub {
563 my ($dirs, $nondirs) = @_; 618 my ($dirs, $nondirs) = @_;
564 619
565 find_files "$path/$_" 620 find_files "$path/$_"
566 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 621 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
567 622
568 my $dir = $path; 623 my $dir = $path;
569 substr $dir, 0, 1 + length $PATH, ""; 624 substr $dir, 0, 1 + length $PATH, "";
570 625
571 for my $file (@$nondirs) { 626 for my $file (@$nondirs) {
… …
598 } else { 653 } else {
599 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 654 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
600 } 655 }
601 } 656 }
602 }; 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# }
603 } 683 }
604 684
605 sub inst_arch($) { 685 sub inst_arch($) {
606 my (undef, $path) = @_; 686 my (undef, $path) = @_;
607 687
… …
630 my @a_res = map +(async \&process_res), 1..2; 710 my @a_res = map +(async \&process_res), 1..2;
631 my @a_trs = map +(async \&process_trs), 1..2; 711 my @a_trs = map +(async \&process_trs), 1..2;
632 712
633 IO::AIO::flush; 713 IO::AIO::flush;
634 714
635 $c_res->put (undef) for @a_res; 715 $c_res->shutdown;
636 $c_arc->put (undef) for @a_arc; 716 $c_arc->shutdown;
637 $c_trs->put (undef) for @a_trs; 717 $c_trs->shutdown;
638 718
639 print "start file scan, arc, res processing...\n" if $VERBOSE; 719 print "start file scan, arc, res processing...\n" if $VERBOSE;
640 720
641 $_->join for @a_arc; # need to parse all archetypes before png processing 721 $_->join for @a_arc; # need to parse all archetypes before png processing
642 722
643 print "end arc, start png processing...\n" if $VERBOSE; 723 print "end arc, start png processing...\n" if $VERBOSE;
644 724
645 # four png crunchers work fine for my 2x smp machine 725 # eight png crunchers work fine for my 4x smp machine
646 my @a_png = map +(async \&process_png), 1..4; 726 my @a_png = map +(async \&process_png), 1..8;
647 727
648 $_->join for (@a_trs, @a_res, @a_png); 728 $_->join for (@a_trs, @a_res, @a_png);
649 729
650 print "scanning done, processing results...\n" if $VERBOSE; 730 print "scanning done, processing results...\n" if $VERBOSE;
651 { 731 {
652 # remove path prefix from editor_folder 732 # remove path prefix from editor_folder
733 $_->{editor_folder} =~ /^\x00/
653 substr $_->{editor_folder}, 0, 1 + length $path, "" 734 and substr $_->{editor_folder}, 0, 2 + length $path, ""
654 for values %ARC; 735 for values %ARC;
655 736
656 print "resolving inheritance tree...\n" if $VERBOSE; 737 print "resolving inheritance tree...\n" if $VERBOSE;
657 # resolve inherit 738 # resolve inherit
658 while () { 739 while () {
659 my $progress; 740 my $progress;
660 my $loop; 741 my $loop;
661 742
662 for my $o (values %ARC) { 743 for my $o (values %ARC) {
663 if (my $other = $o->{inherit}) { 744 for my $other (split /,/, $o->{inherit}) {
664 if (my $s = $ARC{$other}) { 745 if (my $s = $ARC{$other}) {
665 if ($s->{inherit}) { 746 if ($s->{inherit}) {
666 $loop = $s; 747 $loop = $s;
667 } else { 748 } else {
668 delete $o->{inherit}; 749 delete $o->{inherit};
… …
687 } 768 }
688 769
689 # 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
690 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 771 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
691 772
773 print "generating plurals...\n" if $VERBOSE;
774 generate_plurals;
775
692 print "writing archetypes...\n" if $VERBOSE; 776 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
693 open my $fh, ">:utf8", "$DATADIR/archetypes~" 777 open my $fh, ">:utf8", "$DATADIR/archetypes~"
694 or die "$DATADIR/archetypes~: $!"; 778 or die "$DATADIR/archetypes~: $!";
695 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];
696 } 780 }
697 781
698 { 782 {
699 print "writing treasures...\n" if $VERBOSE; 783 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
700 open my $fh, ">:utf8", "$DATADIR/treasures~" 784 open my $fh, ">:utf8", "$DATADIR/treasures~"
701 or die "$DATADIR/treasures~: $!"; 785 or die "$DATADIR/treasures~: $!";
702 print $fh $TRS; 786 print $fh $TRS;
703 } 787 }
704 788
… …
706 print "processing facedata...\n" if $VERBOSE; 790 print "processing facedata...\n" if $VERBOSE;
707 while (my ($k, $v) = each %FACEINFO) { 791 while (my ($k, $v) = each %FACEINFO) {
708 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";
709 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";
710 794
795 make_hash $k, $v->{data32}, $v->{hash32};
796 make_hash $k, $v->{data64}, $v->{hash64};
797
711 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";
712 #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";
713 800
714 if (my $magicmap = $v->{magicmap}) { 801 if (my $magicmap = $v->{magicmap}) {
715 $magicmap =~ y/A-Z_\-/a-z/d; 802 $magicmap =~ y/A-Z_\-/a-z/d;
716 $v->{magicmap} = $COLOR{$magicmap}; 803 $v->{magicmap} = $COLOR{$magicmap};
717 } 804 }
718 805
719 delete $v->{arc}; 806 delete $v->{arc};
720 } 807 }
721 808
722 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
723 open my $fh, ">:perlio", "$DATADIR/facedata~" 846 open my $fh, ">:perlio", "$DATADIR/facedata~"
724 or die "$DATADIR/facedata~: $!"; 847 or die "$DATADIR/facedata~: $!";
725 848
726 print $fh freeze { 849 print $fh nfreeze {
727 version => 2, 850 version => 2,
728 faceinfo => \%FACEINFO, 851 faceinfo => \%FACEINFO,
729 animinfo => \%ANIMINFO, 852 animinfo => \%ANIMINFO,
730 resource => \%RESOURCE, 853 resource => \%RESOURCE,
731 }; 854 };
855
732 } 856 }
733 857
734 print "committing files...\n" if $VERBOSE; 858 print "committing files...\n" if $VERBOSE;
735 859
736 for (qw(archetypes facedata treasures)) { 860 for (qw(archetypes facedata treasures), @COMMIT) {
737 chmod 0644, "$DATADIR/$_~"; 861 chmod 0644, "$DATADIR/$_~";
738 rename "$DATADIR/$_~", "$DATADIR/$_" 862 rename "$DATADIR/$_~", "$DATADIR/$_"
739 or die "$DATADIR/$_: $!"; 863 or die "$DATADIR/$_: $!";
740 } 864 }
741 865

Diff Legend

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