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

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.98 by root, Wed Oct 6 01:48:15 2010 UTC vs.
Revision 1.107 by root, Wed Oct 20 06:36:48 2010 UTC

 my $TMPDIR  = "/tmp/cfutil$$~";
 my $TMPFILE = "aaaa0";
 my @COMMIT;
 our %COLOR = (
+   # original cf colours
    black      =>  0,
    white      =>  1,
-   navy       =>  2,
+   navy       =>  2, # "dark blue"
    red        =>  3,
    orange     =>  4,
-   blue       =>  5,
+   blue       =>  5, # "light blue"
    darkorange =>  6,
    green      =>  7,
    lightgreen =>  8,
    grey       =>  9,
+   brown      => 10, # "yellow"
+   gold       => 11, # "light yellow"
+   tan        => 12, # yellowish gray
+   # new for deliantra
-   brown      => 10,
+   none       => 13,
+   # compatibility to existing archetypes
+   lightblue  =>  5,
-   gold       => 11,
+   gray       =>  9,
+   yellow     => 11,
-   tan        => 12,
+   khaki      => 12,
 );
 END { system "rm", "-rf", $TMPDIR }
 my $s_INT  = EV::signal INT  => sub { exit 1 };
       and die "map installation failed.\n";
    print "maps installed successfully.\n";
 }
-our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
-# used to create crude text glyphs for text-based clients
-sub autoglyph {
-   my ($stem, $face) = @_;
-   if ($stem =~ /^wall\/|Nimwall/) {
-      return $WALL_SUFFIX[hex $1]
-         if $stem =~ /(_[0-9A-F]).x11/;
-      "█"
-   } elsif ($stem =~ /^traps\//) {
-      "☠"
-   } elsif ($stem =~ /^armour\//) {
-      "☗"
-   } elsif ($stem =~ /^weapon\//) {
-      "†"
-   } elsif ($stem =~ /^readable\//) {
-      "✉"
-   } elsif ($stem =~ /^river\//) {
-      "⌇"
-   } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
-      "."
-   } elsif ($stem =~ /^player\//) {
-      "\@"
-   } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) {
-      $1
-   } else {
-      substr $stem, 0, 1
-   }
-}
 {
    our %ANIMINFO;
    our %FACEINFO;
    our %RESOURCE;
    our @ARC;
    our $PATH;
    our $QUANTIZE = "+dither -colorspace RGB -colors 256";
    our $c_arc = new Coro::Channel;
-   our $c_trs = new Coro::Channel;
+   our $c_any = new Coro::Channel;
-   our $c_res = new Coro::Channel;
    our @c_png;
    sub commit_png($$$$) {
       my ($stem, $name, $data, $T) = @_;
          aio_unlink $path if $delete;
       }
    }
