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.76 by root, Tue Nov 3 14:49:39 2009 UTC vs.
Revision 1.105 by root, Sun Oct 17 08:00:09 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@";
… …
21use Coro::EV; 43use Coro::EV;
22use AnyEvent; 44use AnyEvent;
23use YAML::XS (); 45use YAML::XS ();
24use JSON::XS (); 46use JSON::XS ();
25use IO::AIO (); 47use IO::AIO ();
48use Digest::MD5 ();
26 49
27use Coro 5.12; 50use Coro 5.12;
28use Coro::AIO; 51use Coro::AIO;
29use Coro::Util; 52use Coro::Util;
30use Coro::Channel; 53use Coro::Channel;
31use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
32 55
33use Deliantra; 56use Deliantra;
34 57
35$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
59
60sub WRITE_FACEINFO() { 0 }
36 61
37sub usage { 62sub usage {
38 warn <<EOF; 63 warn <<EOF;
39Usage: cfutil [-v] [-q] [--force] [--cache] 64Usage: cfutil [-v] [-q] [--force] [--cache]
40 [--install-arch path] 65 [--install-arch path]
… …
51my $VERBOSE = 1; 76my $VERBOSE = 1;
52my $CACHE = 0; 77my $CACHE = 0;
53my $FORCE; 78my $FORCE;
54my $TMPDIR = "/tmp/cfutil$$~"; 79my $TMPDIR = "/tmp/cfutil$$~";
55my $TMPFILE = "aaaa0"; 80my $TMPFILE = "aaaa0";
81my @COMMIT;
56 82
57our %COLOR = ( 83our %COLOR = (
84 # original cf colours
58 black => 0, 85 black => 0,
59 white => 1, 86 white => 1,
60 navy => 2, 87 navy => 2, # "dark blue"
61 red => 3, 88 red => 3,
62 orange => 4, 89 orange => 4,
63 blue => 5, 90 blue => 5, # "light blue"
64 darkorange => 6, 91 darkorange => 6,
65 green => 7, 92 green => 7,
66 lightgreen => 8, 93 lightgreen => 8,
67 grey => 9, 94 grey => 9,
95 brown => 10, # "yellow"
96 gold => 11, # "light yellow"
97 tan => 12, # yellowish gray
98
99 # new for deliantra
68 brown => 10, 100 none => 13,
101
102 # compatibility to existing archetypes
103 lightblue => 5,
69 gold => 11, 104 gray => 9,
105 yellow => 11,
70 tan => 12, 106 khaki => 12,
71); 107);
72 108
73END { system "rm", "-rf", $TMPDIR } 109END { system "rm", "-rf", $TMPDIR }
74 110
75my $s_INT = EV::signal INT => sub { exit 1 }; 111my $s_INT = EV::signal INT => sub { exit 1 };
76my $s_TERM = EV::signal TERM => sub { exit 1 }; 112my $s_TERM = EV::signal TERM => sub { exit 1 };
113
114our %hash;
115
116# here we could try to avoid collisions and reduce chksum size further
117sub make_hash($\$\$;$) {
118 my ($id, $dataref, $hashref, $clen) = @_;
119
120 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
121
122 if (exists $hash{$hash}) {
123 # hash collision, but some files are simply identical
124 if (${$hash{$hash}[1]} ne $$dataref) {
125 warn "hash collision $hash{$hash}[0] vs. $id\n";
126 exit 1;
127 } else {
128 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
129 }
130 }
131 $hash{$hash} = [$id, $dataref, $hashref];
132
133 $$hashref = $hash;
134}
77 135
78mkdir $TMPDIR, 0700 136mkdir $TMPDIR, 0700
79 or die "$TMPDIR: $!"; 137 or die "$TMPDIR: $!";
80 138
81sub fork_sub(&) { 139sub fork_sub(&) {
… …
111 169
112 print "maps installed successfully.\n"; 170 print "maps installed successfully.\n";
113} 171}
114 172
115{ 173{
174 no utf8; # == values are utf-8 encoded
175
176 our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
177
178 # used to create crude text glyphs for text-based clients
179 sub autoglyph {
180 my ($stem, $face) = @_;
181
182 if ($stem =~ /^wall\/|Nimwall/) {
183 return $WALL_SUFFIX[hex $1]
184 if $stem =~ /(_[0-9A-F]).x11/;
185
186 "█"
187
188 } elsif ($stem =~ /^traps\//) {
189 "☠"
190
191 } elsif ($stem =~ /^armour\/shield/) {
192 "Ø"
193
194 } elsif ($stem =~ /^armour\//) {
195 "A"
196
197 } elsif ($stem =~ /^weapon\//) {
198 "†"
199
200 } elsif ($stem =~ /^readable\//) {
201 "✉"
202
203 } elsif ($stem =~ /^river\//) {
204 "~"
205
206 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
207 "·"
208
209 } elsif ($stem =~ /^spells\//) {
210 "!"
211
212 } elsif ($stem =~ /^exit\//) {
213 "⎆"
214
215 } elsif ($stem =~ /^construct\//) {
216 "⌂"
217
218 } elsif ($stem =~ /^player\//) {
219 "\@"
220
221 } elsif ($stem =~ /^(?:monster|misc|class|connect|gods|indoor|inorganic|mining|music|skills).*\/(.)/) {
222 $1
223
224 } else {
225 substr $stem, 0, 1
226 }
227 }
228}
229
230{
116 our %ANIMINFO; 231 our %ANIMINFO;
117 our %FACEINFO; 232 our %FACEINFO;
118 our %RESOURCE; 233 our %RESOURCE;
119 our @ARC; 234 our @ARC;
120 our %ARC; 235 our %ARC;
… …
123 our $PATH; 238 our $PATH;
124 239
125 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 240 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
126 241
127 our $c_arc = new Coro::Channel; 242 our $c_arc = new Coro::Channel;
128 our $c_trs = new Coro::Channel; 243 our $c_any = new Coro::Channel;
129 our $c_res = new Coro::Channel;
130 244
131 our @c_png; 245 our @c_png;
132 246
133 sub commit_png($$$) { 247 sub commit_png($$$$) {
134 my ($name, $data, $T) = @_; 248 my ($stem, $name, $data, $T) = @_;
135 249
250 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
136 $FACEINFO{$name}{"data$T"} = $data; 251 $FACEINFO{$name}{"data$T"} = $data;
137 } 252 }
138 253
139 sub process_png { 254 sub process_png {
140 while (@c_png) { 255 while (@c_png) {
… …
358 473
359 if (0 > aio_load $file, $tile) { 474 if (0 > aio_load $file, $tile) {
360 die "$path: unable to read tile +$x+$y, aborting.\n"; 475 die "$path: unable to read tile +$x+$y, aborting.\n";
361 } 476 }
362 IO::AIO::aio_unlink $file unless $CACHE; 477 IO::AIO::aio_unlink $file unless $CACHE;
363 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 478 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
364 } 479 }
365 } else { 480 } else {
366 # use as-is (either small, use smooth) 481 # use as-is (either small, use smooth)
367 commit_png $face, $png, $T; 482 commit_png $stem, $face, $png, $T;
368 } 483 }
369 484
370 aio_unlink $path if $delete; 485 aio_unlink $path if $delete;
371 } 486 }
372 } 487 }
373 488
489 sub process_faceinfo {
490 my ($dir, $file) = @_;
491 my $path = "$dir/$file";
492
493 my $data;
494 if (0 > aio_load $path, $data) {
495 warn "$path: $!, skipping.\n";
496 return;
497 }
498
499 for (split /\n/, $data) {
500 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/;
501
502 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
503
504 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
505
506 (my $fgi = $COLOR{$fg})
507 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
508 (my $bgi = $COLOR{$bg})
509 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
510
511 my $fi = $FACEINFO{$face} ||= { };
512 $fi->{visibility} = $visibility * 1;
513 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
514 $fi->{glyph} = (chr $fgi) . (chr $bgi) . $glyph;
515 #$fi->{glyph} = (chr $fgi) . $glyph;#d#TOOD remove
516 # bg not used except for text clients
517 }
518 }
519
374 sub process_arc { 520 sub process_arc {
375 while (my $job = $c_arc->get) { 521 while (my ($dir, $file) = @{ $c_arc->get }) {
376 my ($dir, $file) = @$job;
377
378 my $arc; 522 my $arc;
379 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 523 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
380 524
381 my $arc = read_arch "$dir/$file"; 525 my $arc = read_arch "$dir/$file";
382 for my $o (values %$arc) { 526 for my $o (values %$arc) {
… …
384 for (my $m = $o; $m; $m = $m->{more}) { 528 for (my $m = $o; $m; $m = $m->{more}) {
385 $ARC{$m->{_name}} = $m; 529 $ARC{$m->{_name}} = $m;
386 } 530 }
387 531
388 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 532 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
389
390 my $visibility = delete $o->{visibility};
391 my $magicmap = delete $o->{magicmap};
392 533
393 # find upper left corner :/ 534 # find upper left corner :/
394 # omg, this is sooo broken 535 # omg, this is sooo broken
395 my ($dx, $dy); 536 my ($dx, $dy);
396 for (my $o = $o; $o; $o = $o->{more}) { 537 for (my $o = $o; $o; $o = $o->{more}) {
… …
403 my $y = $o->{y} - $dy; 544 my $y = $o->{y} - $dy;
404 545
405 my $ext = $x|$y ? "+$x+$y" : ""; 546 my $ext = $x|$y ? "+$x+$y" : "";
406 547
407 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 548 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
408
409 $visibility = delete $o->{visibility} if exists $o->{visibility};
410 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
411 549
412 my $anim = delete $o->{anim}; 550 my $anim = delete $o->{anim};
413 551
414 if ($anim) { 552 if ($anim) {
415 # possibly add $ext to the animation name to avoid 553 # possibly add $ext to the animation name to avoid
… …
443 581
444 my $info = $FACEINFO{$face} ||= { }; 582 my $info = $FACEINFO{$face} ||= { };
445 $info->{arc} = $o; 583 $info->{arc} = $o;
446 584
447 next if $face =~ /^blank.x11$|^empty.x11$/; 585 next if $face =~ /^blank.x11$|^empty.x11$/;
448
449 $info->{visibility} = $visibility if defined $visibility;
450 $info->{magicmap} = $magicmap if defined $magicmap;
451 } 586 }
452 587
453 if (my $smooth = delete $o->{smoothface}) { 588 if (my $smooth = delete $o->{smoothface}) {
454 my %kv = split /\s+/, $smooth; 589 my %kv = split /\s+/, $smooth;
455 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 590 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
464 } 599 }
465 } 600 }
466 } 601 }
467 602
468 sub process_trs { 603 sub process_trs {
469 while (my $job = $c_trs->get) {
470 my ($dir, $file) = @$job; 604 my ($dir, $file) = @_;
471 my $path = "$dir/$file"; 605 my $path = "$dir/$file";
472 606
473 my $trs; 607 my $trs;
474 if (0 > aio_load $path, $trs) { 608 if (0 > aio_load $path, $trs) {
475 warn "$path: $!, skipping.\n"; 609 warn "$path: $!, skipping.\n";
476 next; 610 return;
477 } 611 }
478 612
479 $TRS .= $trs; 613 $TRS .= $trs;
480 }
481 } 614 }
482 615
483 my %FILECACHE; 616 my %FILECACHE;
484 617
485 sub load_cached($;$) { 618 sub load_cached($;$) {
… …
497 630
498 $FILECACHE{$_[0]} 631 $FILECACHE{$_[0]}
499 } 632 }
500 633
501 sub process_res { 634 sub process_res {
502 while (my $job = $c_res->get) {
503 my ($dir, $file, $type) = @$job; 635 my ($dir, $file, $type) = @_;
504 636
505 my $data; 637 my $data;
506 aio_load "$dir/$file", $data; 638 aio_load "$dir/$file", $data;
507 639
508 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 640 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
509 641
510 utf8::decode $dir; 642 utf8::decode $dir;
511 utf8::decode $file; 643 utf8::decode $file;
512 644
513 # a meta file for resources is now mandatory 645 # a meta file for resources is now mandatory
514 unless (exists $meta->{$file}) { 646 unless (exists $meta->{$file}) {
515 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 647 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
516 next; 648 return;
517 } 649 }
518 650
519 $meta = { 651 $meta = {
520 %{ $meta->{"" } || {} }, 652 %{ $meta->{"" } || {} },
521 %{ $meta->{$file} || {} }, 653 %{ $meta->{$file} || {} },
522 }; 654 };
523 655
524 if ($meta->{license} =~ s/^#//) { 656 if ($meta->{license} =~ s/^#//) {
525 $meta->{license} = ({ 657 $meta->{license} = ({
526 "pd" => "Public Domain", 658 "pd" => "Public Domain",
527 "gpl" => "GNU General Public License, version 3.0 or any later", 659 "gpl" => "GNU General Public License, version 3.0 or any later",
528 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 660 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
661 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
529 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 662 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
530 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 663 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
531 })->{$meta->{license}} 664 })->{$meta->{license}}
532 || warn "$dir/$file: license tag '$meta->{license}' not found."; 665 || warn "$dir/$file: license tag '$meta->{license}' not found.";
533 } 666 }
534 667
668 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
669 ($meta->{author} = $1) =~ s/_/ /g;
670 }
671
535 $file =~ s/\.res$//; 672 $file =~ s/\.res$//;
536 $file =~ s/\.(ogg|wav|jpg|png)$//; 673 $file =~ s/\.(ogg|wav|jpg|png)$//;
537 674
538 substr $dir, 0, 1 + length $PATH, ""; 675 substr $dir, 0, 1 + length $PATH, "";
539 676
540 if (my $filter = $meta->{cfutil_filter}) { 677 if (my $filter = $meta->{cfutil_filter}) {
541 if ($filter eq "yaml2json") { 678 if ($filter eq "yaml2json") {
542 $data = JSON::XS::encode_json YAML::XS::Load $data; 679 $data = JSON::XS::encode_json YAML::XS::Load $data;
543 } elsif ($filter eq "json2json") { 680 } elsif ($filter eq "json2json") {
544 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 681 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
545 } elsif ($filter eq "perl2json") { 682 } elsif ($filter eq "perl2json") {
546 $data = eval $data; die if $@; 683 $data = eval $data; die if $@;
547 $data = JSON::XS::encode_json $data; 684 $data = JSON::XS::encode_json $data;
548 } else { 685 } else {
549 warn "$dir/$file: unknown filter $filter, skipping\n"; 686 warn "$dir/$file: unknown filter $filter, skipping\n";
550 } 687 }
551 } 688 }
552 689
553 $RESOURCE{"$dir/$file"} = { 690 $RESOURCE{"$dir/$file"} = {
554 type => (exists $meta->{type} ? delete $meta->{type} : $type), 691 type => (exists $meta->{type} ? delete $meta->{type} : $type),
555 data => $data, 692 data => $data,
556 %$meta ? (meta => $meta) : (), 693 %$meta ? (meta => $meta) : (),
557 }; 694 };
695 }
696
697 sub process_any {
698 while (my ($func, @args) = @{ $c_any->get }) {
699 $func->(@args);
558 } 700 }
559 } 701 }
560 702
561 sub find_files; 703 sub find_files;
562 sub find_files { 704 sub find_files {
563 my ($path) = @_; 705 my ($path) = @_;
564 706
707 my $grp = IO::AIO::aio_group;
708
709 my $scandir; $scandir = sub {
710 my ($path) = @_;
711
565 IO::AIO::aioreq_pri 4; 712 IO::AIO::aioreq_pri 4;
566 IO::AIO::aio_scandir $path, 4, sub { 713 add $grp IO::AIO::aio_scandir $path, 4, sub {
567 my ($dirs, $nondirs) = @_; 714 my ($dirs, $nondirs) = @_;
568 715
569 find_files "$path/$_" 716 $scandir->("$path/$_")
570 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 717 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
571 718
572 my $dir = $path; 719 my $dir = $path;
573 substr $dir, 0, 1 + length $PATH, ""; 720 substr $dir, 0, 1 + length $PATH, "";
574 721
575 for my $file (@$nondirs) { 722 for my $file (@$nondirs) {
576 if ($dir =~ /^music(?:\/|$)/) { 723 if ($dir =~ /^music(?:\/|$)/) {
577 $c_res->put ([$path, $file, 3]) # FT_MUSIC 724 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
578 if $file =~ /\.(ogg)$/; 725 if $file =~ /\.(ogg)$/;
579 726
580 } elsif ($dir =~ /^sound(?:\/|$)/) { 727 } elsif ($dir =~ /^sound(?:\/|$)/) {
581 $c_res->put ([$path, $file, 5]) # FT_SOUND 728 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
582 if $file =~ /\.(wav|ogg)$/; 729 if $file =~ /\.(wav|ogg)$/;
583 730
584 } elsif ($dir =~ /^res(?:\/|$)/) { 731 } elsif ($dir =~ /^res(?:\/|$)/) {
585 if ($file =~ /\.(jpg|png)$/) { 732 if ($file =~ /\.(jpg|png)$/) {
586 $c_res->put ([$path, $file, 0]) # FT_FACE 733 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
587 } elsif ($file =~ /\.(res)$/) { 734 } elsif ($file =~ /\.(res)$/) {
735 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
736 } else {
737 $c_any->put ([\&process_res, $path, $file, undef]);
738 }
739
740 } elsif ($file =~ /\.png$/) {
741 push @c_png, ["$path/$file", 0];
742
743 } elsif ($file =~ /\.faceinfo$/) {
744 $c_any->put ([\&process_faceinfo, $path, $file]);
745
746 } elsif ($file =~ /\.trs$/) {
747 $c_any->put ([\&process_trs, $path, $file]);
748
749 } elsif ($file =~ /\.arc$/) {
588 $c_res->put ([$path, $file, 6]) # FT_RSRC 750 $c_arc->put ([$path, $file]);
751
589 } else { 752 } else {
590 $c_res->put ([$path, $file, undef]); 753 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
591 } 754 }
592
593 } elsif ($file =~ /\.png$/) {
594 push @c_png, ["$path/$file", 0];
595
596 } elsif ($file =~ /\.trs$/) {
597 $c_trs->put ([$path, $file]);
598
599 } elsif ($file =~ /\.arc$/) {
600 $c_arc->put ([$path, $file]);
601
602 } else { 755 }
603 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
604 }
605 } 756 };
606 }; 757 };
758
759 $scandir->($path);
760 aio_wait $grp;
607 } 761 }
608 762
609 sub generate_plurals { 763 sub generate_plurals {
610# use Lingua::EN::Inflect (); 764# use Lingua::EN::Inflect ();
611# Lingua::EN::Inflect::classical; 765# Lingua::EN::Inflect::classical;
… …
649 if (!-d "$path/treasures") { 803 if (!-d "$path/treasures") {
650 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 804 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
651 exit 1 unless $FORCE; 805 exit 1 unless $FORCE;
652 } 806 }
653 807
654 print "scanning files...\n" if $VERBOSE; 808 print "start file scan, arc, any processing...\n" if $VERBOSE;
809
810 my @a_arc = map +(async \&process_arc), 1..2;
811 my @a_any = map +(async \&process_any), 1..4;
655 812
656 find_files $path; 813 find_files $path;
657 814
658 my @a_arc = map +(async \&process_arc), 1..2;
659 my @a_res = map +(async \&process_res), 1..2;
660 my @a_trs = map +(async \&process_trs), 1..2;
661
662 IO::AIO::flush;
663
664 $c_res->shutdown;
665 $c_arc->shutdown; 815 $c_arc->shutdown;
666 $c_trs->shutdown; 816 $c_any->shutdown;
667
668 print "start file scan, arc, res processing...\n" if $VERBOSE;
669 817
670 $_->join for @a_arc; # need to parse all archetypes before png processing 818 $_->join for @a_arc; # need to parse all archetypes before png processing
671 819
672 print "end arc, start png processing...\n" if $VERBOSE; 820 print "end arc, start png processing...\n" if $VERBOSE;
673 821
674 # eight png crunchers work fine for my 4x smp machine 822 # eight png crunchers work fine for my 4x smp machine
675 my @a_png = map +(async \&process_png), 1..8; 823 my @a_png = map +(async \&process_png), 1..8;
676 824
677 $_->join for (@a_trs, @a_res, @a_png); 825 print "end any processing...\n" if $VERBOSE;
826 $_->join for @a_any;
827
828 print "end png processing...\n" if $VERBOSE;
829 $_->join for @a_png;
678 830
679 print "scanning done, processing results...\n" if $VERBOSE; 831 print "scanning done, processing results...\n" if $VERBOSE;
680 { 832 {
681 # remove path prefix from editor_folder 833 # remove path prefix from editor_folder
682 $_->{editor_folder} =~ /^\x00/ 834 $_->{editor_folder} =~ /^\x00/
… …
688 while () { 840 while () {
689 my $progress; 841 my $progress;
690 my $loop; 842 my $loop;
691 843
692 for my $o (values %ARC) { 844 for my $o (values %ARC) {
693 if (my $other = $o->{inherit}) { 845 for my $other (split /,/, $o->{inherit}) {
694 if (my $s = $ARC{$other}) { 846 if (my $s = $ARC{$other}) {
695 if ($s->{inherit}) { 847 if ($s->{inherit}) {
696 $loop = $s; 848 $loop = $s;
697 } else { 849 } else {
698 delete $o->{inherit}; 850 delete $o->{inherit};
… …
700 delete @s{qw(_name more name name_pl)}; 852 delete @s{qw(_name more name name_pl)};
701 %$o = ( %s, %$o ); 853 %$o = ( %s, %$o );
702 ++$progress; 854 ++$progress;
703 } 855 }
704 } else { 856 } else {
705 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 857 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
706 delete $ARC{$o->{_name}}; 858 delete $ARC{$o->{_name}};
707 } 859 }
708 } 860 }
709 } 861 }
710 862
… …
717 } 869 }
718 870
719 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 871 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
720 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 872 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
721 873
874 # fix up archetypes without names, where the archanme doesn't work at all
875 for (@ARC) {
876 if (!exists $_->{name} and $_->{_name} =~ /_/) {
877 for ($_->{name} = $_->{_name}) {
878 s/(?:_\d+)+$//;
879 s/_[nesw]+$//;
880 y/_/ /;
881 }
882 }
883 }
884
722 print "generating plurals...\n" if $VERBOSE; 885 #print "generating plurals...\n" if $VERBOSE;
723 generate_plurals; 886 #generate_plurals;
724 887
725 print "writing archetypes...\n" if $VERBOSE; 888 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
726 open my $fh, ">:utf8", "$DATADIR/archetypes~" 889 open my $fh, ">:utf8", "$DATADIR/archetypes~"
727 or die "$DATADIR/archetypes~: $!"; 890 or die "$DATADIR/archetypes~: $!";
728 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 891 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
729 } 892 }
730 893
894 if (WRITE_FACEINFO) {
895 my @table;
896 for my $face (sort keys %FACEINFO) {
897 my $v = $FACEINFO{$face};
898 (my $xf = $face) =~ s/\+\d+\+\d+$//;
899
900 $v->{magicmap} //= $FACEINFO{$xf}{magicmap};
901 $v->{glyph} //= $FACEINFO{$xf}{glyph};
902
903 $v->{magicmap} =~ y/A-Z_\-/a-z/d;
904
905 delete $v->{glyph} if $v->{glyph} =~ /^\?./;
906
907 my $stem = $v->{stem};
908 $v->{glyph} = $v->{glyph} // ("?" . (autoglyph $stem, $v));
909
910 push @table, [$face, $v->{visibility} || 0, $v->{magicmap} || "none", "none ", $v->{glyph}];
911 }
912 use Text::Table;
913 my $tb = new Text::Table undef, { align => "num" }, undef, undef, undef;
914 $tb->load (@table);
915 open my $fh, ">:raw", "default.faceinfo"or die;
916 print $fh $tb;
917 print "default.faceinfo written, exiting.\n";
918 exit 77;
919 }
920
731 { 921 {
732 print "writing treasures...\n" if $VERBOSE; 922 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
733 open my $fh, ">:utf8", "$DATADIR/treasures~" 923 open my $fh, ">:utf8", "$DATADIR/treasures~"
734 or die "$DATADIR/treasures~: $!"; 924 or die "$DATADIR/treasures~: $!";
735 print $fh $TRS; 925 print $fh $TRS;
736 } 926 }
737 927
738 { 928 {
739 print "processing facedata...\n" if $VERBOSE; 929 print "processing facedata...\n" if $VERBOSE;
740 while (my ($k, $v) = each %FACEINFO) { 930 while (my ($k, $v) = each %FACEINFO) {
741 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 931 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
742 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 932 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
743 933
934 make_hash $k, $v->{data32}, $v->{hash32};
935 make_hash $k, $v->{data64}, $v->{hash64};
936
744 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 937 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
745 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 938 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
746 939
747 if (my $magicmap = $v->{magicmap}) { 940 exists $v->{visibility}
748 $magicmap =~ y/A-Z_\-/a-z/d; 941 or warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
749 $v->{magicmap} = $COLOR{$magicmap}; 942
750 } 943 my $stem = delete $v->{stem};
944 $v->{glyph} // warn "WARNING: face '$k' has glyph, cannot autoglyph at the moment.";
945 #$v->{glyph} //= autoglyph $stem, $v;
751 946
752 delete $v->{arc}; 947 delete $v->{arc};
753 } 948 }
754 949
755 print "writing facedata...\n" if $VERBOSE; 950 print "processing resources...\n" if $VERBOSE;
951 my $enc = JSON::XS->new->utf8->canonical->relaxed;
952 while (my ($k, $v) = each %RESOURCE) {
953
954 if ($v->{meta} && $v->{meta}{datadir}) {
955 delete $RESOURCE{$k};
956
957 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
958
959 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
960 open my $fh, ">:raw", "$DATADIR/$k~"
961 or die "$DATADIR/$k~: $!";
962 syswrite $fh, $v->{data};
963 push @COMMIT, $k;
964
965 } else {
966 if ($v->{type} & 1) {
967 # prepend meta info
968
969 my $meta = $enc->encode ({
970 name => $k,
971 %{ $v->{meta} || {} },
972 });
973
974 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
975 }
976
977 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
978 }
979 }
980
981 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
982 scalar keys %FACEINFO,
983 scalar keys %ANIMINFO,
984 scalar keys %RESOURCE
985 if $VERBOSE;
986
756 open my $fh, ">:perlio", "$DATADIR/facedata~" 987 open my $fh, ">:perlio", "$DATADIR/facedata~"
757 or die "$DATADIR/facedata~: $!"; 988 or die "$DATADIR/facedata~: $!";
758 989
759 print $fh freeze { 990 print $fh nfreeze {
760 version => 2, 991 version => 2,
761 faceinfo => \%FACEINFO, 992 faceinfo => \%FACEINFO,
762 animinfo => \%ANIMINFO, 993 animinfo => \%ANIMINFO,
763 resource => \%RESOURCE, 994 resource => \%RESOURCE,
764 }; 995 };
996
765 } 997 }
766 998
767 print "committing files...\n" if $VERBOSE; 999 print "committing files...\n" if $VERBOSE;
768 1000
769 for (qw(archetypes facedata treasures)) { 1001 for (qw(archetypes facedata treasures), @COMMIT) {
770 chmod 0644, "$DATADIR/$_~"; 1002 chmod 0644, "$DATADIR/$_~";
771 rename "$DATADIR/$_~", "$DATADIR/$_" 1003 rename "$DATADIR/$_~", "$DATADIR/$_"
772 or die "$DATADIR/$_: $!"; 1004 or die "$DATADIR/$_: $!";
773 } 1005 }
774 1006

Diff Legend

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