--- deliantra/server/utils/cfutil.in	2007/08/27 02:43:38	1.60
+++ deliantra/server/utils/cfutil.in	2008/01/15 12:02:24	1.69
@@ -14,11 +14,13 @@
 my $PNGNQ    = "@PNGNQ@";
 
 use Getopt::Long;
-use Coro::Event;
+use Coro::EV;
 use AnyEvent;
+use YAML ();
+use JSON::XS ();
 use IO::AIO ();
 use File::Temp;
-use Crossfire;
+use Deliantra;
 use Coro;
 use Coro::AIO;
 use Coro::Util;
@@ -67,8 +69,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 +100,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";
@@ -498,7 +503,14 @@
 
          my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
 
-         next if $meta && !exists $meta->{$file};
+         utf8::decode $dir;
+         utf8::decode $file;
+
+         # a meta file for resources is now mandatory
+         unless (exists $meta->{$file}) {
+            warn "skipping $dir/$file\n" if $VERBOSE >= 3;
+            next;
+         }
 
          $meta = {
             %{ $meta->{""   } || {} },
@@ -521,8 +533,21 @@
 
          substr $dir, 0, 1 + length $PATH, "";
 
+         if (my $filter = $meta->{cfutil_filter}) {
+            if ($filter eq "yaml2json") {
+               $data = JSON::XS::encode_json YAML::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) : (),
          };
@@ -553,10 +578,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];
@@ -614,8 +642,8 @@
 
       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);
 
@@ -664,7 +692,7 @@
          print "writing archetypes...\n" 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];
       }
 
       {