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.59 by root, Tue Aug 21 20:00:18 2007 UTC vs.
Revision 1.86 by root, Tue Oct 5 22:33:10 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
… …
120 our $c_trs = new Coro::Channel; 174 our $c_trs = new Coro::Channel;
121 our $c_res = new Coro::Channel; 175 our $c_res = new Coro::Channel;
122 176
123 our @c_png; 177 our @c_png;
124 178
125 sub commit_png($$$) { 179 sub commit_png($$$$) {
126 my ($name, $data, $T) = @_; 180 my ($stem, $name, $data, $T) = @_;
127 181
182 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
128 $FACEINFO{$name}{"data$T"} = $data; 183 $FACEINFO{$name}{"data$T"} = $data;
129 } 184 }
130 185
131 sub process_png { 186 sub process_png {
132 while (@c_png) { 187 while (@c_png) {
… …
268 fork_sub { 323 fork_sub {
269 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 324 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
270 system $OPTIPNG, "-i0", "-q", "$other~"; 325 system $OPTIPNG, "-i0", "-q", "$other~";
271 326
272 # reduce smoothfaces >10000 bytes 327 # reduce smoothfaces >10000 bytes
328 # obsolete, no longer required
273 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 329 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
274 my $ncolor = 256; 330 my $ncolor = 256;
275 while () { 331 while () {
276 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 332 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
277 system $OPTIPNG, "-i0", "-q", "$other~~"; 333 system $OPTIPNG, "-i0", "-q", "$other~~";
278 last if 10000 > -s "$other~~"; 334 last if 10000 > -s "$other~~";
… …
349 405
350 if (0 > aio_load $file, $tile) { 406 if (0 > aio_load $file, $tile) {
351 die "$path: unable to read tile +$x+$y, aborting.\n"; 407 die "$path: unable to read tile +$x+$y, aborting.\n";
352 } 408 }
353 IO::AIO::aio_unlink $file unless $CACHE; 409 IO::AIO::aio_unlink $file unless $CACHE;
354 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 410 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
355 } 411 }
356 } else { 412 } else {
357 # use as-is (either small, use smooth) 413 # use as-is (either small, use smooth)
358 commit_png $face, $png, $T; 414 commit_png $stem, $face, $png, $T;
359 } 415 }
360 416
361 aio_unlink $path if $delete; 417 aio_unlink $path if $delete;
362 } 418 }
363 } 419 }
… …
374 push @ARC, $o; 430 push @ARC, $o;
375 for (my $m = $o; $m; $m = $m->{more}) { 431 for (my $m = $o; $m; $m = $m->{more}) {
376 $ARC{$m->{_name}} = $m; 432 $ARC{$m->{_name}} = $m;
377 } 433 }
378 434
379 $o->{editor_folder} = $dir; 435 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
380 436
381 my $visibility = delete $o->{visibility}; 437 my $visibility = delete $o->{visibility};
382 my $magicmap = delete $o->{magicmap}; 438 my $magicmap = delete $o->{magicmap};
439 my $glyph = delete $o->{glyph};
383 440
384 # find upper left corner :/ 441 # find upper left corner :/
385 # omg, this is sooo broken 442 # omg, this is sooo broken
386 my ($dx, $dy); 443 my ($dx, $dy);
387 for (my $o = $o; $o; $o = $o->{more}) { 444 for (my $o = $o; $o; $o = $o->{more}) {
… …
397 454
398 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 455 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
399 456
400 $visibility = delete $o->{visibility} if exists $o->{visibility}; 457 $visibility = delete $o->{visibility} if exists $o->{visibility};
401 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 458 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
459 $glyph = delete $o->{glyph} if exists $o->{glyph};
402 460
403 my $anim = delete $o->{anim}; 461 my $anim = delete $o->{anim};
404 462
405 if ($anim) { 463 if ($anim) {
406 # possibly add $ext to the animation name to avoid 464 # possibly add $ext to the animation name to avoid
… …
437 495
438 next if $face =~ /^blank.x11$|^empty.x11$/; 496 next if $face =~ /^blank.x11$|^empty.x11$/;
439 497
440 $info->{visibility} = $visibility if defined $visibility; 498 $info->{visibility} = $visibility if defined $visibility;
441 $info->{magicmap} = $magicmap if defined $magicmap; 499 $info->{magicmap} = $magicmap if defined $magicmap;
500 $info->{glyph} = $glyph if defined $glyph;
442 } 501 }
443 502
444 if (my $smooth = delete $o->{smoothface}) { 503 if (my $smooth = delete $o->{smoothface}) {
445 my %kv = split /\s+/, $smooth; 504 my %kv = split /\s+/, $smooth;
446 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 505 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
494 my ($dir, $file, $type) = @$job; 553 my ($dir, $file, $type) = @$job;
495 554
496 my $data; 555 my $data;
497 aio_load "$dir/$file", $data; 556 aio_load "$dir/$file", $data;
498 557
499 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 558 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
500 559
501 next if $meta && !exists $meta->{$file}; 560 utf8::decode $dir;
561 utf8::decode $file;
562
563 # a meta file for resources is now mandatory
564 unless (exists $meta->{$file}) {
565 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
566 next;
567 }
502 568
503 $meta = { 569 $meta = {
504 %{ $meta->{"" } || {} }, 570 %{ $meta->{"" } || {} },
505 %{ $meta->{$file} || {} }, 571 %{ $meta->{$file} || {} },
506 }; 572 };
… …
508 if ($meta->{license} =~ s/^#//) { 574 if ($meta->{license} =~ s/^#//) {
509 $meta->{license} = ({ 575 $meta->{license} = ({
510 "pd" => "Public Domain", 576 "pd" => "Public Domain",
511 "gpl" => "GNU General Public License, version 3.0 or any later", 577 "gpl" => "GNU General Public License, version 3.0 or any later",
512 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 578 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
579 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
513 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 580 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
514 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 581 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
515 })->{$meta->{license}} 582 })->{$meta->{license}}
516 || warn "$dir/$file: license tag '$meta->{license}' not found."; 583 || warn "$dir/$file: license tag '$meta->{license}' not found.";
517 } 584 }
518 585
586 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
587 ($meta->{author} = $1) =~ s/_/ /g;
588 }
589
519 $file =~ s/\.res$//; 590 $file =~ s/\.res$//;
520 $file =~ s/\.(ogg|wav|jpg|png)$//; 591 $file =~ s/\.(ogg|wav|jpg|png)$//;
521 592
522 substr $dir, 0, 1 + length $PATH, ""; 593 substr $dir, 0, 1 + length $PATH, "";
523 594
595 if (my $filter = $meta->{cfutil_filter}) {
596 if ($filter eq "yaml2json") {
597 $data = JSON::XS::encode_json YAML::XS::Load $data;
598 } elsif ($filter eq "json2json") {
599 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
600 } elsif ($filter eq "perl2json") {
601 $data = eval $data; die if $@;
602 $data = JSON::XS::encode_json $data;
603 } else {
604 warn "$dir/$file: unknown filter $filter, skipping\n";
605 }
606 }
607
524 $RESOURCE{"$dir/$file"} = { 608 $RESOURCE{"$dir/$file"} = {
525 type => (delete $meta->{type}) || $type, 609 type => (exists $meta->{type} ? delete $meta->{type} : $type),
526 data => $data, 610 data => $data,
527 %$meta ? (meta => $meta) : (), 611 %$meta ? (meta => $meta) : (),
528 }; 612 };
529 } 613 }
530 } 614 }
… …
536 IO::AIO::aioreq_pri 4; 620 IO::AIO::aioreq_pri 4;
537 IO::AIO::aio_scandir $path, 4, sub { 621 IO::AIO::aio_scandir $path, 4, sub {
538 my ($dirs, $nondirs) = @_; 622 my ($dirs, $nondirs) = @_;
539 623
540 find_files "$path/$_" 624 find_files "$path/$_"
541 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 625 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
542 626
543 my $dir = $path; 627 my $dir = $path;
544 substr $dir, 0, 1 + length $PATH, ""; 628 substr $dir, 0, 1 + length $PATH, "";
545 629
546 for my $file (@$nondirs) { 630 for my $file (@$nondirs) {
… …
551 } elsif ($dir =~ /^sound(?:\/|$)/) { 635 } elsif ($dir =~ /^sound(?:\/|$)/) {
552 $c_res->put ([$path, $file, 5]) # FT_SOUND 636 $c_res->put ([$path, $file, 5]) # FT_SOUND
553 if $file =~ /\.(wav|ogg)$/; 637 if $file =~ /\.(wav|ogg)$/;
554 638
555 } elsif ($dir =~ /^res(?:\/|$)/) { 639 } elsif ($dir =~ /^res(?:\/|$)/) {
640 if ($file =~ /\.(jpg|png)$/) {
556 $c_res->put ([$path, $file, 0]) # FT_FACE 641 $c_res->put ([$path, $file, 0]) # FT_FACE
557 if $file =~ /\.(jpg|png)$/; 642 } elsif ($file =~ /\.(res)$/) {
558 $c_res->put ([$path, $file, 7]) # FT_RSRC 643 $c_res->put ([$path, $file, 6]) # FT_RSRC
559 if $file =~ /\.(res)$/; 644 } else {
645 $c_res->put ([$path, $file, undef]);
646 }
560 647
561 } elsif ($file =~ /\.png$/) { 648 } elsif ($file =~ /\.png$/) {
562 push @c_png, ["$path/$file", 0]; 649 push @c_png, ["$path/$file", 0];
563 650
564 } elsif ($file =~ /\.trs$/) { 651 } elsif ($file =~ /\.trs$/) {
… …
570 } else { 657 } else {
571 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 658 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
572 } 659 }
573 } 660 }
574 }; 661 };
662 }
663
664 sub generate_plurals {
665# use Lingua::EN::Inflect ();
666# Lingua::EN::Inflect::classical;
667# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
668# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
669#
670# for my $a (@ARC) {
671# my $name = $a->{name} || $a->{_name};
672#
673# next unless $a->{name_pl};
674# next if $a->{invisible};
675# next if $a->{is_floor};
676# next if $a->{no_pick};
677#
678# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
679# my $pl = $test =~ /^(?:eq|p:.)$/
680# ? $name
681# : Lingua::EN::Inflect::PL $name;
682#
683# if ($pl ne $a->{name_pl}) {
684# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
685# }
686# }
575 } 687 }
576 688
577 sub inst_arch($) { 689 sub inst_arch($) {
578 my (undef, $path) = @_; 690 my (undef, $path) = @_;
579 691
… …
602 my @a_res = map +(async \&process_res), 1..2; 714 my @a_res = map +(async \&process_res), 1..2;
603 my @a_trs = map +(async \&process_trs), 1..2; 715 my @a_trs = map +(async \&process_trs), 1..2;
604 716
605 IO::AIO::flush; 717 IO::AIO::flush;
606 718
607 $c_res->put (undef) for @a_res; 719 $c_res->shutdown;
608 $c_arc->put (undef) for @a_arc; 720 $c_arc->shutdown;
609 $c_trs->put (undef) for @a_trs; 721 $c_trs->shutdown;
610 722
611 print "start file scan, arc, res processing...\n" if $VERBOSE; 723 print "start file scan, arc, res processing...\n" if $VERBOSE;
612 724
613 $_->join for @a_arc; # need to parse all archetypes before png processing 725 $_->join for @a_arc; # need to parse all archetypes before png processing
614 726
615 print "end arc, start png processing...\n" if $VERBOSE; 727 print "end arc, start png processing...\n" if $VERBOSE;
616 728
617 # four png crunchers work fine for my 2x smp machine 729 # eight png crunchers work fine for my 4x smp machine
618 my @a_png = map +(async \&process_png), 1..4; 730 my @a_png = map +(async \&process_png), 1..8;
619 731
620 $_->join for (@a_trs, @a_res, @a_png); 732 $_->join for (@a_trs, @a_res, @a_png);
621 733
622 print "scanning done, processing results...\n" if $VERBOSE; 734 print "scanning done, processing results...\n" if $VERBOSE;
623 { 735 {
624 # remove path prefix from editor_folder 736 # remove path prefix from editor_folder
737 $_->{editor_folder} =~ /^\x00/
625 substr $_->{editor_folder}, 0, 1 + length $path, "" 738 and substr $_->{editor_folder}, 0, 2 + length $path, ""
626 for values %ARC; 739 for values %ARC;
627 740
628 print "resolving inheritance tree...\n" if $VERBOSE; 741 print "resolving inheritance tree...\n" if $VERBOSE;
629 # resolve inherit 742 # resolve inherit
630 while () { 743 while () {
631 my $progress; 744 my $progress;
632 my $loop; 745 my $loop;
633 746
634 for my $o (values %ARC) { 747 for my $o (values %ARC) {
635 if (my $other = $o->{inherit}) { 748 for my $other (split /,/, $o->{inherit}) {
636 if (my $s = $ARC{$other}) { 749 if (my $s = $ARC{$other}) {
637 if ($s->{inherit}) { 750 if ($s->{inherit}) {
638 $loop = $s; 751 $loop = $s;
639 } else { 752 } else {
640 delete $o->{inherit}; 753 delete $o->{inherit};
… …
659 } 772 }
660 773
661 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 774 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
662 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 775 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
663 776
777 print "generating plurals...\n" if $VERBOSE;
778 generate_plurals;
779
664 print "writing archetypes...\n" if $VERBOSE; 780 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
665 open my $fh, ">:utf8", "$DATADIR/archetypes~" 781 open my $fh, ">:utf8", "$DATADIR/archetypes~"
666 or die "$DATADIR/archetypes~: $!"; 782 or die "$DATADIR/archetypes~: $!";
667 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 783 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
668 } 784 }
669 785
670 { 786 {
671 print "writing treasures...\n" if $VERBOSE; 787 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
672 open my $fh, ">:utf8", "$DATADIR/treasures~" 788 open my $fh, ">:utf8", "$DATADIR/treasures~"
673 or die "$DATADIR/treasures~: $!"; 789 or die "$DATADIR/treasures~: $!";
674 print $fh $TRS; 790 print $fh $TRS;
675 } 791 }
676 792
… …
678 print "processing facedata...\n" if $VERBOSE; 794 print "processing facedata...\n" if $VERBOSE;
679 while (my ($k, $v) = each %FACEINFO) { 795 while (my ($k, $v) = each %FACEINFO) {
680 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 796 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
681 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 797 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
682 798
799 make_hash $k, $v->{data32}, $v->{hash32};
800 make_hash $k, $v->{data64}, $v->{hash64};
801
683 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 802 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
684 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 803 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
804
805 my $stem = delete $v->{stem};
806 $v->{glyph} //= substr $stem, 0, 1;
685 807
686 if (my $magicmap = $v->{magicmap}) { 808 if (my $magicmap = $v->{magicmap}) {
687 $magicmap =~ y/A-Z_\-/a-z/d; 809 $magicmap =~ y/A-Z_\-/a-z/d;
688 $v->{magicmap} = $COLOR{$magicmap}; 810 $v->{magicmap} = $COLOR{$magicmap};
689 } 811 }
690 812
691 delete $v->{arc}; 813 delete $v->{arc};
692 } 814 }
693 815
694 print "writing facedata...\n" if $VERBOSE; 816 print "processing resources...\n" if $VERBOSE;
817 my $enc = JSON::XS->new->utf8->canonical->relaxed;
818 while (my ($k, $v) = each %RESOURCE) {
819
820 if ($v->{meta} && $v->{meta}{datadir}) {
821 delete $RESOURCE{$k};
822
823 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
824
825 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
826 open my $fh, ">:raw", "$DATADIR/$k~"
827 or die "$DATADIR/$k~: $!";
828 syswrite $fh, $v->{data};
829 push @COMMIT, $k;
830
831 } else {
832 if ($v->{type} & 1) {
833 # prepend meta info
834
835 my $meta = $enc->encode ({
836 name => $k,
837 %{ $v->{meta} || {} },
838 });
839
840 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
841 }
842
843 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
844 }
845 }
846
847 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
848 scalar keys %FACEINFO,
849 scalar keys %ANIMINFO,
850 scalar keys %RESOURCE
851 if $VERBOSE;
852
695 open my $fh, ">:perlio", "$DATADIR/facedata~" 853 open my $fh, ">:perlio", "$DATADIR/facedata~"
696 or die "$DATADIR/facedata~: $!"; 854 or die "$DATADIR/facedata~: $!";
697 855
698 print $fh freeze { 856 print $fh nfreeze {
699 version => 2, 857 version => 2,
700 faceinfo => \%FACEINFO, 858 faceinfo => \%FACEINFO,
701 animinfo => \%ANIMINFO, 859 animinfo => \%ANIMINFO,
702 resource => \%RESOURCE, 860 resource => \%RESOURCE,
703 }; 861 };
862
704 } 863 }
705 864
706 print "committing files...\n" if $VERBOSE; 865 print "committing files...\n" if $VERBOSE;
707 866
708 for (qw(archetypes facedata treasures)) { 867 for (qw(archetypes facedata treasures), @COMMIT) {
709 chmod 0644, "$DATADIR/$_~"; 868 chmod 0644, "$DATADIR/$_~";
710 rename "$DATADIR/$_~", "$DATADIR/$_" 869 rename "$DATADIR/$_~", "$DATADIR/$_"
711 or die "$DATADIR/$_: $!"; 870 or die "$DATADIR/$_: $!";
712 } 871 }
713 872

Diff Legend

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