ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.57 by root, Mon Aug 20 22:09:04 2007 UTC vs.
Revision 1.85 by root, Fri May 14 22:56:47 2010 UTC

1#!@PERL@ 1#!@PERL@
2 2
3use strict; 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7#
8# Deliantra is free software: you can redistribute it and/or modify it under
9# the terms of the Affero GNU General Public License as published by the
10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details.
17#
18# You should have received a copy of the Affero GNU General Public License
19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>.
21#
22# The authors can be reached via e-mail to <support@deliantra.net>
23#
24
25use common::sense;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
… …
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
15 37
16use Getopt::Long; 38use Getopt::Long;
39use File::Temp;
40use POSIX ();
41use Carp;
42
17use Coro::Event; 43use Coro::EV;
18use AnyEvent; 44use AnyEvent;
45use YAML::XS ();
46use JSON::XS ();
19use IO::AIO (); 47use IO::AIO ();
20use File::Temp; 48use Digest::MD5 ();
21use Crossfire; 49
22use Coro; 50use Coro 5.12;
23use Coro::AIO; 51use Coro::AIO;
24use Coro::Util; 52use Coro::Util;
25use POSIX ();
26use Carp;
27use Coro::Channel; 53use Coro::Channel;
28use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
29 57
30$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
31 59
32sub usage { 60sub usage {
33 warn <<EOF; 61 warn <<EOF;
… …
46my $VERBOSE = 1; 74my $VERBOSE = 1;
47my $CACHE = 0; 75my $CACHE = 0;
48my $FORCE; 76my $FORCE;
49my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
50my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
51 80
52our %COLOR = ( 81our %COLOR = (
53 black => 0, 82 black => 0,
54 white => 1, 83 white => 1,
55 navy => 2, 84 navy => 2,
… …
65 tan => 12, 94 tan => 12,
66); 95);
67 96
68END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
69 98
70Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
71Event->signal (signal => "TERM", cb => sub { exit 1 }); 100my $s_TERM = EV::signal TERM => sub { exit 1 };
101
102our %hash;
103
104# here we could try to avoid collisions and reduce chksum size further
105sub make_hash($\$\$;$) {
106 my ($id, $dataref, $hashref, $clen) = @_;
107
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
109
110 if (exists $hash{$hash}) {
111 # hahs collinion, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n";
114 exit 1;
115 } else {
116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
117 }
118 }
119 $hash{$hash} = [$id, $dataref, $hashref];
120
121 $$hashref = $hash;
122}
72 123
73mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
74 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
75 126
76sub fork_sub(&) { 127sub fork_sub(&) {
… …
96 if (!-f "$path/regions") { 147 if (!-f "$path/regions") {
97 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 148 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
98 exit 1 unless $FORCE; 149 exit 1 unless $FORCE;
99 } 150 }
100 151
101 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 152 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
153 "$path/.", "$DATADIR/maps/.",
154 "--exclude", "CVS", "--exclude", "/world-precomposed",
155 "--delete", "--delete-excluded"
102 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
103 157
104 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
105} 159}
106 160
… …
173 227
174 (my $base = $stem) =~ s/^.*\///; 228 (my $base = $stem) =~ s/^.*\///;
175 229
176 my $fi = $FACEINFO{$base}; 230 my $fi = $FACEINFO{$base};
177 unless ($fi) { 231 unless ($fi) {
178 warn "$path: <$base> not referenced by any archetype, skipping.\n"; 232 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
179 next; 233 #next;
180 } 234 }
181 235
182 my $arc = $FACEINFO{$base}{arc} 236 my $arc = $fi->{arc} || { };
183 or die "FATAL: internal error <$base>, cannot continue";
184 237
185 unless ($path =~ /~$/) { 238 unless ($path =~ /~$/) {
186 # possibly enlarge 239 # possibly enlarge
187 if (0 > aio_stat "$stem.64x64.png") { 240 if (0 > aio_stat "$stem.64x64.png") {
188 my $other = "$stem.64x64.png~"; 241 my $other = "$stem.64x64.png~";
… …
269 fork_sub { 322 fork_sub {
270 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 323 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
271 system $OPTIPNG, "-i0", "-q", "$other~"; 324 system $OPTIPNG, "-i0", "-q", "$other~";
272 325
273 # reduce smoothfaces >10000 bytes 326 # reduce smoothfaces >10000 bytes
327 # obsolete, no longer required
274 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 328 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
275 my $ncolor = 256; 329 my $ncolor = 256;
276 while () { 330 while () {
277 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 331 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
278 system $OPTIPNG, "-i0", "-q", "$other~~"; 332 system $OPTIPNG, "-i0", "-q", "$other~~";
279 last if 10000 > -s "$other~~"; 333 last if 10000 > -s "$other~~";
… …
375 push @ARC, $o; 429 push @ARC, $o;
376 for (my $m = $o; $m; $m = $m->{more}) { 430 for (my $m = $o; $m; $m = $m->{more}) {
377 $ARC{$m->{_name}} = $m; 431 $ARC{$m->{_name}} = $m;
378 } 432 }
379 433
380 $o->{editor_folder} = $dir; 434 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
381 435
382 my $visibility = delete $o->{visibility}; 436 my $visibility = delete $o->{visibility};
383 my $magicmap = delete $o->{magicmap}; 437 my $magicmap = delete $o->{magicmap};
384 438
385 # find upper left corner :/ 439 # find upper left corner :/
… …
425 facings => $facings, 479 facings => $facings,
426 frames => \@frames, 480 frames => \@frames,
427 }; 481 };
428 } 482 }
429 483
430 for my $face ($o->{face} || (), @{$anim || []}) { 484 for ($o->{face} || (), @{$anim || []}) {
431 next if $face =~ /^facings\s/; 485 next if /^facings\s/;
486
487 my $face = $_;
488 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
432 489
433 my $info = $FACEINFO{$face} ||= { }; 490 my $info = $FACEINFO{$face} ||= { };
434 $info->{arc} = $o; 491 $info->{arc} = $o;
435 492
436 next if $face =~ /^blank.x11$|^empty.x11$/; 493 next if $face =~ /^blank.x11$|^empty.x11$/;
… …
492 my ($dir, $file, $type) = @$job; 549 my ($dir, $file, $type) = @$job;
493 550
494 my $data; 551 my $data;
495 aio_load "$dir/$file", $data; 552 aio_load "$dir/$file", $data;
496 553
497 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 554 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
498 555
499 next if $meta && !exists $meta->{$file}; 556 utf8::decode $dir;
557 utf8::decode $file;
558
559 # a meta file for resources is now mandatory
560 unless (exists $meta->{$file}) {
561 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
562 next;
563 }
500 564
501 $meta = { 565 $meta = {
502 %{ $meta->{"" } || {} }, 566 %{ $meta->{"" } || {} },
503 %{ $meta->{$file} || {} }, 567 %{ $meta->{$file} || {} },
504 }; 568 };
… …
506 if ($meta->{license} =~ s/^#//) { 570 if ($meta->{license} =~ s/^#//) {
507 $meta->{license} = ({ 571 $meta->{license} = ({
508 "pd" => "Public Domain", 572 "pd" => "Public Domain",
509 "gpl" => "GNU General Public License, version 3.0 or any later", 573 "gpl" => "GNU General Public License, version 3.0 or any later",
510 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 574 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
575 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
511 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 576 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
512 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 577 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
513 })->{$meta->{license}} 578 })->{$meta->{license}}
514 || warn "$dir/$file: license tag '$meta->{license}' not found."; 579 || warn "$dir/$file: license tag '$meta->{license}' not found.";
515 } 580 }
516 581
582 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
583 ($meta->{author} = $1) =~ s/_/ /g;
584 }
585
517 $file =~ s/\.res$//; 586 $file =~ s/\.res$//;
518 $file =~ s/\.(ogg|wav|jpg|png)$//; 587 $file =~ s/\.(ogg|wav|jpg|png)$//;
519 588
520 substr $dir, 0, 1 + length $PATH, ""; 589 substr $dir, 0, 1 + length $PATH, "";
521 590
591 if (my $filter = $meta->{cfutil_filter}) {
592 if ($filter eq "yaml2json") {
593 $data = JSON::XS::encode_json YAML::XS::Load $data;
594 } elsif ($filter eq "json2json") {
595 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
596 } elsif ($filter eq "perl2json") {
597 $data = eval $data; die if $@;
598 $data = JSON::XS::encode_json $data;
599 } else {
600 warn "$dir/$file: unknown filter $filter, skipping\n";
601 }
602 }
603
522 $RESOURCE{"$dir/$file"} = { 604 $RESOURCE{"$dir/$file"} = {
523 type => (delete $meta->{type}) || $type, 605 type => (exists $meta->{type} ? delete $meta->{type} : $type),
524 data => $data, 606 data => $data,
525 %$meta ? (meta => $meta) : (), 607 %$meta ? (meta => $meta) : (),
526 }; 608 };
527 } 609 }
528 } 610 }
… …
534 IO::AIO::aioreq_pri 4; 616 IO::AIO::aioreq_pri 4;
535 IO::AIO::aio_scandir $path, 4, sub { 617 IO::AIO::aio_scandir $path, 4, sub {
536 my ($dirs, $nondirs) = @_; 618 my ($dirs, $nondirs) = @_;
537 619
538 find_files "$path/$_" 620 find_files "$path/$_"
539 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 621 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
540 622
541 my $dir = $path; 623 my $dir = $path;
542 substr $dir, 0, 1 + length $PATH, ""; 624 substr $dir, 0, 1 + length $PATH, "";
543 625
544 for my $file (@$nondirs) { 626 for my $file (@$nondirs) {
… …
549 } elsif ($dir =~ /^sound(?:\/|$)/) { 631 } elsif ($dir =~ /^sound(?:\/|$)/) {
550 $c_res->put ([$path, $file, 5]) # FT_SOUND 632 $c_res->put ([$path, $file, 5]) # FT_SOUND
551 if $file =~ /\.(wav|ogg)$/; 633 if $file =~ /\.(wav|ogg)$/;
552 634
553 } elsif ($dir =~ /^res(?:\/|$)/) { 635 } elsif ($dir =~ /^res(?:\/|$)/) {
636 if ($file =~ /\.(jpg|png)$/) {
554 $c_res->put ([$path, $file, 0]) # FT_FACE 637 $c_res->put ([$path, $file, 0]) # FT_FACE
555 if $file =~ /\.(jpg|png)$/; 638 } elsif ($file =~ /\.(res)$/) {
556 $c_res->put ([$path, $file, 7]) # FT_RSRC 639 $c_res->put ([$path, $file, 6]) # FT_RSRC
557 if $file =~ /\.(res)$/; 640 } else {
641 $c_res->put ([$path, $file, undef]);
642 }
558 643
559 } elsif ($file =~ /\.png$/) { 644 } elsif ($file =~ /\.png$/) {
560 push @c_png, ["$path/$file", 0]; 645 push @c_png, ["$path/$file", 0];
561 646
562 } elsif ($file =~ /\.trs$/) { 647 } elsif ($file =~ /\.trs$/) {
… …
568 } else { 653 } else {
569 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 654 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
570 } 655 }
571 } 656 }
572 }; 657 };
658 }
659
660 sub generate_plurals {
661# use Lingua::EN::Inflect ();
662# Lingua::EN::Inflect::classical;
663# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
664# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
665#
666# for my $a (@ARC) {
667# my $name = $a->{name} || $a->{_name};
668#
669# next unless $a->{name_pl};
670# next if $a->{invisible};
671# next if $a->{is_floor};
672# next if $a->{no_pick};
673#
674# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
675# my $pl = $test =~ /^(?:eq|p:.)$/
676# ? $name
677# : Lingua::EN::Inflect::PL $name;
678#
679# if ($pl ne $a->{name_pl}) {
680# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
681# }
682# }
573 } 683 }
574 684
575 sub inst_arch($) { 685 sub inst_arch($) {
576 my (undef, $path) = @_; 686 my (undef, $path) = @_;
577 687
… …
600 my @a_res = map +(async \&process_res), 1..2; 710 my @a_res = map +(async \&process_res), 1..2;
601 my @a_trs = map +(async \&process_trs), 1..2; 711 my @a_trs = map +(async \&process_trs), 1..2;
602 712
603 IO::AIO::flush; 713 IO::AIO::flush;
604 714
605 $c_res->put (undef) for @a_res; 715 $c_res->shutdown;
606 $c_arc->put (undef) for @a_arc; 716 $c_arc->shutdown;
607 $c_trs->put (undef) for @a_trs; 717 $c_trs->shutdown;
608 718
609 print "start file scan, arc, res processing...\n" if $VERBOSE; 719 print "start file scan, arc, res processing...\n" if $VERBOSE;
610 720
611 $_->join for @a_arc; # need to parse all archetypes before png processing 721 $_->join for @a_arc; # need to parse all archetypes before png processing
612 722
613 print "end arc, start png processing...\n" if $VERBOSE; 723 print "end arc, start png processing...\n" if $VERBOSE;
614 724
615 # four png crunchers work fine for my 2x smp machine 725 # eight png crunchers work fine for my 4x smp machine
616 my @a_png = map +(async \&process_png), 1..4; 726 my @a_png = map +(async \&process_png), 1..8;
617 727
618 $_->join for (@a_trs, @a_res, @a_png); 728 $_->join for (@a_trs, @a_res, @a_png);
619 729
620 print "scanning done, processing results...\n" if $VERBOSE; 730 print "scanning done, processing results...\n" if $VERBOSE;
621 { 731 {
622 # remove path prefix from editor_folder 732 # remove path prefix from editor_folder
733 $_->{editor_folder} =~ /^\x00/
623 substr $_->{editor_folder}, 0, 1 + length $path, "" 734 and substr $_->{editor_folder}, 0, 2 + length $path, ""
624 for values %ARC; 735 for values %ARC;
625 736
626 print "resolving inheritance tree...\n" if $VERBOSE; 737 print "resolving inheritance tree...\n" if $VERBOSE;
627 # resolve inherit 738 # resolve inherit
628 while () { 739 while () {
629 my $progress; 740 my $progress;
630 my $loop; 741 my $loop;
631 742
632 for my $o (values %ARC) { 743 for my $o (values %ARC) {
633 if (my $other = $o->{inherit}) { 744 for my $other (split /,/, $o->{inherit}) {
634 if (my $s = $ARC{$other}) { 745 if (my $s = $ARC{$other}) {
635 if ($s->{inherit}) { 746 if ($s->{inherit}) {
636 $loop = $s; 747 $loop = $s;
637 } else { 748 } else {
638 delete $o->{inherit}; 749 delete $o->{inherit};
… …
657 } 768 }
658 769
659 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 770 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
660 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 771 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
661 772
773 print "generating plurals...\n" if $VERBOSE;
774 generate_plurals;
775
662 print "writing archetypes...\n" if $VERBOSE; 776 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
663 open my $fh, ">:utf8", "$DATADIR/archetypes~" 777 open my $fh, ">:utf8", "$DATADIR/archetypes~"
664 or die "$DATADIR/archetypes~: $!"; 778 or die "$DATADIR/archetypes~: $!";
665 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 779 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
666 } 780 }
667 781
668 { 782 {
669 print "writing treasures...\n" if $VERBOSE; 783 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
670 open my $fh, ">:utf8", "$DATADIR/treasures~" 784 open my $fh, ">:utf8", "$DATADIR/treasures~"
671 or die "$DATADIR/treasures~: $!"; 785 or die "$DATADIR/treasures~: $!";
672 print $fh $TRS; 786 print $fh $TRS;
673 } 787 }
674 788
… …
676 print "processing facedata...\n" if $VERBOSE; 790 print "processing facedata...\n" if $VERBOSE;
677 while (my ($k, $v) = each %FACEINFO) { 791 while (my ($k, $v) = each %FACEINFO) {
678 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 792 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
679 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 793 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
680 794
795 make_hash $k, $v->{data32}, $v->{hash32};
796 make_hash $k, $v->{data64}, $v->{hash64};
797
681 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 798 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
682 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 799 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
683 800
684 if (my $magicmap = $v->{magicmap}) { 801 if (my $magicmap = $v->{magicmap}) {
685 $magicmap =~ y/A-Z_\-/a-z/d; 802 $magicmap =~ y/A-Z_\-/a-z/d;
686 $v->{magicmap} = $COLOR{$magicmap}; 803 $v->{magicmap} = $COLOR{$magicmap};
687 } 804 }
688 805
689 delete $v->{arc}; 806 delete $v->{arc};
690 } 807 }
691 808
692 print "writing facedata...\n" if $VERBOSE; 809 print "processing resources...\n" if $VERBOSE;
810 my $enc = JSON::XS->new->utf8->canonical->relaxed;
811 while (my ($k, $v) = each %RESOURCE) {
812
813 if ($v->{meta} && $v->{meta}{datadir}) {
814 delete $RESOURCE{$k};
815
816 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
817
818 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
819 open my $fh, ">:raw", "$DATADIR/$k~"
820 or die "$DATADIR/$k~: $!";
821 syswrite $fh, $v->{data};
822 push @COMMIT, $k;
823
824 } else {
825 if ($v->{type} & 1) {
826 # prepend meta info
827
828 my $meta = $enc->encode ({
829 name => $k,
830 %{ $v->{meta} || {} },
831 });
832
833 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
834 }
835
836 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
837 }
838 }
839
840 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
841 scalar keys %FACEINFO,
842 scalar keys %ANIMINFO,
843 scalar keys %RESOURCE
844 if $VERBOSE;
845
693 open my $fh, ">:perlio", "$DATADIR/facedata~" 846 open my $fh, ">:perlio", "$DATADIR/facedata~"
694 or die "$DATADIR/facedata~: $!"; 847 or die "$DATADIR/facedata~: $!";
695 848
696 print $fh freeze { 849 print $fh nfreeze {
697 version => 2, 850 version => 2,
698 faceinfo => \%FACEINFO, 851 faceinfo => \%FACEINFO,
699 animinfo => \%ANIMINFO, 852 animinfo => \%ANIMINFO,
700 resource => \%RESOURCE, 853 resource => \%RESOURCE,
701 }; 854 };
855
702 } 856 }
703 857
704 print "committing files...\n" if $VERBOSE; 858 print "committing files...\n" if $VERBOSE;
705 859
706 for (qw(archetypes facedata treasures)) { 860 for (qw(archetypes facedata treasures), @COMMIT) {
707 chmod 0644, "$DATADIR/$_~"; 861 chmod 0644, "$DATADIR/$_~";
708 rename "$DATADIR/$_~", "$DATADIR/$_" 862 rename "$DATADIR/$_~", "$DATADIR/$_"
709 or die "$DATADIR/$_: $!"; 863 or die "$DATADIR/$_: $!";
710 } 864 }
711 865

Diff Legend

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