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

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.54 by root, Sun Aug 19 10:28:52 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::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 Digest::MD5;
 use Carp;
 use Coro::Channel;
 use Coro::Storable; $Storable::canonical = 1;
 $SIG{QUIT} = sub { Carp::cluck "QUIT" };
    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(&) {
    if (!-f "$path/regions") {
       warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
       exit 1 unless $FORCE;
    }
-   system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
+   system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
+          "$path/.", "$DATADIR/maps/.",
+          "--exclude", "CVS", "--exclude", "/world-precomposed",
+          "--delete", "--delete-excluded"
       and die "map installation failed.\n";
    print "maps installed successfully.\n";
 }
          (my $base = $stem) =~ s/^.*\///;
          my $fi = $FACEINFO{$base};
          unless ($fi) {
-            warn "$path: <$base> not referenced by any archetype, skipping.\n";
+            #warn "$path: <$base> not referenced by any archetype, skipping.\n";
-            next;
+            #next;
          }
-         my $arc = $FACEINFO{$base}{arc}
+         my $arc = $fi->{arc} || { };
-            or die "FATAL: internal error, cannot continue";
          unless ($path =~ /~$/) {
             # possibly enlarge
             if (0 > aio_stat "$stem.64x64.png") {
                my $other = "$stem.64x64.png~";
                      my ($wall_pfx, $wall_dir, $wall_sfx);
                      if (
                         !$is_floor
                         && !$arc->{alive}
-                        && $arc->{no_pass}
+                        && $arc->{move_block} eq "all"
                         && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
                      ) {
                         ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
                         unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
                   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~~";
                      facings => $facings,
                      frames  => \@frames,
                   };
                }
-               for my $face ($o->{face} || (), @{$anim || []}) {
+               for ($o->{face} || (), @{$anim || []}) {
-                  next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
+                  next if /^facings\s/;
+                  my $face = $_;
+                  $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
-                  my $info = $FACEINFO{$face} ||= {};
+                  my $info = $FACEINFO{$face} ||= { };
-                  $info->{arc}        = $o;
+                  $info->{arc} = $o;
+                  next if $face =~ /^blank.x11$|^empty.x11$/;
                   $info->{visibility} = $visibility if defined $visibility;
                   $info->{magicmap}   = $magicmap   if defined $magicmap;
                }
                if (my $smooth = delete $o->{smoothface}) {
          my ($dir, $file, $type) = @$job;
          my $data;
          aio_load "$dir/$file", $data;
-         my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
+         my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
-         next if $meta && !exists $meta->{$file};
+         utf8::decode $dir;
+         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} || {} },
          };
          $file =~ s/\.res$//;
          $file =~ s/\.(ogg|wav|jpg|png)$//;
          substr $dir, 0, 1 + length $PATH, "";
+         if (my $filter = $meta->{cfutil_filter}) {
+            if ($filter eq "yaml2json") {
+               $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";
+            }
+         }
          $RESOURCE{"$dir/$file"} = {
-            type   => (delete $meta->{type}) || $type,
+            type   => (exists $meta->{type} ? delete $meta->{type} : $type),
             data   => $data,
-            chksum => (Digest::MD5::md5 $data),
             %$meta ? (meta => $meta) : (),
          };
       }
    }
             } elsif ($dir =~ /^sound(?:\/|$)/) {
                $c_res->put ([$path, $file, 5]) # FT_SOUND
                   if $file =~ /\.(wav|ogg)$/;
             } elsif ($dir =~ /^res(?:\/|$)/) {
+               if ($file =~ /\.(jpg|png)$/) {
-               $c_res->put ([$path, $file, 0]) # FT_FACE
+                  $c_res->put ([$path, $file, 0]) # FT_FACE
-                  if $file =~ /\.(jpg|png)$/;
+               } elsif ($file =~ /\.(res)$/) {
-               $c_res->put ([$path, $file, 7]) # FT_RSRC
+                  $c_res->put ([$path, $file, 6]) # FT_RSRC
-                  if $file =~ /\.(res)$/;
+               } else {
+                  $c_res->put ([$path, $file, undef]);
+               }
             } elsif ($file =~ /\.png$/) {
                push @c_png, ["$path/$file", 0];
             } elsif ($file =~ /\.trs$/) {
       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";
-            $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};
             }

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.54 by root, Sun Aug 19 10:28:52 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.54 by root, Sun Aug 19 10:28:52 2007 UTC vs.
Revision 1.72 by root, Mon Oct 12 14:01:00 2009 UTC