[ViewVC] Diff of: cvs/deliantra/server/utils/cfutil.in

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.24 by root, Thu Apr 12 14:18:06 2007 UTC vs.
Revision 1.42 by root, Thu Jul 19 13:46:39 2007 UTC

 my $exec_prefix = "@exec_prefix@";
 my $datarootdir = "@datarootdir@";
 my $DATADIR     = "@datadir@/@PACKAGE@";
 my $CONVERT  = "@CONVERT@";
-my $IDENTIFY = "@IDENTIFY@";
+#my $IDENTIFY = "@IDENTIFY@";
 my $OPTIPNG  = "@OPTIPNG@";
 my $RSYNC    = "@RSYNC@";
+my $PNGNQ    = "@PNGNQ@";
 use Getopt::Long;
 use Coro::Event;
 use AnyEvent;
 use IO::AIO ();
 use Crossfire;
 use Coro;
 use Coro::AIO;
 use POSIX ();
 use Digest::MD5;
+use Carp;
-use Storable; $Storable::canonical = 1;
+use Coro::Storable; $Storable::canonical = 1;
+$SIG{QUIT} = sub { Carp::cluck "QUIT" };
 sub usage {
    warn <<EOF;
 Usage: cfutil [-v] [-q] [--force] [--cache]
               [--install-arch path]
 my $CACHE = 0;
 my $FORCE;
 my $TMPDIR  = "/tmp/cfutil$$~";
 my $TMPFILE = "aaaa0";
+our %COLOR = (
+   black      =>  0,
+   white      =>  1,
+   navy       =>  2,
+   red        =>  3,
+   orange     =>  4,
+   blue       =>  5,
+   darkorange =>  6,
+   green      =>  7,
+   lightgreen =>  8,
+   grey       =>  9,
+   brown      => 10,
+   gold       => 11,
+   tan        => 12,
+);
 END { system "rm", "-rf", $TMPDIR }
 Event->signal (signal => "INT",  cb => sub { exit 1 });
 Event->signal (signal => "TERM", cb => sub { exit 1 });
 }
 sub inst_maps($) {
    my (undef, $path) = @_;
-   print "installing '$path' to '$DATADIR/maps'\n";
+   print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
    if (!-f "$path/regions") {
       warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
       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";
 }
 {
    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) = @_;
       $FACEINFO{$name}{"data$T"} = $data;
                   fork_sub {
                      system "convert png:\Q$path\E -depth 8 rgba:-"
                           . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
                           . "| 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, "-o5", "-i0", "-q", "$other~";
+                     system $OPTIPNG, "-i0", "-q", "$other~";
                      die "$other~ has zero size, aborting." unless -s "$other~";
                      rename "$other~", $other;
                   };
                }
                my $other = "$stem.32x32.png~";
                if (0 > aio_lstat $other or (-M _) > (-M $path)) {
                   fork_sub {
                      system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
-                     system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
+                     system $OPTIPNG, "-i0", "-q", "$other~";
+                     # reduce smoothfaces >10000 bytes
+                     if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
+                        my $ncolor = 256;
+                        while () {
+                           system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
+                           system $OPTIPNG, "-i0", "-q", "$other~~";
+                           last if 10000 > -s "$other~~";
+                           $ncolor = int $ncolor * 0.9;
+                           $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
+                        }
+                        printf "reduced %s from %d to %d bytes using %d colours.\n",
+                              $other, -s "$other~", -s "$other~~", $ncolor
+                           if $VERBOSE >= 2;
+                        rename "$other~~", "$other~";
+                     }
                      die "$other~ has zero size, aborting." unless -s "$other~";
                      rename "$other~", $other;
                   };
                }
          aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
          my $arc = read_arch "$dir/$file";
          for my $o (values %$arc) {
             push @ARC, $o;
+            for (my $m = $o; $m; $m = $m->{more}) {
+               $ARC{$m->{_name}} = $m;
+            }
             $o->{editor_folder} = $dir;
             my $visibility = delete $o->{visibility};
             my $magicmap   = delete $o->{magicmap};
                my $x = $o->{x} - $dx;
                my $y = $o->{y} - $dy;
                my $ext = $x|$y ? "+$x+$y" : "";
-               $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/;
+               $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
-               my $visibility = delete $o->{visibility} if exists $o->{visibility};
+               $visibility = delete $o->{visibility} if exists $o->{visibility};
-               my $magicmap   = delete $o->{magicmap}   if exists $o->{magicmap};
+               $magicmap   = delete $o->{magicmap}   if exists $o->{magicmap};
                my $anim = delete $o->{anim};
                if ($anim) {
                   # possibly add $ext to the animation name to avoid
          $TRS .= $trs;
       }
    }