+   sub process_faceinfo {
+      my ($dir, $file) = @_;
+      my $path = "$dir/$file";
+      my $data;
+      if (0 > aio_load $path, $data) {
+         warn "$path: $!, skipping.\n";
+         return;
+      }
+      for (split /\n/, $data) {
+         chomp;
+         my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/;
+         # bg not used except for text clients
+         utf8::decode $glyph;
+         $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
+         $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
+         (my $fgi = $COLOR{$fg})
+            // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
+         (my $bgi = $COLOR{$bg})
+            // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
+         my $fi = $FACEINFO{$face} ||= { };
+         $fi->{visibility} = $visibility * 1;
+         $fi->{magicmap}   = $fgi; # foreground colour becomes magicmap
+         $glyph .= " " if 2 > length $glyph; # TODO kanji
+         die "glyph $face too long" if 2 < length $glyph;
+         $fi->{glyph} = "";
+         for (split //, $glyph) {
+            utf8::encode $_;
+            $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
+         }
+      }
+   }
    sub process_arc {
-      while (my $job = $c_arc->get) {
+      while (my ($dir, $file) = @{ $c_arc->get }) {
-         my ($dir, $file) = @$job;
          my $arc;
          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) {
             for (my $m = $o; $m; $m = $m->{more}) {
                $ARC{$m->{_name}} = $m;
             }
             $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
-            my $visibility = delete $o->{visibility};
-            my $magicmap   = delete $o->{magicmap};
-            my $glyph      = delete $o->{glyph};
             # find upper left corner :/
             # omg, this is sooo broken
             my ($dx, $dy);
             for (my $o = $o; $o; $o = $o->{more}) {
                my $y = $o->{y} - $dy;
                my $ext = $x|$y ? "+$x+$y" : "";
                $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
-               $visibility = delete $o->{visibility} if exists $o->{visibility};
-               $magicmap   = delete $o->{magicmap}   if exists $o->{magicmap};
-               $glyph      = delete $o->{glyph}      if exists $o->{glyph};
                my $anim = delete $o->{anim};
                if ($anim) {
                   # possibly add $ext to the animation name to avoid
                   my $info = $FACEINFO{$face} ||= { };
                   $info->{arc} = $o;
                   next if $face =~ /^blank.x11$|^empty.x11$/;
-                  $info->{visibility} = $visibility if defined $visibility;
-                  $info->{magicmap}   = $magicmap   if defined $magicmap;
-                  $info->{glyph}      = $glyph      if defined $glyph;
                }
                if (my $smooth = delete $o->{smoothface}) {
                   my %kv = split /\s+/, $smooth;
                   my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
          }
       }
    }
    sub process_trs {
-      while (my $job = $c_trs->get) {
-         my ($dir, $file) = @$job;
+      my ($dir, $file) = @_;
-         my $path = "$dir/$file";
+      my $path = "$dir/$file";
-         my $trs;
+      my $trs;
-         if (0 > aio_load $path, $trs) {
+      if (0 > aio_load $path, $trs) {
-            warn "$path: $!, skipping.\n";
+         warn "$path: $!, skipping.\n";
-            next;
+         return;
-         }
+      }
-         $TRS .= $trs;
+      $TRS .= $trs;
-      }
    }
    my %FILECACHE;
    sub load_cached($;$) {
       $FILECACHE{$_[0]}
    }
    sub process_res {
-      while (my $job = $c_res->get) {
-         my ($dir, $file, $type) = @$job;
+      my ($dir, $file, $type) = @_;
-         my $data;
+      my $data;
-         aio_load "$dir/$file", $data;
+      aio_load "$dir/$file", $data;
-         my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
+      my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
-         utf8::decode $dir;
+      utf8::decode $dir;
-         utf8::decode $file;
+      utf8::decode $file;
-         # a meta file for resources is now mandatory
+      # a meta file for resources is now mandatory
-         unless (exists $meta->{$file}) {
+      unless (exists $meta->{$file}) {
-            warn "skipping $dir/$file\n" if $VERBOSE >= 3;
+         warn "skipping $dir/$file\n" if $VERBOSE >= 3;
-            next;
+         return;
-         }
+      }
-         $meta = {
+      $meta = {
-            %{ $meta->{""   } || {} },
+         %{ $meta->{""   } || {} },
-            %{ $meta->{$file} || {} },
+         %{ $meta->{$file} || {} },
-         };
+      };
-         if ($meta->{license} =~ s/^#//) {
+      if ($meta->{license} =~ s/^#//) {
-            $meta->{license} = ({
+         $meta->{license} = ({
-               "pd"              => "Public Domain",
+            "pd"              => "Public Domain",
-               "gpl"             => "GNU General Public License, version 3.0 or any later",
+            "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.0"       => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
-               "cc/by/2.1"       => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
+            "cc/by/2.1"       => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
-               "cc/by/2.5"       => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
+            "cc/by/2.5"       => "Licensed under Creative Commons Attribution 2.5 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/",
+            "cc/by/3.0"       => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
-            })->{$meta->{license}}
+         })->{$meta->{license}}
-              || warn "$dir/$file: license tag '$meta->{license}' not found.";
+           || warn "$dir/$file: license tag '$meta->{license}' not found.";
-         }
+      }
-         if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
+      if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
-            ($meta->{author} = $1) =~ s/_/ /g;
+         ($meta->{author} = $1) =~ s/_/ /g;
-         }
+      }
-         $file =~ s/\.res$//;
+      $file =~ s/\.res$//;
-         $file =~ s/\.(ogg|wav|jpg|png)$//;
+      $file =~ s/\.(ogg|wav|jpg|png)$//;
-         substr $dir, 0, 1 + length $PATH, "";
+      substr $dir, 0, 1 + length $PATH, "";
-         if (my $filter = $meta->{cfutil_filter}) {
+      if (my $filter = $meta->{cfutil_filter}) {
-            if ($filter eq "yaml2json") {
+         if ($filter eq "yaml2json") {
-               $data = JSON::XS::encode_json YAML::XS::Load $data;
+            $data = JSON::XS::encode_json YAML::XS::Load $data;
-            } elsif ($filter eq "json2json") {
+         } elsif ($filter eq "json2json") {
-               $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
+            $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
-            } elsif ($filter eq "perl2json") {
+         } elsif ($filter eq "perl2json") {
-               $data = eval $data; die if $@;
+            $data = eval $data; die if $@;
-               $data = JSON::XS::encode_json $data;
+            $data = JSON::XS::encode_json $data;
-            } else {
+         } else {
-               warn "$dir/$file: unknown filter $filter, skipping\n";
+            warn "$dir/$file: unknown filter $filter, skipping\n";
-            }
+         }
-         }
+      }
-         $RESOURCE{"$dir/$file"} = {
+      $RESOURCE{"$dir/$file"} = {
-            type   => (exists $meta->{type} ? delete $meta->{type} : $type),
+         type   => (exists $meta->{type} ? delete $meta->{type} : $type),
-            data   => $data,
+         data   => $data,
-            %$meta ? (meta => $meta) : (),
+         %$meta ? (meta => $meta) : (),
-         };
+      };
+   }
+   sub process_any {
+      while (my ($func, @args) = @{ $c_any->get }) {
+         $func->(@args);
       }
    }
    sub find_files;
    sub find_files {
       my ($path) = @_;
+      my $grp = IO::AIO::aio_group;
+      my $scandir; $scandir = sub {
+         my ($path) = @_;
-      IO::AIO::aioreq_pri 4;
+         IO::AIO::aioreq_pri 4;
-      IO::AIO::aio_scandir $path, 4, sub {
+         add $grp IO::AIO::aio_scandir $path, 4, sub {
-         my ($dirs, $nondirs) = @_;
+            my ($dirs, $nondirs) = @_;
-         find_files "$path/$_"
+            $scandir->("$path/$_")
-            for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
+               for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
-         my $dir = $path;
+            my $dir = $path;
-         substr $dir, 0, 1 + length $PATH, "";
+            substr $dir, 0, 1 + length $PATH, "";
-         for my $file (@$nondirs) {
+            for my $file (@$nondirs) {
-            if ($dir =~ /^music(?:\/|$)/) {
+               if ($dir =~ /^music(?:\/|$)/) {
-               $c_res->put ([$path, $file, 3]) # FT_MUSIC
+                  $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
-                  if $file =~ /\.(ogg)$/;
+                     if $file =~ /\.(ogg)$/;
-            } elsif ($dir =~ /^sound(?:\/|$)/) {
+               } elsif ($dir =~ /^sound(?:\/|$)/) {
-               $c_res->put ([$path, $file, 5]) # FT_SOUND
+                  $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
-                  if $file =~ /\.(wav|ogg)$/;
+                     if $file =~ /\.(wav|ogg)$/;
-            } elsif ($dir =~ /^res(?:\/|$)/) {
+               } elsif ($dir =~ /^res(?:\/|$)/) {
-               if ($file =~ /\.(jpg|png)$/) {
+                  if ($file =~ /\.(jpg|png)$/) {
-                  $c_res->put ([$path, $file, 0]) # FT_FACE
+                     $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
-               } elsif ($file =~ /\.(res)$/) {
+                  } elsif ($file =~ /\.(res)$/) {
+                     $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
+                  } else {
+                     $c_any->put ([\&process_res, $path, $file, undef]);
+                  }
+               } elsif ($file =~ /\.png$/) {
+                  push @c_png, ["$path/$file", 0];
+               } elsif ($file =~ /\.faceinfo$/) {
+                  $c_any->put ([\&process_faceinfo, $path, $file]);
+               } elsif ($file =~ /\.trs$/) {
+                  $c_any->put ([\&process_trs, $path, $file]);
+               } elsif ($file =~ /\.arc$/) {
-                  $c_res->put ([$path, $file, 6]) # FT_RSRC
+                  $c_arc->put ([$path, $file]);
                } else {
-                  $c_res->put ([$path, $file, undef]);
-               }
-            } elsif ($file =~ /\.png$/) {
-               push @c_png, ["$path/$file", 0];
-            } elsif ($file =~ /\.trs$/) {
-               $c_trs->put ([$path, $file]);
-            } elsif ($file =~ /\.arc$/) {
-               $c_arc->put ([$path, $file]);
-            } else {
-               warn "ignoring $path/$file\n" if $VERBOSE >= 3;
+                  warn "ignoring $path/$file\n" if $VERBOSE >= 3;
-            }
+               }
+            }
-         }
+         };
       };
+      $scandir->($path);
+      aio_wait $grp;
    }
    sub generate_plurals {
 #      use Lingua::EN::Inflect ();
 #      Lingua::EN::Inflect::classical;
       if (!-d "$path/treasures") {
          warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
          exit 1 unless $FORCE;
       }
-      print "scanning files...\n" if $VERBOSE;
+      print "start file scan, arc, any processing...\n" if $VERBOSE;
+      my @a_arc = map +(async \&process_arc), 1..2;
+      my @a_any = map +(async \&process_any), 1..4;
       find_files $path;
-      my @a_arc = map +(async \&process_arc), 1..2;
-      my @a_res = map +(async \&process_res), 1..2;
-      my @a_trs = map +(async \&process_trs), 1..2;
-      IO::AIO::flush;
-      $c_res->shutdown;
       $c_arc->shutdown;
-      $c_trs->shutdown;
+      $c_any->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;
       # eight png crunchers work fine for my 4x smp machine
       my @a_png = map +(async \&process_png), 1..8;
-      $_->join for (@a_trs, @a_res, @a_png);
+      print "end any processing...\n" if $VERBOSE;
+      $_->join for @a_any;
+      print "end png processing...\n" if $VERBOSE;
+      $_->join for @a_png;
       print "scanning done, processing results...\n" if $VERBOSE;
       {
          # remove path prefix from editor_folder
          $_->{editor_folder} =~ /^\x00/
                         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";
+                     warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
                      delete $ARC{$o->{_name}};
                   }
                }
             }
          }
          # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
          @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
