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.61 by root, Thu Aug 30 07:13:17 2007 UTC vs.
Revision 1.97 by root, Wed Oct 6 01:23:11 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 # 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}
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";
159}
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 =~ /^monster.*\/(.)/) {
174 $1
175
176 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
177 "."
178
179 } elsif ($stem =~ /^player\//) {
180 "\@"
181
182 } else {
183 substr $stem, 0, 1
184 }
105} 185}
106 186
107{ 187{
108 our %ANIMINFO; 188 our %ANIMINFO;
109 our %FACEINFO; 189 our %FACEINFO;
… …
120 our $c_trs = new Coro::Channel; 200 our $c_trs = new Coro::Channel;
121 our $c_res = new Coro::Channel; 201 our $c_res = new Coro::Channel;
122 202
123 our @c_png; 203 our @c_png;
124 204
125 sub commit_png($$$) { 205 sub commit_png($$$$) {
126 my ($name, $data, $T) = @_; 206 my ($stem, $name, $data, $T) = @_;
127 207
208 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
128 $FACEINFO{$name}{"data$T"} = $data; 209 $FACEINFO{$name}{"data$T"} = $data;
129 } 210 }
130 211
131 sub process_png { 212 sub process_png {
132 while (@c_png) { 213 while (@c_png) {
… …
268 fork_sub { 349 fork_sub {
269 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 350 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
270 system $OPTIPNG, "-i0", "-q", "$other~"; 351 system $OPTIPNG, "-i0", "-q", "$other~";
271 352
272 # reduce smoothfaces >10000 bytes 353 # reduce smoothfaces >10000 bytes
354 # obsolete, no longer required
273 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 355 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
274 my $ncolor = 256; 356 my $ncolor = 256;
275 while () { 357 while () {
276 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 358 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
277 system $OPTIPNG, "-i0", "-q", "$other~~"; 359 system $OPTIPNG, "-i0", "-q", "$other~~";
278 last if 10000 > -s "$other~~"; 360 last if 10000 > -s "$other~~";
… …
349 431
350 if (0 > aio_load $file, $tile) { 432 if (0 > aio_load $file, $tile) {
351 die "$path: unable to read tile +$x+$y, aborting.\n"; 433 die "$path: unable to read tile +$x+$y, aborting.\n";
352 } 434 }
353 IO::AIO::aio_unlink $file unless $CACHE; 435 IO::AIO::aio_unlink $file unless $CACHE;
354 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 436 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
355 } 437 }
356 } else { 438 } else {
357 # use as-is (either small, use smooth) 439 # use as-is (either small, use smooth)
358 commit_png $face, $png, $T; 440 commit_png $stem, $face, $png, $T;
359 } 441 }
360 442
361 aio_unlink $path if $delete; 443 aio_unlink $path if $delete;
362 } 444 }
363 } 445 }
… …
374 push @ARC, $o; 456 push @ARC, $o;
375 for (my $m = $o; $m; $m = $m->{more}) { 457 for (my $m = $o; $m; $m = $m->{more}) {
376 $ARC{$m->{_name}} = $m; 458 $ARC{$m->{_name}} = $m;
377 } 459 }
378 460
379 $o->{editor_folder} = $dir; 461 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
380 462
381 my $visibility = delete $o->{visibility}; 463 my $visibility = delete $o->{visibility};
382 my $magicmap = delete $o->{magicmap}; 464 my $magicmap = delete $o->{magicmap};
465 my $glyph = delete $o->{glyph};
383 466
384 # find upper left corner :/ 467 # find upper left corner :/
385 # omg, this is sooo broken 468 # omg, this is sooo broken
386 my ($dx, $dy); 469 my ($dx, $dy);
387 for (my $o = $o; $o; $o = $o->{more}) { 470 for (my $o = $o; $o; $o = $o->{more}) {
… …
397 480
398 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 481 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
399 482
400 $visibility = delete $o->{visibility} if exists $o->{visibility}; 483 $visibility = delete $o->{visibility} if exists $o->{visibility};
401 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 484 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
485 $glyph = delete $o->{glyph} if exists $o->{glyph};
402 486
403 my $anim = delete $o->{anim}; 487 my $anim = delete $o->{anim};
404 488
405 if ($anim) { 489 if ($anim) {
406 # possibly add $ext to the animation name to avoid 490 # possibly add $ext to the animation name to avoid
… …
437 521
438 next if $face =~ /^blank.x11$|^empty.x11$/; 522 next if $face =~ /^blank.x11$|^empty.x11$/;
439 523
440 $info->{visibility} = $visibility if defined $visibility; 524 $info->{visibility} = $visibility if defined $visibility;
441 $info->{magicmap} = $magicmap if defined $magicmap; 525 $info->{magicmap} = $magicmap if defined $magicmap;
526 $info->{glyph} = $glyph if defined $glyph;
442 } 527 }
443 528
444 if (my $smooth = delete $o->{smoothface}) { 529 if (my $smooth = delete $o->{smoothface}) {
445 my %kv = split /\s+/, $smooth; 530 my %kv = split /\s+/, $smooth;
446 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 531 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
494 my ($dir, $file, $type) = @$job; 579 my ($dir, $file, $type) = @$job;
495 580
496 my $data; 581 my $data;
497 aio_load "$dir/$file", $data; 582 aio_load "$dir/$file", $data;
498 583
499
500 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 584 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
501 585
502 utf8::decode $dir; 586 utf8::decode $dir;
503 utf8::decode $file; 587 utf8::decode $file;
504 588
… …
516 if ($meta->{license} =~ s/^#//) { 600 if ($meta->{license} =~ s/^#//) {
517 $meta->{license} = ({ 601 $meta->{license} = ({
518 "pd" => "Public Domain", 602 "pd" => "Public Domain",
519 "gpl" => "GNU General Public License, version 3.0 or any later", 603 "gpl" => "GNU General Public License, version 3.0 or any later",
520 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 604 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
605 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
521 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 606 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
522 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 607 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
523 })->{$meta->{license}} 608 })->{$meta->{license}}
524 || warn "$dir/$file: license tag '$meta->{license}' not found."; 609 || warn "$dir/$file: license tag '$meta->{license}' not found.";
525 } 610 }
526 611
612 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
613 ($meta->{author} = $1) =~ s/_/ /g;
614 }
615
527 $file =~ s/\.res$//; 616 $file =~ s/\.res$//;
528 $file =~ s/\.(ogg|wav|jpg|png)$//; 617 $file =~ s/\.(ogg|wav|jpg|png)$//;
529 618
530 substr $dir, 0, 1 + length $PATH, ""; 619 substr $dir, 0, 1 + length $PATH, "";
531 620
621 if (my $filter = $meta->{cfutil_filter}) {
622 if ($filter eq "yaml2json") {
623 $data = JSON::XS::encode_json YAML::XS::Load $data;
624 } elsif ($filter eq "json2json") {
625 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
626 } elsif ($filter eq "perl2json") {
627 $data = eval $data; die if $@;
628 $data = JSON::XS::encode_json $data;
629 } else {
630 warn "$dir/$file: unknown filter $filter, skipping\n";
631 }
632 }
633
532 $RESOURCE{"$dir/$file"} = { 634 $RESOURCE{"$dir/$file"} = {
533 type => (delete $meta->{type}) || $type, 635 type => (exists $meta->{type} ? delete $meta->{type} : $type),
534 data => $data, 636 data => $data,
535 %$meta ? (meta => $meta) : (), 637 %$meta ? (meta => $meta) : (),
536 }; 638 };
537 } 639 }
538 } 640 }
… …
544 IO::AIO::aioreq_pri 4; 646 IO::AIO::aioreq_pri 4;
545 IO::AIO::aio_scandir $path, 4, sub { 647 IO::AIO::aio_scandir $path, 4, sub {
546 my ($dirs, $nondirs) = @_; 648 my ($dirs, $nondirs) = @_;
547 649
548 find_files "$path/$_" 650 find_files "$path/$_"
549 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 651 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
550 652
551 my $dir = $path; 653 my $dir = $path;
552 substr $dir, 0, 1 + length $PATH, ""; 654 substr $dir, 0, 1 + length $PATH, "";
553 655
554 for my $file (@$nondirs) { 656 for my $file (@$nondirs) {
… …
559 } elsif ($dir =~ /^sound(?:\/|$)/) { 661 } elsif ($dir =~ /^sound(?:\/|$)/) {
560 $c_res->put ([$path, $file, 5]) # FT_SOUND 662 $c_res->put ([$path, $file, 5]) # FT_SOUND
561 if $file =~ /\.(wav|ogg)$/; 663 if $file =~ /\.(wav|ogg)$/;
562 664
563 } elsif ($dir =~ /^res(?:\/|$)/) { 665 } elsif ($dir =~ /^res(?:\/|$)/) {
666 if ($file =~ /\.(jpg|png)$/) {
564 $c_res->put ([$path, $file, 0]) # FT_FACE 667 $c_res->put ([$path, $file, 0]) # FT_FACE
565 if $file =~ /\.(jpg|png)$/; 668 } elsif ($file =~ /\.(res)$/) {
566 $c_res->put ([$path, $file, 7]) # FT_RSRC 669 $c_res->put ([$path, $file, 6]) # FT_RSRC
567 if $file =~ /\.(res)$/; 670 } else {
671 $c_res->put ([$path, $file, undef]);
672 }
568 673
569 } elsif ($file =~ /\.png$/) { 674 } elsif ($file =~ /\.png$/) {
570 push @c_png, ["$path/$file", 0]; 675 push @c_png, ["$path/$file", 0];
571 676
572 } elsif ($file =~ /\.trs$/) { 677 } elsif ($file =~ /\.trs$/) {
… …
578 } else { 683 } else {
579 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 684 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
580 } 685 }
581 } 686 }
582 }; 687 };
688 }
689
690 sub generate_plurals {
691# use Lingua::EN::Inflect ();
692# Lingua::EN::Inflect::classical;
693# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
694# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
695#
696# for my $a (@ARC) {
697# my $name = $a->{name} || $a->{_name};
698#
699# next unless $a->{name_pl};
700# next if $a->{invisible};
701# next if $a->{is_floor};
702# next if $a->{no_pick};
703#
704# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
705# my $pl = $test =~ /^(?:eq|p:.)$/
706# ? $name
707# : Lingua::EN::Inflect::PL $name;
708#
709# if ($pl ne $a->{name_pl}) {
710# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
711# }
712# }
583 } 713 }
584 714
585 sub inst_arch($) { 715 sub inst_arch($) {
586 my (undef, $path) = @_; 716 my (undef, $path) = @_;
587 717
… …
610 my @a_res = map +(async \&process_res), 1..2; 740 my @a_res = map +(async \&process_res), 1..2;
611 my @a_trs = map +(async \&process_trs), 1..2; 741 my @a_trs = map +(async \&process_trs), 1..2;
612 742
613 IO::AIO::flush; 743 IO::AIO::flush;
614 744
615 $c_res->put (undef) for @a_res; 745 $c_res->shutdown;
616 $c_arc->put (undef) for @a_arc; 746 $c_arc->shutdown;
617 $c_trs->put (undef) for @a_trs; 747 $c_trs->shutdown;
618 748
619 print "start file scan, arc, res processing...\n" if $VERBOSE; 749 print "start file scan, arc, res processing...\n" if $VERBOSE;
620 750
621 $_->join for @a_arc; # need to parse all archetypes before png processing 751 $_->join for @a_arc; # need to parse all archetypes before png processing
622 752
623 print "end arc, start png processing...\n" if $VERBOSE; 753 print "end arc, start png processing...\n" if $VERBOSE;
624 754
625 # four png crunchers work fine for my 2x smp machine 755 # eight png crunchers work fine for my 4x smp machine
626 my @a_png = map +(async \&process_png), 1..4; 756 my @a_png = map +(async \&process_png), 1..8;
627 757
628 $_->join for (@a_trs, @a_res, @a_png); 758 $_->join for (@a_trs, @a_res, @a_png);
629 759
630 print "scanning done, processing results...\n" if $VERBOSE; 760 print "scanning done, processing results...\n" if $VERBOSE;
631 { 761 {
632 # remove path prefix from editor_folder 762 # remove path prefix from editor_folder
763 $_->{editor_folder} =~ /^\x00/
633 substr $_->{editor_folder}, 0, 1 + length $path, "" 764 and substr $_->{editor_folder}, 0, 2 + length $path, ""
634 for values %ARC; 765 for values %ARC;
635 766
636 print "resolving inheritance tree...\n" if $VERBOSE; 767 print "resolving inheritance tree...\n" if $VERBOSE;
637 # resolve inherit 768 # resolve inherit
638 while () { 769 while () {
639 my $progress; 770 my $progress;
640 my $loop; 771 my $loop;
641 772
642 for my $o (values %ARC) { 773 for my $o (values %ARC) {
643 if (my $other = $o->{inherit}) { 774 for my $other (split /,/, $o->{inherit}) {
644 if (my $s = $ARC{$other}) { 775 if (my $s = $ARC{$other}) {
645 if ($s->{inherit}) { 776 if ($s->{inherit}) {
646 $loop = $s; 777 $loop = $s;
647 } else { 778 } else {
648 delete $o->{inherit}; 779 delete $o->{inherit};
… …
667 } 798 }
668 799
669 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 800 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
670 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 801 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
671 802
803 print "generating plurals...\n" if $VERBOSE;
804 generate_plurals;
805
672 print "writing archetypes...\n" if $VERBOSE; 806 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
673 open my $fh, ">:utf8", "$DATADIR/archetypes~" 807 open my $fh, ">:utf8", "$DATADIR/archetypes~"
674 or die "$DATADIR/archetypes~: $!"; 808 or die "$DATADIR/archetypes~: $!";
675 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 809 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
676 } 810 }
677 811
678 { 812 {
679 print "writing treasures...\n" if $VERBOSE; 813 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
680 open my $fh, ">:utf8", "$DATADIR/treasures~" 814 open my $fh, ">:utf8", "$DATADIR/treasures~"
681 or die "$DATADIR/treasures~: $!"; 815 or die "$DATADIR/treasures~: $!";
682 print $fh $TRS; 816 print $fh $TRS;
683 } 817 }
684 818
… …
686 print "processing facedata...\n" if $VERBOSE; 820 print "processing facedata...\n" if $VERBOSE;
687 while (my ($k, $v) = each %FACEINFO) { 821 while (my ($k, $v) = each %FACEINFO) {
688 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 822 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
689 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 823 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
690 824
825 make_hash $k, $v->{data32}, $v->{hash32};
826 make_hash $k, $v->{data64}, $v->{hash64};
827
691 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 828 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
692 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 829 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
693 830
694 if (my $magicmap = $v->{magicmap}) { 831 if (my $magicmap = $v->{magicmap}) {
695 $magicmap =~ y/A-Z_\-/a-z/d; 832 $magicmap =~ y/A-Z_\-/a-z/d;
696 $v->{magicmap} = $COLOR{$magicmap}; 833 $v->{magicmap} = $COLOR{$magicmap};
697 } 834 }
698 835
836 my $stem = delete $v->{stem};
837 $v->{glyph} //= autoglyph $stem, $v;
838 utf8::encode $v->{glyph};
839 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
840
699 delete $v->{arc}; 841 delete $v->{arc};
700 } 842 }
701 843
702 print "writing facedata...\n" if $VERBOSE; 844 print "processing resources...\n" if $VERBOSE;
845 my $enc = JSON::XS->new->utf8->canonical->relaxed;
846 while (my ($k, $v) = each %RESOURCE) {
847
848 if ($v->{meta} && $v->{meta}{datadir}) {
849 delete $RESOURCE{$k};
850
851 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
852
853 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
854 open my $fh, ">:raw", "$DATADIR/$k~"
855 or die "$DATADIR/$k~: $!";
856 syswrite $fh, $v->{data};
857 push @COMMIT, $k;
858
859 } else {
860 if ($v->{type} & 1) {
861 # prepend meta info
862
863 my $meta = $enc->encode ({
864 name => $k,
865 %{ $v->{meta} || {} },
866 });
867
868 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
869 }
870
871 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
872 }
873 }
874
875 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
876 scalar keys %FACEINFO,
877 scalar keys %ANIMINFO,
878 scalar keys %RESOURCE
879 if $VERBOSE;
880
703 open my $fh, ">:perlio", "$DATADIR/facedata~" 881 open my $fh, ">:perlio", "$DATADIR/facedata~"
704 or die "$DATADIR/facedata~: $!"; 882 or die "$DATADIR/facedata~: $!";
705 883
706 print $fh freeze { 884 print $fh nfreeze {
707 version => 2, 885 version => 2,
708 faceinfo => \%FACEINFO, 886 faceinfo => \%FACEINFO,
709 animinfo => \%ANIMINFO, 887 animinfo => \%ANIMINFO,
710 resource => \%RESOURCE, 888 resource => \%RESOURCE,
711 }; 889 };
890
712 } 891 }
713 892
714 print "committing files...\n" if $VERBOSE; 893 print "committing files...\n" if $VERBOSE;
715 894
716 for (qw(archetypes facedata treasures)) { 895 for (qw(archetypes facedata treasures), @COMMIT) {
717 chmod 0644, "$DATADIR/$_~"; 896 chmod 0644, "$DATADIR/$_~";
718 rename "$DATADIR/$_~", "$DATADIR/$_" 897 rename "$DATADIR/$_~", "$DATADIR/$_"
719 or die "$DATADIR/$_: $!"; 898 or die "$DATADIR/$_: $!";
720 } 899 }
721 900

Diff Legend

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