+   sub process_res {
+      while (@res) {
+         my ($dir, $file) = @{pop @res};
+         my $data;
+         aio_load "$dir/$file", $data;
+         my $copyright;
+         aio_load "$dir/copyright", $copyright;
+         $file =~ s/\.res$//;
+         $file =~ /\.([^.]+)$/
+            or next;
+         my $type = $1;
+         substr $dir, 0, 1 + length $PATH, "";
+         $RESOURCE{"$dir/$file"} = {
+            type      => $1,
+            copyright => $copyright,
+            data      => $data,
+            chksum    => Digest::MD5::md5 $data,
+         };
+      }
+   }
    sub find_files;
    sub find_files {
       my ($path) = @_;
       IO::AIO::aioreq_pri 4;
                push @png, ["$path/$file", 0];
             } elsif ($file =~ /\.trs$/) {
                push @trs, [$path, $file];
             } elsif ($file =~ /\.arc$/) {
                push @arc, [$path, $file];
+            } elsif ($file =~ /\.(ogg|jpg|res)$/) {
+               push @res, [$path, $file];
             } else {
-               warn "ignoring $path/$file\n" if $VERBOSE >= 2;
+               warn "ignoring $path/$file\n" if $VERBOSE >= 3;
             }
          }
       };
    }
    sub inst_arch($) {
       my (undef, $path) = @_;
+      $PATH = $path;
+      print "\n",
-      print "installing '$path' to '$DATADIR'\n",
+            "Installing '$path' to '$DATADIR'\n",
+            "\n",
-            "(this can take a long time if you run this\n",
+            "This can take a long time if you run this\n",
-            "for the first time or do not use --cache).\n";
+            "for the first time or do not use --cache.\n",
+            "\n",
+            "Unless you run verbosely, all following warning\n",
+            "or error messages indicate serious problems.\n",
+            "\n";
       if (!-d "$path/treasures") {
          warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
          exit 1 unless $FORCE;
       }
       $_->join for (
          # four png crunchers work fine for my 2x smp machine
          (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),
       );
       {
+         # remove path prefix from editor_folder
+         substr $_->{editor_folder}, 0, 1 + length $path, ""
+            for values %ARC;
+         # resolve inherit
+         while () {
+            my $progress;
+            my $loop;
+            for my $o (values %ARC) {
+               if (my $other = $o->{inherit}) {
+                  if (my $s = $ARC{$other}) {
+                     if ($s->{inherit}) {
+                        $loop = $s;
+                     } else {
+                        delete $o->{inherit};
+                        my %s = %$s;
+                        delete @s{qw(_name more name name_pl)};
+                        %$o = ( %s, %$o );
+                        ++$progress;
+                     }
+                  } else {
+                     warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
+                     delete $ARC{$o->{_name}};
+                  }
+               }
+            }
+            unless ($progress) {
+               die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
+                  if $loop;
+               last;
+            }
+         }
+         # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
+         @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
          open my $fh, ">:utf8", "$DATADIR/archetypes~"
             or die "$DATADIR/archetypes~: $!";
-         substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
+         print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
-         print $fh Crossfire::archlist_to_string \@ARC;
       }
       {
          open my $fh, ">:utf8", "$DATADIR/treasures~"
             or die "$DATADIR/treasures~: $!";
             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";
             $v->{chksum32} = Digest::MD5::md5 $v->{data32};
             $v->{chksum64} = Digest::MD5::md5 $v->{data64};
+            if (my $magicmap = $v->{magicmap}) {
+               $magicmap =~ y/A-Z_\-/a-z/d;
+               $v->{magicmap} = $COLOR{$magicmap};
+            }
          }
          open my $fh, ">:perlio", "$DATADIR/facedata~"
             or die "$DATADIR/facedata~: $!";
-         print $fh Storable::nfreeze {
+         print $fh freeze {
             version => 2,
             faceinfo => \%FACEINFO,
             animinfo => \%ANIMINFO,
+            resource => \%RESOURCE,
          };
       }
       for (qw(archetypes facedata treasures)) {
          chmod 0644, "$DATADIR/$_~";

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.24 by root, Thu Apr 12 14:18:06 2007 UTC vs. Revision 1.42 by root, Thu Jul 19 13:46:39 2007 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.24 by root, Thu Apr 12 14:18:06 2007 UTC vs.
Revision 1.42 by root, Thu Jul 19 13:46:39 2007 UTC