--- deliantra/server/utils/cfutil.in	2007/07/12 08:40:14	1.38
+++ deliantra/server/utils/cfutil.in	2007/07/25 22:30:38	1.46
@@ -23,8 +23,11 @@
 use Coro::AIO;
 use POSIX ();
 use Digest::MD5;
+use Carp;
 use Coro::Storable; $Storable::canonical = 1;
 
+$SIG{QUIT} = sub { Carp::cluck "QUIT" };
+
 sub usage {
    warn <<EOF;
 Usage: cfutil [-v] [-q] [--force] [--cache]
@@ -94,7 +97,7 @@
       exit 1 unless $FORCE;
    }
 
-   system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
+   system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
       and die "map installation failed.\n";
 
    print "maps installed successfully.\n";
@@ -387,29 +390,46 @@
       }
    }
 
+   my %FILECACHE;
+
+   sub load_cached($;$) {
+      unless (exists $FILECACHE{$_[0]}) {
+         my $data;
+         if (0 < aio_load $_[0], $data) {
+            $data = $_[1]->($data)
+               if $_[1];
+         }
+
+         $FILECACHE{$_[0]} = $data;
+      }
+
+      $FILECACHE{$_[0]}
+   }
+
    sub process_res {
       while (@res) {
-         my ($dir, $file) = @{pop @res};
+         my ($dir, $file, $type) = @{pop @res};
 
          my $data;
          aio_load "$dir/$file", $data;
 
-         my $copyright;
-         aio_load "$dir/copyright", $copyright;
+         my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
 
          $file =~ s/\.res$//;
-         $file =~ /\.([^.]+)$/
-            or next;
-
-         my $type = $1;
+         $file =~ s/\.(ogg|wav|jpg|png)$//;
 
          substr $dir, 0, 1 + length $PATH, "";
 
+         $meta = {
+            %{ $meta->{""   } || {} },
+            %{ $meta->{$file} || {} },
+         };
+
          $RESOURCE{"$dir/$file"} = {
-            type      => $1,
-            copyright => $copyright,
-            data      => $data,
-            chksum    => Digest::MD5::md5 $data,
+            type   => (delete $meta->{type}) || $type,
+            data   => $data,
+            chksum => (Digest::MD5::md5 $data),
+            %$meta ? (meta => $meta) : (),
          };
       }
    }
@@ -425,15 +445,33 @@
          find_files "$path/$_"
             for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
 
+         my $dir = $path;
+         substr $dir, 0, 1 + length $PATH, "";
+
          for my $file (@$nondirs) {
-            if ($file =~ /\.png$/) {
+            if ($dir =~ /^music(?:\/|$)/) {
+               push @res, [$path, $file, 3] # FT_MUSIC
+                  if $file =~ /\.(ogg)$/;
+
+            } elsif ($dir =~ /^sounds(?:\/|$)/) {
+               push @res, [$path, $file, 5] # FT_SOUND
+                  if $file =~ /\.(wav|ogg)$/;
+
+            } elsif ($dir =~ /^res(?:\/|$)/) {
+               push @res, [$path, $file, 0] # FT_FACE
+                  if $file =~ /\.(jpg|png)$/;
+               push @res, [$path, $file, 7] # FT_RSRC
+                  if $file =~ /\.(res)$/;
+
+            } elsif ($file =~ /\.png$/) {
                push @png, ["$path/$file", 0];
+
             } elsif ($file =~ /\.trs$/) {
                push @trs, [$path, $file];
+
             } elsif ($file =~ /\.arc$/) {
                push @arc, [$path, $file];
-            } elsif ($file =~ /\.(ogg|res)$/) {
-               push @res, [$path, $file];
+
             } else {
                warn "ignoring $path/$file\n" if $VERBOSE >= 3;
             }