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

Diff Legend

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