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

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.63 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.72 by root, Mon Oct 12 14:01:00 2009 UTC

 my $OPTIPNG  = "@OPTIPNG@";
 my $RSYNC    = "@RSYNC@";
 my $PNGNQ    = "@PNGNQ@";
 use Getopt::Long;
-use Coro::Event;
+use Coro::EV;
 use AnyEvent;
-use YAML::Syck ();
+use YAML::XS ();
 use JSON::XS ();
 use IO::AIO ();
 use File::Temp;
-use Crossfire;
+use Deliantra;
-use Coro;
+use Coro 5.12;
 use Coro::AIO;
 use Coro::Util;
 use POSIX ();
 use Carp;
 use Coro::Channel;
    tan        => 12,
 );
 END { system "rm", "-rf", $TMPDIR }
-Event->signal (signal => "INT",  cb => sub { exit 1 });
+my $s_INT  = EV::signal INT  => sub { exit 1 };
-Event->signal (signal => "TERM", cb => sub { exit 1 });
+my $s_TERM = EV::signal TERM => sub { exit 1 };
 mkdir $TMPDIR, 0700
    or die "$TMPDIR: $!";
 sub fork_sub(&) {
                   fork_sub {
                      system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
                      system $OPTIPNG, "-i0", "-q", "$other~";
                      # reduce smoothfaces >10000 bytes
+                     # obsolete, no longer required
-                     if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
+                     if (0 && $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~~";
          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->{""   } || {} },
             %{ $meta->{$file} || {} },
          substr $dir, 0, 1 + length $PATH, "";
          if (my $filter = $meta->{cfutil_filter}) {
             if ($filter eq "yaml2json") {
-               $data = JSON::XS::encode_json YAML::Syck::Load $data;
+               $data = JSON::XS::encode_json YAML::XS::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";
             }
          }
             } elsif ($dir =~ /^res(?:\/|$)/) {
                if ($file =~ /\.(jpg|png)$/) {
                   $c_res->put ([$path, $file, 0]) # FT_FACE
                } elsif ($file =~ /\.(res)$/) {
-                  $c_res->put ([$path, $file, 7]) # FT_RSRC
+                  $c_res->put ([$path, $file, 6]) # FT_RSRC
                } else {
                   $c_res->put ([$path, $file, undef]);
                }
             } elsif ($file =~ /\.png$/) {
       my @a_res = map +(async \&process_res), 1..2;
       my @a_trs = map +(async \&process_trs), 1..2;
       IO::AIO::flush;
-      $c_res->put (undef) for @a_res;
+      $c_res->shutdown;
-      $c_arc->put (undef) for @a_arc;
+      $c_arc->shutdown;
-      $c_trs->put (undef) for @a_trs;
+      $c_trs->shutdown;
       print "start file scan, arc, res processing...\n" if $VERBOSE;
       $_->join for @a_arc; # need to parse all archetypes before png processing
       print "end arc, start png processing...\n" if $VERBOSE;
-      # four png crunchers work fine for my 2x smp machine
+      # eight png crunchers work fine for my 4x smp machine
-      my @a_png = map +(async \&process_png), 1..4;
+      my @a_png = map +(async \&process_png), 1..8;
       $_->join for (@a_trs, @a_res, @a_png);
       print "scanning done, processing results...\n" if $VERBOSE;
       {
          @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
          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];
       }
       {
          print "writing treasures...\n" if $VERBOSE;
          open my $fh, ">:utf8", "$DATADIR/treasures~"
          print "processing facedata...\n" if $VERBOSE;
          while (my ($k, $v) = each %FACEINFO) {
             length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
             length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
-            length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
+            #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";
             if (my $magicmap = $v->{magicmap}) {
                $magicmap =~ y/A-Z_\-/a-z/d;
                $v->{magicmap} = $COLOR{$magicmap};

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.63 by root, Mon Dec 17 08:03:22 2007 UTC vs. Revision 1.72 by root, Mon Oct 12 14:01:00 2009 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.63 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.72 by root, Mon Oct 12 14:01:00 2009 UTC