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.67 by root, Fri Dec 28 12:44:45 2007 UTC vs.
Revision 1.98 by root, Wed Oct 6 01:48:15 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;
19use YAML::Syck (); 45use YAML::XS ();
20use JSON::XS (); 46use JSON::XS ();
21use IO::AIO (); 47use IO::AIO ();
22use File::Temp; 48use Digest::MD5 ();
23use Deliantra; 49
24use Coro; 50use Coro 5.12;
25use Coro::AIO; 51use Coro::AIO;
26use Coro::Util; 52use Coro::Util;
27use POSIX ();
28use Carp;
29use Coro::Channel; 53use Coro::Channel;
30use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
31 57
32$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
33 59
34sub usage { 60sub usage {
35 warn <<EOF; 61 warn <<EOF;
… …
48my $VERBOSE = 1; 74my $VERBOSE = 1;
49my $CACHE = 0; 75my $CACHE = 0;
50my $FORCE; 76my $FORCE;
51my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
52my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
53 80
54our %COLOR = ( 81our %COLOR = (
55 black => 0, 82 black => 0,
56 white => 1, 83 white => 1,
57 navy => 2, 84 navy => 2,
… …
67 tan => 12, 94 tan => 12,
68); 95);
69 96
70END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
71 98
72Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
73Event->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 # hash collision, 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}
74 123
75mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
76 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
77 126
78sub fork_sub(&) { 127sub fork_sub(&) {
… …
107 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
108 157
109 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
110} 159}
111 160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163# used to create crude text glyphs for text-based clients
164sub autoglyph {
165 my ($stem, $face) = @_;
166
167 if ($stem =~ /^wall\/|Nimwall/) {
168 return $WALL_SUFFIX[hex $1]
169 if $stem =~ /(_[0-9A-F]).x11/;
170
171 "█"
172
173 } elsif ($stem =~ /^traps\//) {
174 "☠"
175
176 } elsif ($stem =~ /^armour\//) {
177 "☗"
178
179 } elsif ($stem =~ /^weapon\//) {
180 "†"
181
182 } elsif ($stem =~ /^readable\//) {
183 "✉"
184
185 } elsif ($stem =~ /^river\//) {
186 "⌇"
187
188 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
189 "."
190
191 } elsif ($stem =~ /^player\//) {
192 "\@"
193
194 } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) {
195 $1
196
197 } else {
198 substr $stem, 0, 1
199 }
200}
201
112{ 202{
113 our %ANIMINFO; 203 our %ANIMINFO;
114 our %FACEINFO; 204 our %FACEINFO;
115 our %RESOURCE; 205 our %RESOURCE;
116 our @ARC; 206 our @ARC;
… …
125 our $c_trs = new Coro::Channel; 215 our $c_trs = new Coro::Channel;
126 our $c_res = new Coro::Channel; 216 our $c_res = new Coro::Channel;
127 217
128 our @c_png; 218 our @c_png;
129 219
130 sub commit_png($$$) { 220 sub commit_png($$$$) {
131 my ($name, $data, $T) = @_; 221 my ($stem, $name, $data, $T) = @_;
132 222
223 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
133 $FACEINFO{$name}{"data$T"} = $data; 224 $FACEINFO{$name}{"data$T"} = $data;
134 } 225 }
135 226
136 sub process_png { 227 sub process_png {
137 while (@c_png) { 228 while (@c_png) {
… …
273 fork_sub { 364 fork_sub {
274 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 365 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
275 system $OPTIPNG, "-i0", "-q", "$other~"; 366 system $OPTIPNG, "-i0", "-q", "$other~";
276 367
277 # reduce smoothfaces >10000 bytes 368 # reduce smoothfaces >10000 bytes
369 # obsolete, no longer required
278 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 370 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
279 my $ncolor = 256; 371 my $ncolor = 256;
280 while () { 372 while () {
281 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 373 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
282 system $OPTIPNG, "-i0", "-q", "$other~~"; 374 system $OPTIPNG, "-i0", "-q", "$other~~";
283 last if 10000 > -s "$other~~"; 375 last if 10000 > -s "$other~~";
… …
354 446
355 if (0 > aio_load $file, $tile) { 447 if (0 > aio_load $file, $tile) {
356 die "$path: unable to read tile +$x+$y, aborting.\n"; 448 die "$path: unable to read tile +$x+$y, aborting.\n";
357 } 449 }
358 IO::AIO::aio_unlink $file unless $CACHE; 450 IO::AIO::aio_unlink $file unless $CACHE;
359 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 451 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
360 } 452 }
361 } else { 453 } else {
362 # use as-is (either small, use smooth) 454 # use as-is (either small, use smooth)
363 commit_png $face, $png, $T; 455 commit_png $stem, $face, $png, $T;
364 } 456 }
365 457
366 aio_unlink $path if $delete; 458 aio_unlink $path if $delete;
367 } 459 }
368 } 460 }
… …
379 push @ARC, $o; 471 push @ARC, $o;
380 for (my $m = $o; $m; $m = $m->{more}) { 472 for (my $m = $o; $m; $m = $m->{more}) {
381 $ARC{$m->{_name}} = $m; 473 $ARC{$m->{_name}} = $m;
382 } 474 }
383 475
384 $o->{editor_folder} = $dir; 476 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
385 477
386 my $visibility = delete $o->{visibility}; 478 my $visibility = delete $o->{visibility};
387 my $magicmap = delete $o->{magicmap}; 479 my $magicmap = delete $o->{magicmap};
480 my $glyph = delete $o->{glyph};
388 481
389 # find upper left corner :/ 482 # find upper left corner :/
390 # omg, this is sooo broken 483 # omg, this is sooo broken
391 my ($dx, $dy); 484 my ($dx, $dy);
392 for (my $o = $o; $o; $o = $o->{more}) { 485 for (my $o = $o; $o; $o = $o->{more}) {
… …
402 495
403 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 496 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
404 497
405 $visibility = delete $o->{visibility} if exists $o->{visibility}; 498 $visibility = delete $o->{visibility} if exists $o->{visibility};
406 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 499 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
500 $glyph = delete $o->{glyph} if exists $o->{glyph};
407 501
408 my $anim = delete $o->{anim}; 502 my $anim = delete $o->{anim};
409 503
410 if ($anim) { 504 if ($anim) {
411 # possibly add $ext to the animation name to avoid 505 # possibly add $ext to the animation name to avoid
… …
442 536
443 next if $face =~ /^blank.x11$|^empty.x11$/; 537 next if $face =~ /^blank.x11$|^empty.x11$/;
444 538
445 $info->{visibility} = $visibility if defined $visibility; 539 $info->{visibility} = $visibility if defined $visibility;
446 $info->{magicmap} = $magicmap if defined $magicmap; 540 $info->{magicmap} = $magicmap if defined $magicmap;
541 $info->{glyph} = $glyph if defined $glyph;
447 } 542 }
448 543
449 if (my $smooth = delete $o->{smoothface}) { 544 if (my $smooth = delete $o->{smoothface}) {
450 my %kv = split /\s+/, $smooth; 545 my %kv = split /\s+/, $smooth;
451 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 546 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
520 if ($meta->{license} =~ s/^#//) { 615 if ($meta->{license} =~ s/^#//) {
521 $meta->{license} = ({ 616 $meta->{license} = ({
522 "pd" => "Public Domain", 617 "pd" => "Public Domain",
523 "gpl" => "GNU General Public License, version 3.0 or any later", 618 "gpl" => "GNU General Public License, version 3.0 or any later",
524 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 619 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
620 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
525 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 621 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
526 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 622 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
527 })->{$meta->{license}} 623 })->{$meta->{license}}
528 || warn "$dir/$file: license tag '$meta->{license}' not found."; 624 || warn "$dir/$file: license tag '$meta->{license}' not found.";
529 } 625 }
530 626
627 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
628 ($meta->{author} = $1) =~ s/_/ /g;
629 }
630
531 $file =~ s/\.res$//; 631 $file =~ s/\.res$//;
532 $file =~ s/\.(ogg|wav|jpg|png)$//; 632 $file =~ s/\.(ogg|wav|jpg|png)$//;
533 633
534 substr $dir, 0, 1 + length $PATH, ""; 634 substr $dir, 0, 1 + length $PATH, "";
535 635
536 if (my $filter = $meta->{cfutil_filter}) { 636 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") { 637 if ($filter eq "yaml2json") {
538 $data = JSON::XS::encode_json YAML::Syck::Load $data; 638 $data = JSON::XS::encode_json YAML::XS::Load $data;
539 } elsif ($filter eq "json2json") { 639 } elsif ($filter eq "json2json") {
540 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 640 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
541 } elsif ($filter eq "perl2json") { 641 } elsif ($filter eq "perl2json") {
542 $data = eval $data; die if $@; 642 $data = eval $data; die if $@;
543 $data = JSON::XS::encode_json $data; 643 $data = JSON::XS::encode_json $data;
… …
561 IO::AIO::aioreq_pri 4; 661 IO::AIO::aioreq_pri 4;
562 IO::AIO::aio_scandir $path, 4, sub { 662 IO::AIO::aio_scandir $path, 4, sub {
563 my ($dirs, $nondirs) = @_; 663 my ($dirs, $nondirs) = @_;
564 664
565 find_files "$path/$_" 665 find_files "$path/$_"
566 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 666 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
567 667
568 my $dir = $path; 668 my $dir = $path;
569 substr $dir, 0, 1 + length $PATH, ""; 669 substr $dir, 0, 1 + length $PATH, "";
570 670
571 for my $file (@$nondirs) { 671 for my $file (@$nondirs) {
… …
598 } else { 698 } else {
599 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 699 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
600 } 700 }
601 } 701 }
602 }; 702 };
703 }
704
705 sub generate_plurals {
706# use Lingua::EN::Inflect ();
707# Lingua::EN::Inflect::classical;
708# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
709# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
710#
711# for my $a (@ARC) {
712# my $name = $a->{name} || $a->{_name};
713#
714# next unless $a->{name_pl};
715# next if $a->{invisible};
716# next if $a->{is_floor};
717# next if $a->{no_pick};
718#
719# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
720# my $pl = $test =~ /^(?:eq|p:.)$/
721# ? $name
722# : Lingua::EN::Inflect::PL $name;
723#
724# if ($pl ne $a->{name_pl}) {
725# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
726# }
727# }
603 } 728 }
604 729
605 sub inst_arch($) { 730 sub inst_arch($) {
606 my (undef, $path) = @_; 731 my (undef, $path) = @_;
607 732
… …
630 my @a_res = map +(async \&process_res), 1..2; 755 my @a_res = map +(async \&process_res), 1..2;
631 my @a_trs = map +(async \&process_trs), 1..2; 756 my @a_trs = map +(async \&process_trs), 1..2;
632 757
633 IO::AIO::flush; 758 IO::AIO::flush;
634 759
635 $c_res->put (undef) for @a_res; 760 $c_res->shutdown;
636 $c_arc->put (undef) for @a_arc; 761 $c_arc->shutdown;
637 $c_trs->put (undef) for @a_trs; 762 $c_trs->shutdown;
638 763
639 print "start file scan, arc, res processing...\n" if $VERBOSE; 764 print "start file scan, arc, res processing...\n" if $VERBOSE;
640 765
641 $_->join for @a_arc; # need to parse all archetypes before png processing 766 $_->join for @a_arc; # need to parse all archetypes before png processing
642 767
643 print "end arc, start png processing...\n" if $VERBOSE; 768 print "end arc, start png processing...\n" if $VERBOSE;
644 769
645 # four png crunchers work fine for my 2x smp machine 770 # eight png crunchers work fine for my 4x smp machine
646 my @a_png = map +(async \&process_png), 1..4; 771 my @a_png = map +(async \&process_png), 1..8;
647 772
648 $_->join for (@a_trs, @a_res, @a_png); 773 $_->join for (@a_trs, @a_res, @a_png);
649 774
650 print "scanning done, processing results...\n" if $VERBOSE; 775 print "scanning done, processing results...\n" if $VERBOSE;
651 { 776 {
652 # remove path prefix from editor_folder 777 # remove path prefix from editor_folder
778 $_->{editor_folder} =~ /^\x00/
653 substr $_->{editor_folder}, 0, 1 + length $path, "" 779 and substr $_->{editor_folder}, 0, 2 + length $path, ""
654 for values %ARC; 780 for values %ARC;
655 781
656 print "resolving inheritance tree...\n" if $VERBOSE; 782 print "resolving inheritance tree...\n" if $VERBOSE;
657 # resolve inherit 783 # resolve inherit
658 while () { 784 while () {
659 my $progress; 785 my $progress;
660 my $loop; 786 my $loop;
661 787
662 for my $o (values %ARC) { 788 for my $o (values %ARC) {
663 if (my $other = $o->{inherit}) { 789 for my $other (split /,/, $o->{inherit}) {
664 if (my $s = $ARC{$other}) { 790 if (my $s = $ARC{$other}) {
665 if ($s->{inherit}) { 791 if ($s->{inherit}) {
666 $loop = $s; 792 $loop = $s;
667 } else { 793 } else {
668 delete $o->{inherit}; 794 delete $o->{inherit};
… …
687 } 813 }
688 814
689 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 815 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
690 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 816 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
691 817
818 print "generating plurals...\n" if $VERBOSE;
819 generate_plurals;
820
692 print "writing archetypes...\n" if $VERBOSE; 821 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
693 open my $fh, ">:utf8", "$DATADIR/archetypes~" 822 open my $fh, ">:utf8", "$DATADIR/archetypes~"
694 or die "$DATADIR/archetypes~: $!"; 823 or die "$DATADIR/archetypes~: $!";
695 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 824 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
696 } 825 }
697 826
698 { 827 {
699 print "writing treasures...\n" if $VERBOSE; 828 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
700 open my $fh, ">:utf8", "$DATADIR/treasures~" 829 open my $fh, ">:utf8", "$DATADIR/treasures~"
701 or die "$DATADIR/treasures~: $!"; 830 or die "$DATADIR/treasures~: $!";
702 print $fh $TRS; 831 print $fh $TRS;
703 } 832 }
704 833
… …
706 print "processing facedata...\n" if $VERBOSE; 835 print "processing facedata...\n" if $VERBOSE;
707 while (my ($k, $v) = each %FACEINFO) { 836 while (my ($k, $v) = each %FACEINFO) {
708 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 837 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
709 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 838 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
710 839
840 make_hash $k, $v->{data32}, $v->{hash32};
841 make_hash $k, $v->{data64}, $v->{hash64};
842
711 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 843 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
712 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 844 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
713 845
714 if (my $magicmap = $v->{magicmap}) { 846 if (my $magicmap = $v->{magicmap}) {
715 $magicmap =~ y/A-Z_\-/a-z/d; 847 $magicmap =~ y/A-Z_\-/a-z/d;
716 $v->{magicmap} = $COLOR{$magicmap}; 848 $v->{magicmap} = $COLOR{$magicmap};
717 } 849 }
718 850
851 my $stem = delete $v->{stem};
852 $v->{glyph} //= autoglyph $stem, $v;
853 utf8::encode $v->{glyph};
854 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
855
719 delete $v->{arc}; 856 delete $v->{arc};
720 } 857 }
721 858
722 print "writing facedata...\n" if $VERBOSE; 859 print "processing resources...\n" if $VERBOSE;
860 my $enc = JSON::XS->new->utf8->canonical->relaxed;
861 while (my ($k, $v) = each %RESOURCE) {
862
863 if ($v->{meta} && $v->{meta}{datadir}) {
864 delete $RESOURCE{$k};
865
866 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
867
868 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
869 open my $fh, ">:raw", "$DATADIR/$k~"
870 or die "$DATADIR/$k~: $!";
871 syswrite $fh, $v->{data};
872 push @COMMIT, $k;
873
874 } else {
875 if ($v->{type} & 1) {
876 # prepend meta info
877
878 my $meta = $enc->encode ({
879 name => $k,
880 %{ $v->{meta} || {} },
881 });
882
883 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
884 }
885
886 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
887 }
888 }
889
890 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
891 scalar keys %FACEINFO,
892 scalar keys %ANIMINFO,
893 scalar keys %RESOURCE
894 if $VERBOSE;
895
723 open my $fh, ">:perlio", "$DATADIR/facedata~" 896 open my $fh, ">:perlio", "$DATADIR/facedata~"
724 or die "$DATADIR/facedata~: $!"; 897 or die "$DATADIR/facedata~: $!";
725 898
726 print $fh freeze { 899 print $fh nfreeze {
727 version => 2, 900 version => 2,
728 faceinfo => \%FACEINFO, 901 faceinfo => \%FACEINFO,
729 animinfo => \%ANIMINFO, 902 animinfo => \%ANIMINFO,
730 resource => \%RESOURCE, 903 resource => \%RESOURCE,
731 }; 904 };
905
732 } 906 }
733 907
734 print "committing files...\n" if $VERBOSE; 908 print "committing files...\n" if $VERBOSE;
735 909
736 for (qw(archetypes facedata treasures)) { 910 for (qw(archetypes facedata treasures), @COMMIT) {
737 chmod 0644, "$DATADIR/$_~"; 911 chmod 0644, "$DATADIR/$_~";
738 rename "$DATADIR/$_~", "$DATADIR/$_" 912 rename "$DATADIR/$_~", "$DATADIR/$_"
739 or die "$DATADIR/$_: $!"; 913 or die "$DATADIR/$_: $!";
740 } 914 }
741 915

Diff Legend

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