--- deliantra/server/utils/cfutil.in 2007/08/21 19:44:57 1.58
+++ deliantra/server/utils/cfutil.in 2009/11/04 13:46:37 1.78
@@ -1,5 +1,27 @@
#!@PERL@
+#
+# This file is part of Deliantra, the Roguelike Realtime MMORPG.
+#
+# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+#
+# Deliantra is free software: you can redistribute it and/or modify it under
+# the terms of the Affero GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the Affero GNU General Public License
+# and the GNU General Public License along with this program. If not, see
+# .
+#
+# The authors can be reached via e-mail to
+#
+
use strict;
my $prefix = "@prefix@";
@@ -14,19 +36,24 @@
my $PNGNQ = "@PNGNQ@";
use Getopt::Long;
-use Coro::Event;
+use File::Temp;
+use POSIX ();
+use Carp;
+
+use Coro::EV;
use AnyEvent;
+use YAML::XS ();
+use JSON::XS ();
use IO::AIO ();
-use File::Temp;
-use Crossfire;
-use Coro;
+
+use Coro 5.12;
use Coro::AIO;
use Coro::Util;
-use POSIX ();
-use Carp;
use Coro::Channel;
use Coro::Storable; $Storable::canonical = 1;
+use Deliantra;
+
$SIG{QUIT} = sub { Carp::cluck "QUIT" };
sub usage {
@@ -67,8 +94,8 @@
END { system "rm", "-rf", $TMPDIR }
-Event->signal (signal => "INT", cb => sub { exit 1 });
-Event->signal (signal => "TERM", cb => sub { exit 1 });
+my $s_INT = EV::signal INT => sub { exit 1 };
+my $s_TERM = EV::signal TERM => sub { exit 1 };
mkdir $TMPDIR, 0700
or die "$TMPDIR: $!";
@@ -98,7 +125,10 @@
exit 1 unless $FORCE;
}
- system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
+ system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
+ "$path/.", "$DATADIR/maps/.",
+ "--exclude", "CVS", "--exclude", "/world-precomposed",
+ "--delete", "--delete-excluded"
and die "map installation failed.\n";
print "maps installed successfully.\n";
@@ -175,12 +205,11 @@
my $fi = $FACEINFO{$base};
unless ($fi) {
- warn "$path: <$base> not referenced by any archetype, skipping.\n";
- next;
+ #warn "$path: <$base> not referenced by any archetype, skipping.\n";
+ #next;
}
- my $arc = $FACEINFO{$base}{arc}
- or die "FATAL: internal error <$base>, cannot continue";
+ my $arc = $fi->{arc} || { };
unless ($path =~ /~$/) {
# possibly enlarge
@@ -271,7 +300,8 @@
system $OPTIPNG, "-i0", "-q", "$other~";
# reduce smoothfaces >10000 bytes
- if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
+ # obsolete, no longer required
+ if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
my $ncolor = 256;
while () {
system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
@@ -377,7 +407,7 @@
$ARC{$m->{_name}} = $m;
}
- $o->{editor_folder} = $dir;
+ $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
my $visibility = delete $o->{visibility};
my $magicmap = delete $o->{magicmap};
@@ -497,9 +527,16 @@
my $data;
aio_load "$dir/$file", $data;
- my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
+ my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
+
+ utf8::decode $dir;
+ utf8::decode $file;
- next if $meta && !exists $meta->{$file};
+ # a meta file for resources is now mandatory
+ unless (exists $meta->{$file}) {
+ warn "skipping $dir/$file\n" if $VERBOSE >= 3;
+ next;
+ }
$meta = {
%{ $meta->{"" } || {} },
@@ -522,8 +559,21 @@
substr $dir, 0, 1 + length $PATH, "";
+ if (my $filter = $meta->{cfutil_filter}) {
+ if ($filter eq "yaml2json") {
+ $data = JSON::XS::encode_json YAML::XS::Load $data;
+ } elsif ($filter eq "json2json") {
+ $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
+ } elsif ($filter eq "perl2json") {
+ $data = eval $data; die if $@;
+ $data = JSON::XS::encode_json $data;
+ } else {
+ warn "$dir/$file: unknown filter $filter, skipping\n";
+ }
+ }
+
$RESOURCE{"$dir/$file"} = {
- type => (delete $meta->{type}) || $type,
+ type => (exists $meta->{type} ? delete $meta->{type} : $type),
data => $data,
%$meta ? (meta => $meta) : (),
};
@@ -554,10 +604,13 @@
if $file =~ /\.(wav|ogg)$/;
} elsif ($dir =~ /^res(?:\/|$)/) {
- $c_res->put ([$path, $file, 0]) # FT_FACE
- if $file =~ /\.(jpg|png)$/;
- $c_res->put ([$path, $file, 7]) # FT_RSRC
- if $file =~ /\.(res)$/;
+ if ($file =~ /\.(jpg|png)$/) {
+ $c_res->put ([$path, $file, 0]) # FT_FACE
+ } elsif ($file =~ /\.(res)$/) {
+ $c_res->put ([$path, $file, 6]) # FT_RSRC
+ } else {
+ $c_res->put ([$path, $file, undef]);
+ }
} elsif ($file =~ /\.png$/) {
push @c_png, ["$path/$file", 0];
@@ -575,6 +628,31 @@
};
}
+ sub generate_plurals {
+# use Lingua::EN::Inflect ();
+# Lingua::EN::Inflect::classical;
+# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
+# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
+#
+# for my $a (@ARC) {
+# my $name = $a->{name} || $a->{_name};
+#
+# next unless $a->{name_pl};
+# next if $a->{invisible};
+# next if $a->{is_floor};
+# next if $a->{no_pick};
+#
+# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
+# my $pl = $test =~ /^(?:eq|p:.)$/
+# ? $name
+# : Lingua::EN::Inflect::PL $name;
+#
+# if ($pl ne $a->{name_pl}) {
+# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
+# }
+# }
+ }
+
sub inst_arch($) {
my (undef, $path) = @_;
@@ -605,9 +683,9 @@
IO::AIO::flush;
- $c_res->put (undef) for @a_res;
- $c_arc->put (undef) for @a_arc;
- $c_trs->put (undef) for @a_trs;
+ $c_res->shutdown;
+ $c_arc->shutdown;
+ $c_trs->shutdown;
print "start file scan, arc, res processing...\n" if $VERBOSE;
@@ -615,16 +693,17 @@
print "end arc, start png processing...\n" if $VERBOSE;
- # four png crunchers work fine for my 2x smp machine
- my @a_png = map +(async \&process_png), 1..4;
+ # eight png crunchers work fine for my 4x smp machine
+ my @a_png = map +(async \&process_png), 1..8;
$_->join for (@a_trs, @a_res, @a_png);
print "scanning done, processing results...\n" if $VERBOSE;
{
# remove path prefix from editor_folder
- substr $_->{editor_folder}, 0, 1 + length $path, ""
- for values %ARC;
+ $_->{editor_folder} =~ /^\x00/
+ and substr $_->{editor_folder}, 0, 2 + length $path, ""
+ for values %ARC;
print "resolving inheritance tree...\n" if $VERBOSE;
# resolve inherit
@@ -662,14 +741,17 @@
# remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
@ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
- print "writing archetypes...\n" if $VERBOSE;
+ print "generating plurals...\n" if $VERBOSE;
+ generate_plurals;
+
+ printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
open my $fh, ">:utf8", "$DATADIR/archetypes~"
or die "$DATADIR/archetypes~: $!";
- print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
+ print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
}
{
- print "writing treasures...\n" if $VERBOSE;
+ printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
open my $fh, ">:utf8", "$DATADIR/treasures~"
or die "$DATADIR/treasures~: $!";
print $fh $TRS;
@@ -681,7 +763,7 @@
length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
- length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
+ #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
#length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
if (my $magicmap = $v->{magicmap}) {
@@ -692,7 +774,12 @@
delete $v->{arc};
}
- print "writing facedata...\n" if $VERBOSE;
+ printf "writing facedata (%d faces, %d anims, %d resources)...\n",
+ scalar keys %FACEINFO,
+ scalar keys %ANIMINFO,
+ scalar keys %RESOURCE
+ if $VERBOSE;
+
open my $fh, ">:perlio", "$DATADIR/facedata~"
or die "$DATADIR/facedata~: $!";
@@ -702,6 +789,7 @@
animinfo => \%ANIMINFO,
resource => \%RESOURCE,
};
+
}
print "committing files...\n" if $VERBOSE;