--- deliantra/server/utils/cfutil.in	2007/06/03 15:32:51	1.35
+++ deliantra/server/utils/cfutil.in	2007/08/09 22:54:28	1.50
@@ -8,7 +8,7 @@
 my $DATADIR     = "@datadir@/@PACKAGE@";
 
 my $CONVERT  = "@CONVERT@";
-my $IDENTIFY = "@IDENTIFY@";
+#my $IDENTIFY = "@IDENTIFY@";
 my $OPTIPNG  = "@OPTIPNG@";
 my $RSYNC    = "@RSYNC@";
 my $PNGNQ    = "@PNGNQ@";
@@ -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";
@@ -103,14 +106,16 @@
 {
    our %ANIMINFO;
    our %FACEINFO;
+   our %RESOURCE;
    our @ARC;
    our %ARC;
    our $TRS;
    our $NFILE;
+   our $PATH;
 
    our $QUANTIZE = "+dither -colorspace RGB -colors 256";
 
-   our (@png, @trs, @arc); # files we are interested in
+   our (@png, @trs, @arc, @res); # files we are interested in
 
    sub commit_png($$$) {
       my ($name, $data, $T) = @_;
@@ -385,6 +390,65 @@
       }
    }
 
+   my %FILECACHE;
+
+   sub load_cached($;$) {
+      unless (exists $FILECACHE{$_[0]}) {
+         my $data;
+         if (0 < aio_load $_[0], $data) {
+            if ($_[1]) {
+               $data = eval { $_[1]->($data) };
+               warn "$_[0]: $@" if $@;
+            }
+         }
+
+         $FILECACHE{$_[0]} = $data;
+      }
+
+      $FILECACHE{$_[0]}
+   }
+
+   sub process_res {
+      while (@res) {
+         my ($dir, $file, $type) = @{pop @res};
+
+         my $data;
+         aio_load "$dir/$file", $data;
+
+         my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
+
+         next if $meta && !exists $meta->{$file};
+
+         $meta = {
+            %{ $meta->{""   } || {} },
+            %{ $meta->{$file} || {} },
+         };
+
+         if ($meta->{license} =~ s/^#//) {
+            $meta->{license} = ({
+               "pd"              => "Public Domain",
+               "gpl"             => "GNU General Public License, version 3.0 or any later",
+               "cc/by/2.0"       => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
+               "cc/by/2.5"       => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.5/",
+               "cc/by/3.0"       => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
+            })->{$meta->{license}}
+              || warn "$dir/$file: license tag '$meta->{license}' not found.";
+         }
+
+         $file =~ s/\.res$//;
+         $file =~ s/\.(ogg|wav|jpg|png)$//;
+
+         substr $dir, 0, 1 + length $PATH, "";
+
+         $RESOURCE{"$dir/$file"} = {
+            type   => (delete $meta->{type}) || $type,
+            data   => $data,
+            chksum => (Digest::MD5::md5 $data),
+            %$meta ? (meta => $meta) : (),
+         };
+      }
+   }
+
    sub find_files;
    sub find_files {
       my ($path) = @_;
@@ -396,13 +460,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 =~ /^sound(?:\/|$)/) {
+               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];
+
             } else {
                warn "ignoring $path/$file\n" if $VERBOSE >= 3;
             }
@@ -413,6 +497,8 @@
    sub inst_arch($) {
       my (undef, $path) = @_;
 
+      $PATH = $path;
+
       print "\n",
             "Installing '$path' to '$DATADIR'\n",
             "\n",
@@ -436,6 +522,7 @@
          (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
          (async \&process_trs), (async \&process_trs),
          (async \&process_arc), (async \&process_arc),
+         (async \&process_res), (async \&process_res),
       );
 
       {
@@ -513,6 +600,7 @@
             version => 2,
             faceinfo => \%FACEINFO,
             animinfo => \%ANIMINFO,
+            resource => \%RESOURCE,
          };
       }