+         # fix up archetypes without names, where the archanme doesn't work at all
+         for (@ARC) {
+            if (!exists $_->{name} and $_->{_name} =~ /_/) {
+               for ($_->{name} = $_->{_name}) {
+                  s/(?:_\d+)+$//;
+                  s/_[nesw]+$//;
+                  y/_/ /;
+               }
+            }
+         }
-         print "generating plurals...\n" if $VERBOSE;
+         #print "generating plurals...\n" if $VERBOSE;
-         generate_plurals;
+         #generate_plurals;
          printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
          open my $fh, ">:utf8", "$DATADIR/archetypes~"
             or die "$DATADIR/archetypes~: $!";
          print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
       }
       {
          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->{data32} or warn "WARNING: face '$k' 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->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
             make_hash $k, $v->{data32}, $v->{hash32};
             make_hash $k, $v->{data64}, $v->{hash64};
-            #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 "WARNING: face '$k' has 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";
+            #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
-            if (my $magicmap = $v->{magicmap}) {
+            $v->{glyph}      // warn "WARNING: face '$k' has glyph.";
-               $magicmap =~ y/A-Z_\-/a-z/d;
+            $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
-               $v->{magicmap} = $COLOR{$magicmap};
+            $v->{magicmap}   // warn "WARNING: face '$k' has foreground colour.";
-            }
-            my $stem = delete $v->{stem};
+            delete @$v{qw(arc stem)}; # not used by the server
-            $v->{glyph} //= autoglyph $stem, $v;
-            utf8::encode $v->{glyph};
-            $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
-            delete $v->{arc};
          }
          print "processing resources...\n" if $VERBOSE;
          my $enc = JSON::XS->new->utf8->canonical->relaxed;
          while (my ($k, $v) = each %RESOURCE) {

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.98 by root, Wed Oct 6 01:48:15 2010 UTC vs. Revision 1.107 by root, Wed Oct 20 06:36:48 2010 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.98 by root, Wed Oct 6 01:48:15 2010 UTC vs.
Revision 1.107 by root, Wed Oct 20 06:36:48 2010 UTC