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

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.73 by root, Mon Oct 26 11:31:39 2009 UTC vs.
Revision 1.79 by root, Sun Nov 15 18:04:00 2009 UTC

 #!@PERL@
+#
+# This file is part of Deliantra, the Roguelike Realtime MMORPG.
+#
+# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+#
+# Deliantra is free software: you can redistribute it and/or modify it under
+# the terms of the Affero GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the Affero GNU General Public License
+# and the GNU General Public License along with this program. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+# The authors can be reached via e-mail to <support@deliantra.net>
+#
 use strict;
 my $prefix      = "@prefix@";
 my $exec_prefix = "@exec_prefix@";
 use Coro::EV;
 use AnyEvent;
 use YAML::XS ();
 use JSON::XS ();
 use IO::AIO ();
+use Digest::MD5 ();
 use Coro 5.12;
 use Coro::AIO;
 use Coro::Util;
 use Coro::Channel;
 END { system "rm", "-rf", $TMPDIR }
 my $s_INT  = EV::signal INT  => sub { exit 1 };
 my $s_TERM = EV::signal TERM => sub { exit 1 };
+our %hash;
+# here we could try to avoid collisions and reduce chksum size further
+sub make_hash($\$\$;$) {
+   my ($id, $dataref, $hashref, $clen) = @_;
+   my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
+   if (exists $hash{$hash}) {
+      # hahs collinion, but some files are simply identical
+      if (${$hash{$hash}[1]} ne $$dataref)  {
+         warn "hash collision $hash{$hash}[0] vs. $id\n";
+         exit 1;
+      } else {
+         print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
+      }
+   }
+   $hash{$hash} = [$id, $dataref, $hashref];
+   $$hashref = $hash;
+}
 mkdir $TMPDIR, 0700
    or die "$TMPDIR: $!";
 sub fork_sub(&) {
             push @ARC, $o;
             for (my $m = $o; $m; $m = $m->{more}) {
                $ARC{$m->{_name}} = $m;
             }
-            $o->{editor_folder} = $dir;
+            $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
             my $visibility = delete $o->{visibility};
             my $magicmap   = delete $o->{magicmap};
             # find upper left corner :/
    }
    sub generate_plurals {
 #      use Lingua::EN::Inflect ();
 #      Lingua::EN::Inflect::classical;
-#      Lingua::EN::Inflect::def_noun 'talisman' => 'talismans';
+#      Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
 #      Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
 #
 #      for my $a (@ARC) {
 #         my $name = $a->{name} || $a->{_name};
 #
 #         next unless $a->{name_pl};
-#
+#         next if $a->{invisible};
+#         next if $a->{is_floor};
+#         next if $a->{no_pick};
 #
 #         my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
 #         my $pl = $test =~ /^(?:eq|p:.)$/
 #                  ? $name
 #                  : Lingua::EN::Inflect::PL $name;
-#         die "$test $pl" if $pl =~ /bootss/;#d#
 #
 #         if ($pl ne $a->{name_pl}) {
 #            warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
 #         }
 #      }
       $_->join for (@a_trs, @a_res, @a_png);
       print "scanning done, processing results...\n" if $VERBOSE;
       {
          # remove path prefix from editor_folder
+         $_->{editor_folder} =~ /^\x00/
-         substr $_->{editor_folder}, 0, 1 + length $path, ""
+            and substr $_->{editor_folder}, 0, 2 + length $path, ""
-            for values %ARC;
+               for values %ARC;
          print "resolving inheritance tree...\n" if $VERBOSE;
          # resolve inherit
          while () {
             my $progress;
          @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
          print "generating plurals...\n" if $VERBOSE;
          generate_plurals;
-         print "writing archetypes...\n" if $VERBOSE;
+         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 "writing treasures...\n" if $VERBOSE;
+         printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
          open my $fh, ">:utf8", "$DATADIR/treasures~"
             or die "$DATADIR/treasures~: $!";
          print $fh $TRS;
       }
          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";
+            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->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
             if (my $magicmap = $v->{magicmap}) {
                $magicmap =~ y/A-Z_\-/a-z/d;
             }
             delete $v->{arc};
          }
-         print "writing facedata...\n" if $VERBOSE;
+         print "processing resources...\n" if $VERBOSE;
+         my $enc = JSON::XS->new->utf8->canonical->relaxed;
+         while (my ($k, $v) = each %RESOURCE) {
+            if ($v->{type} & 1) {
+               # prepend meta info
+               my $meta = $enc->encode ({
+                  name => $k,
+                  %{ $v->{meta} || {} },
+               });
+               $v->{data} = pack "(w/a*)*", $meta, $v->{data};
+            }
+            make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
+         }
+         printf "writing facedata (%d faces, %d anims, %d resources)...\n",
+            scalar keys %FACEINFO,
+            scalar keys %ANIMINFO,
+            scalar keys %RESOURCE
+               if $VERBOSE;
          open my $fh, ">:perlio", "$DATADIR/facedata~"
             or die "$DATADIR/facedata~: $!";
          print $fh freeze {
             version => 2,
             faceinfo => \%FACEINFO,
             animinfo => \%ANIMINFO,
             resource => \%RESOURCE,
          };
       }
       print "committing files...\n" if $VERBOSE;
       for (qw(archetypes facedata treasures)) {

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.73 by root, Mon Oct 26 11:31:39 2009 UTC vs. Revision 1.79 by root, Sun Nov 15 18:04:00 2009 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.73 by root, Mon Oct 26 11:31:39 2009 UTC vs.
Revision 1.79 by root, Sun Nov 15 18:04:00 2009 UTC