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.62 by root, Mon Sep 10 18:30:30 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;
45use YAML::XS ();
46use JSON::XS ();
19use IO::AIO (); 47use IO::AIO ();
20use File::Temp; 48use Digest::MD5 ();
21use Crossfire; 49
22use Coro; 50use Coro 5.12;
23use Coro::AIO; 51use Coro::AIO;
24use Coro::Util; 52use Coro::Util;
25use POSIX ();
26use Carp;
27use Coro::Channel; 53use Coro::Channel;
28use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
29 57
30$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
31 59
32sub usage { 60sub usage {
33 warn <<EOF; 61 warn <<EOF;
… …
46my $VERBOSE = 1; 74my $VERBOSE = 1;
47my $CACHE = 0; 75my $CACHE = 0;
48my $FORCE; 76my $FORCE;
49my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
50my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
51 80
52our %COLOR = ( 81our %COLOR = (
53 black => 0, 82 black => 0,
54 white => 1, 83 white => 1,
55 navy => 2, 84 navy => 2,
… …
65 tan => 12, 94 tan => 12,
66); 95);
67 96
68END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
69 98
70Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
71Event->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}
72 123
73mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
74 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
75 126
76sub fork_sub(&) { 127sub fork_sub(&) {
… …
271 fork_sub { 322 fork_sub {
272 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~";
273 system $OPTIPNG, "-i0", "-q", "$other~"; 324 system $OPTIPNG, "-i0", "-q", "$other~";
274 325
275 # reduce smoothfaces >10000 bytes 326 # reduce smoothfaces >10000 bytes
327 # obsolete, no longer required
276 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 328 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
277 my $ncolor = 256; 329 my $ncolor = 256;
278 while () { 330 while () {
279 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 331 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
280 system $OPTIPNG, "-i0", "-q", "$other~~"; 332 system $OPTIPNG, "-i0", "-q", "$other~~";
281 last if 10000 > -s "$other~~"; 333 last if 10000 > -s "$other~~";
… …
377 push @ARC, $o; 429 push @ARC, $o;
378 for (my $m = $o; $m; $m = $m->{more}) { 430 for (my $m = $o; $m; $m = $m->{more}) {
379 $ARC{$m->{_name}} = $m; 431 $ARC{$m->{_name}} = $m;
380 } 432 }
381 433
382 $o->{editor_folder} = $dir; 434 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
383 435
384 my $visibility = delete $o->{visibility}; 436 my $visibility = delete $o->{visibility};
385 my $magicmap = delete $o->{magicmap}; 437 my $magicmap = delete $o->{magicmap};
386 438
387 # find upper left corner :/ 439 # find upper left corner :/
… …
497 my ($dir, $file, $type) = @$job; 549 my ($dir, $file, $type) = @$job;
498 550
499 my $data; 551 my $data;
500 aio_load "$dir/$file", $data; 552 aio_load "$dir/$file", $data;
501 553
502
503 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 554 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
504 555
505 utf8::decode $dir; 556 utf8::decode $dir;
506 utf8::decode $file; 557 utf8::decode $file;
507 558
… …
519 if ($meta->{license} =~ s/^#//) { 570 if ($meta->{license} =~ s/^#//) {
520 $meta->{license} = ({ 571 $meta->{license} = ({
521 "pd" => "Public Domain", 572 "pd" => "Public Domain",
522 "gpl" => "GNU General Public License, version 3.0 or any later", 573 "gpl" => "GNU General Public License, version 3.0 or any later",
523 "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/",
524 "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/",
525 "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/",
526 })->{$meta->{license}} 578 })->{$meta->{license}}
527 || warn "$dir/$file: license tag '$meta->{license}' not found."; 579 || warn "$dir/$file: license tag '$meta->{license}' not found.";
528 } 580 }
529 581
582 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
583 ($meta->{author} = $1) =~ s/_/ /g;
584 }
585
530 $file =~ s/\.res$//; 586 $file =~ s/\.res$//;
531 $file =~ s/\.(ogg|wav|jpg|png)$//; 587 $file =~ s/\.(ogg|wav|jpg|png)$//;
532 588
533 substr $dir, 0, 1 + length $PATH, ""; 589 substr $dir, 0, 1 + length $PATH, "";
534 590
591 if (my $filter = $meta->{cfutil_filter}) {
592 if ($filter eq "yaml2json") {
593 $data = JSON::XS::encode_json YAML::XS::Load $data;
594 } elsif ($filter eq "json2json") {
595 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
596 } elsif ($filter eq "perl2json") {
597 $data = eval $data; die if $@;
598 $data = JSON::XS::encode_json $data;
599 } else {
600 warn "$dir/$file: unknown filter $filter, skipping\n";
601 }
602 }
603
535 $RESOURCE{"$dir/$file"} = { 604 $RESOURCE{"$dir/$file"} = {
536 type => (delete $meta->{type}) || $type, 605 type => (exists $meta->{type} ? delete $meta->{type} : $type),
537 data => $data, 606 data => $data,
538 %$meta ? (meta => $meta) : (), 607 %$meta ? (meta => $meta) : (),
539 }; 608 };
540 } 609 }
541 } 610 }
… …
547 IO::AIO::aioreq_pri 4; 616 IO::AIO::aioreq_pri 4;
548 IO::AIO::aio_scandir $path, 4, sub { 617 IO::AIO::aio_scandir $path, 4, sub {
549 my ($dirs, $nondirs) = @_; 618 my ($dirs, $nondirs) = @_;
550 619
551 find_files "$path/$_" 620 find_files "$path/$_"
552 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 621 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
553 622
554 my $dir = $path; 623 my $dir = $path;
555 substr $dir, 0, 1 + length $PATH, ""; 624 substr $dir, 0, 1 + length $PATH, "";
556 625
557 for my $file (@$nondirs) { 626 for my $file (@$nondirs) {
… …
562 } elsif ($dir =~ /^sound(?:\/|$)/) { 631 } elsif ($dir =~ /^sound(?:\/|$)/) {
563 $c_res->put ([$path, $file, 5]) # FT_SOUND 632 $c_res->put ([$path, $file, 5]) # FT_SOUND
564 if $file =~ /\.(wav|ogg)$/; 633 if $file =~ /\.(wav|ogg)$/;
565 634
566 } elsif ($dir =~ /^res(?:\/|$)/) { 635 } elsif ($dir =~ /^res(?:\/|$)/) {
636 if ($file =~ /\.(jpg|png)$/) {
567 $c_res->put ([$path, $file, 0]) # FT_FACE 637 $c_res->put ([$path, $file, 0]) # FT_FACE
568 if $file =~ /\.(jpg|png)$/; 638 } elsif ($file =~ /\.(res)$/) {
569 $c_res->put ([$path, $file, 7]) # FT_RSRC 639 $c_res->put ([$path, $file, 6]) # FT_RSRC
570 if $file =~ /\.(res)$/; 640 } else {
641 $c_res->put ([$path, $file, undef]);
642 }
571 643
572 } elsif ($file =~ /\.png$/) { 644 } elsif ($file =~ /\.png$/) {
573 push @c_png, ["$path/$file", 0]; 645 push @c_png, ["$path/$file", 0];
574 646
575 } elsif ($file =~ /\.trs$/) { 647 } elsif ($file =~ /\.trs$/) {
… …
581 } else { 653 } else {
582 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 654 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
583 } 655 }
584 } 656 }
585 }; 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# }
586 } 683 }
587 684
588 sub inst_arch($) { 685 sub inst_arch($) {
589 my (undef, $path) = @_; 686 my (undef, $path) = @_;
590 687
… …
613 my @a_res = map +(async \&process_res), 1..2; 710 my @a_res = map +(async \&process_res), 1..2;
614 my @a_trs = map +(async \&process_trs), 1..2; 711 my @a_trs = map +(async \&process_trs), 1..2;
615 712
616 IO::AIO::flush; 713 IO::AIO::flush;
617 714
618 $c_res->put (undef) for @a_res; 715 $c_res->shutdown;
619 $c_arc->put (undef) for @a_arc; 716 $c_arc->shutdown;
620 $c_trs->put (undef) for @a_trs; 717 $c_trs->shutdown;
621 718
622 print "start file scan, arc, res processing...\n" if $VERBOSE; 719 print "start file scan, arc, res processing...\n" if $VERBOSE;
623 720
624 $_->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
625 722
626 print "end arc, start png processing...\n" if $VERBOSE; 723 print "end arc, start png processing...\n" if $VERBOSE;
627 724
628 # four png crunchers work fine for my 2x smp machine 725 # eight png crunchers work fine for my 4x smp machine
629 my @a_png = map +(async \&process_png), 1..4; 726 my @a_png = map +(async \&process_png), 1..8;
630 727
631 $_->join for (@a_trs, @a_res, @a_png); 728 $_->join for (@a_trs, @a_res, @a_png);
632 729
633 print "scanning done, processing results...\n" if $VERBOSE; 730 print "scanning done, processing results...\n" if $VERBOSE;
634 { 731 {
635 # remove path prefix from editor_folder 732 # remove path prefix from editor_folder
733 $_->{editor_folder} =~ /^\x00/
636 substr $_->{editor_folder}, 0, 1 + length $path, "" 734 and substr $_->{editor_folder}, 0, 2 + length $path, ""
637 for values %ARC; 735 for values %ARC;
638 736
639 print "resolving inheritance tree...\n" if $VERBOSE; 737 print "resolving inheritance tree...\n" if $VERBOSE;
640 # resolve inherit 738 # resolve inherit
641 while () { 739 while () {
642 my $progress; 740 my $progress;
643 my $loop; 741 my $loop;
644 742
645 for my $o (values %ARC) { 743 for my $o (values %ARC) {
646 if (my $other = $o->{inherit}) { 744 for my $other (split /,/, $o->{inherit}) {
647 if (my $s = $ARC{$other}) { 745 if (my $s = $ARC{$other}) {
648 if ($s->{inherit}) { 746 if ($s->{inherit}) {
649 $loop = $s; 747 $loop = $s;
650 } else { 748 } else {
651 delete $o->{inherit}; 749 delete $o->{inherit};
… …
670 } 768 }
671 769
672 # 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
673 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 771 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
674 772
773 print "generating plurals...\n" if $VERBOSE;
774 generate_plurals;
775
675 print "writing archetypes...\n" if $VERBOSE; 776 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
676 open my $fh, ">:utf8", "$DATADIR/archetypes~" 777 open my $fh, ">:utf8", "$DATADIR/archetypes~"
677 or die "$DATADIR/archetypes~: $!"; 778 or die "$DATADIR/archetypes~: $!";
678 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 779 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
679 } 780 }
680 781
681 { 782 {
682 print "writing treasures...\n" if $VERBOSE; 783 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
683 open my $fh, ">:utf8", "$DATADIR/treasures~" 784 open my $fh, ">:utf8", "$DATADIR/treasures~"
684 or die "$DATADIR/treasures~: $!"; 785 or die "$DATADIR/treasures~: $!";
685 print $fh $TRS; 786 print $fh $TRS;
686 } 787 }
687 788
… …
689 print "processing facedata...\n" if $VERBOSE; 790 print "processing facedata...\n" if $VERBOSE;
690 while (my ($k, $v) = each %FACEINFO) { 791 while (my ($k, $v) = each %FACEINFO) {
691 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";
692 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";
693 794
795 make_hash $k, $v->{data32}, $v->{hash32};
796 make_hash $k, $v->{data64}, $v->{hash64};
797
694 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";
695 #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";
696 800
697 if (my $magicmap = $v->{magicmap}) { 801 if (my $magicmap = $v->{magicmap}) {
698 $magicmap =~ y/A-Z_\-/a-z/d; 802 $magicmap =~ y/A-Z_\-/a-z/d;
699 $v->{magicmap} = $COLOR{$magicmap}; 803 $v->{magicmap} = $COLOR{$magicmap};
700 } 804 }
701 805
702 delete $v->{arc}; 806 delete $v->{arc};
703 } 807 }
704 808
705 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
706 open my $fh, ">:perlio", "$DATADIR/facedata~" 846 open my $fh, ">:perlio", "$DATADIR/facedata~"
707 or die "$DATADIR/facedata~: $!"; 847 or die "$DATADIR/facedata~: $!";
708 848
709 print $fh freeze { 849 print $fh nfreeze {
710 version => 2, 850 version => 2,
711 faceinfo => \%FACEINFO, 851 faceinfo => \%FACEINFO,
712 animinfo => \%ANIMINFO, 852 animinfo => \%ANIMINFO,
713 resource => \%RESOURCE, 853 resource => \%RESOURCE,
714 }; 854 };
855
715 } 856 }
716 857
717 print "committing files...\n" if $VERBOSE; 858 print "committing files...\n" if $VERBOSE;
718 859
719 for (qw(archetypes facedata treasures)) { 860 for (qw(archetypes facedata treasures), @COMMIT) {
720 chmod 0644, "$DATADIR/$_~"; 861 chmod 0644, "$DATADIR/$_~";
721 rename "$DATADIR/$_~", "$DATADIR/$_" 862 rename "$DATADIR/$_~", "$DATADIR/$_"
722 or die "$DATADIR/$_: $!"; 863 or die "$DATADIR/$_: $!";
723 } 864 }
724 865

Diff Legend

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