--- cf.schmorp.de/server/utils/cfutil.in	2007/07/24 04:55:35	1.44
+++ cf.schmorp.de/server/utils/cfutil.in	2007/08/18 20:39:14	1.51
@@ -21,6 +21,7 @@
 use Crossfire;
 use Coro;
 use Coro::AIO;
+use Coro::Util;
 use POSIX ();
 use Digest::MD5;
 use Carp;
@@ -172,10 +173,9 @@
                my $other = "$stem.64x64.png~";
 
                if (0 > aio_lstat $other or (-M _) > (-M $path)) {
-                  my $wrap = 0; # for the time being
                   fork_sub {
-                     system "convert png:\Q$path\E -depth 8 rgba:-"
-                          . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
+                     system "convert -depth 8 png:\Q$path\E rgba:-"
+                          . "| $exec_prefix/bin/cfhq2xa $w $h 0"
                           . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
                              and die "convert/hq2xa pipeline error: status $? ($!)";
                      system $OPTIPNG, "-i0", "-q", "$other~";
@@ -390,6 +390,24 @@
       }
    }
 
+   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};
@@ -397,20 +415,36 @@
          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 };
+
+         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 =~ /\.([^.]+)$/
-            or next;
+         $file =~ s/\.(ogg|wav|jpg|png)$//;
 
          substr $dir, 0, 1 + length $PATH, "";
 
          $RESOURCE{"$dir/$file"} = {
-            type      => $type,
-            copyright => $copyright,
-            data      => $data,
-            chksum    => Digest::MD5::md5 $data,
+            type   => (delete $meta->{type}) || $type,
+            data   => $data,
+            chksum => (Digest::MD5::md5 $data),
+            %$meta ? (meta => $meta) : (),
          };
       }
    }
@@ -434,7 +468,7 @@
                push @res, [$path, $file, 3] # FT_MUSIC
                   if $file =~ /\.(ogg)$/;
 
-            } elsif ($dir =~ /^sounds(?:\/|$)/) {
+            } elsif ($dir =~ /^sound(?:\/|$)/) {
                push @res, [$path, $file, 5] # FT_SOUND
                   if $file =~ /\.(wav|ogg)$/;