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.56 by root, Sun Aug 19 15:47:56 2007 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@";
… …
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 Digest::MD5;
27use Carp;
28use Coro::Channel; 53use Coro::Channel;
29use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
30 55
56use Deliantra;
57
31$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
59
60sub WRITE_FACEINFO() { 0 }
32 61
33sub usage { 62sub usage {
34 warn <<EOF; 63 warn <<EOF;
35Usage: cfutil [-v] [-q] [--force] [--cache] 64Usage: cfutil [-v] [-q] [--force] [--cache]
36 [--install-arch path] 65 [--install-arch path]
… …
47my $VERBOSE = 1; 76my $VERBOSE = 1;
48my $CACHE = 0; 77my $CACHE = 0;
49my $FORCE; 78my $FORCE;
50my $TMPDIR = "/tmp/cfutil$$~"; 79my $TMPDIR = "/tmp/cfutil$$~";
51my $TMPFILE = "aaaa0"; 80my $TMPFILE = "aaaa0";
81my @COMMIT;
52 82
53our %COLOR = ( 83our %COLOR = (
84 # original cf colours
54 black => 0, 85 black => 0,
55 white => 1, 86 white => 1,
56 navy => 2, 87 navy => 2, # "dark blue"
57 red => 3, 88 red => 3,
58 orange => 4, 89 orange => 4,
59 blue => 5, 90 blue => 5, # "light blue"
60 darkorange => 6, 91 darkorange => 6,
61 green => 7, 92 green => 7,
62 lightgreen => 8, 93 lightgreen => 8,
63 grey => 9, 94 grey => 9,
95 brown => 10, # "yellow"
96 gold => 11, # "light yellow"
97 tan => 12, # yellowish gray
98
99 # new for deliantra
64 brown => 10, 100 none => 13,
101
102 # compatibility to existing archetypes
103 lightblue => 5,
65 gold => 11, 104 gray => 9,
105 yellow => 11,
66 tan => 12, 106 khaki => 12,
67); 107);
68 108
69END { system "rm", "-rf", $TMPDIR } 109END { system "rm", "-rf", $TMPDIR }
70 110
71Event->signal (signal => "INT", cb => sub { exit 1 }); 111my $s_INT = EV::signal INT => sub { exit 1 };
72Event->signal (signal => "TERM", cb => 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}
73 135
74mkdir $TMPDIR, 0700 136mkdir $TMPDIR, 0700
75 or die "$TMPDIR: $!"; 137 or die "$TMPDIR: $!";
76 138
77sub fork_sub(&) { 139sub fork_sub(&) {
… …
97 if (!-f "$path/regions") { 159 if (!-f "$path/regions") {
98 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 160 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
99 exit 1 unless $FORCE; 161 exit 1 unless $FORCE;
100 } 162 }
101 163
102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 164 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
165 "$path/.", "$DATADIR/maps/.",
166 "--exclude", "CVS", "--exclude", "/world-precomposed",
167 "--delete", "--delete-excluded"
103 and die "map installation failed.\n"; 168 and die "map installation failed.\n";
104 169
105 print "maps installed successfully.\n"; 170 print "maps installed successfully.\n";
171}
172
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 }
106} 228}
107 229
108{ 230{
109 our %ANIMINFO; 231 our %ANIMINFO;
110 our %FACEINFO; 232 our %FACEINFO;
… …
116 our $PATH; 238 our $PATH;
117 239
118 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 240 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
119 241
120 our $c_arc = new Coro::Channel; 242 our $c_arc = new Coro::Channel;
121 our $c_trs = new Coro::Channel; 243 our $c_any = new Coro::Channel;
122 our $c_res = new Coro::Channel;
123 244
124 our @c_png; 245 our @c_png;
125 246
126 sub commit_png($$$) { 247 sub commit_png($$$$) {
127 my ($name, $data, $T) = @_; 248 my ($stem, $name, $data, $T) = @_;
128 249
250 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
129 $FACEINFO{$name}{"data$T"} = $data; 251 $FACEINFO{$name}{"data$T"} = $data;
130 } 252 }
131 253
132 sub process_png { 254 sub process_png {
133 while (@c_png) { 255 while (@c_png) {
… …
174 296
175 (my $base = $stem) =~ s/^.*\///; 297 (my $base = $stem) =~ s/^.*\///;
176 298
177 my $fi = $FACEINFO{$base}; 299 my $fi = $FACEINFO{$base};
178 unless ($fi) { 300 unless ($fi) {
179 warn "$path: <$base> not referenced by any archetype, skipping.\n"; 301 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
180 next; 302 #next;
181 } 303 }
182 304
183 my $arc = $FACEINFO{$base}{arc} 305 my $arc = $fi->{arc} || { };
184 or die "FATAL: internal error <$base>, cannot continue";
185 306
186 unless ($path =~ /~$/) { 307 unless ($path =~ /~$/) {
187 # possibly enlarge 308 # possibly enlarge
188 if (0 > aio_stat "$stem.64x64.png") { 309 if (0 > aio_stat "$stem.64x64.png") {
189 my $other = "$stem.64x64.png~"; 310 my $other = "$stem.64x64.png~";
… …
270 fork_sub { 391 fork_sub {
271 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 392 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
272 system $OPTIPNG, "-i0", "-q", "$other~"; 393 system $OPTIPNG, "-i0", "-q", "$other~";
273 394
274 # reduce smoothfaces >10000 bytes 395 # reduce smoothfaces >10000 bytes
396 # obsolete, no longer required
275 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 397 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
276 my $ncolor = 256; 398 my $ncolor = 256;
277 while () { 399 while () {
278 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 400 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
279 system $OPTIPNG, "-i0", "-q", "$other~~"; 401 system $OPTIPNG, "-i0", "-q", "$other~~";
280 last if 10000 > -s "$other~~"; 402 last if 10000 > -s "$other~~";
… …
351 473
352 if (0 > aio_load $file, $tile) { 474 if (0 > aio_load $file, $tile) {
353 die "$path: unable to read tile +$x+$y, aborting.\n"; 475 die "$path: unable to read tile +$x+$y, aborting.\n";
354 } 476 }
355 IO::AIO::aio_unlink $file unless $CACHE; 477 IO::AIO::aio_unlink $file unless $CACHE;
356 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 478 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
357 } 479 }
358 } else { 480 } else {
359 # use as-is (either small, use smooth) 481 # use as-is (either small, use smooth)
360 commit_png $face, $png, $T; 482 commit_png $stem, $face, $png, $T;
361 } 483 }
362 484
363 aio_unlink $path if $delete; 485 aio_unlink $path if $delete;
364 } 486 }
365 } 487 }
366 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
367 sub process_arc { 520 sub process_arc {
368 while (my $job = $c_arc->get) { 521 while (my ($dir, $file) = @{ $c_arc->get }) {
369 my ($dir, $file) = @$job;
370
371 my $arc; 522 my $arc;
372 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 :/
373 524
374 my $arc = read_arch "$dir/$file"; 525 my $arc = read_arch "$dir/$file";
375 for my $o (values %$arc) { 526 for my $o (values %$arc) {
376 push @ARC, $o; 527 push @ARC, $o;
377 for (my $m = $o; $m; $m = $m->{more}) { 528 for (my $m = $o; $m; $m = $m->{more}) {
378 $ARC{$m->{_name}} = $m; 529 $ARC{$m->{_name}} = $m;
379 } 530 }
380 531
381 $o->{editor_folder} = $dir; 532 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
382
383 my $visibility = delete $o->{visibility};
384 my $magicmap = delete $o->{magicmap};
385 533
386 # find upper left corner :/ 534 # find upper left corner :/
387 # omg, this is sooo broken 535 # omg, this is sooo broken
388 my ($dx, $dy); 536 my ($dx, $dy);
389 for (my $o = $o; $o; $o = $o->{more}) { 537 for (my $o = $o; $o; $o = $o->{more}) {
… …
396 my $y = $o->{y} - $dy; 544 my $y = $o->{y} - $dy;
397 545
398 my $ext = $x|$y ? "+$x+$y" : ""; 546 my $ext = $x|$y ? "+$x+$y" : "";
399 547
400 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 548 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
401
402 $visibility = delete $o->{visibility} if exists $o->{visibility};
403 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
404 549
405 my $anim = delete $o->{anim}; 550 my $anim = delete $o->{anim};
406 551
407 if ($anim) { 552 if ($anim) {
408 # possibly add $ext to the animation name to avoid 553 # possibly add $ext to the animation name to avoid
… …
426 facings => $facings, 571 facings => $facings,
427 frames => \@frames, 572 frames => \@frames,
428 }; 573 };
429 } 574 }
430 575
431 for my $face ($o->{face} || (), @{$anim || []}) { 576 for ($o->{face} || (), @{$anim || []}) {
432 next if $face =~ /^facings\s/; 577 next if /^facings\s/;
578
579 my $face = $_;
580 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
433 581
434 my $info = $FACEINFO{$face} ||= { }; 582 my $info = $FACEINFO{$face} ||= { };
435 $info->{arc} = $o; 583 $info->{arc} = $o;
436 584
437 next if $face =~ /^blank.x11$|^empty.x11$/; 585 next if $face =~ /^blank.x11$|^empty.x11$/;
438
439 $info->{visibility} = $visibility if defined $visibility;
440 $info->{magicmap} = $magicmap if defined $magicmap;
441 } 586 }
442 587
443 if (my $smooth = delete $o->{smoothface}) { 588 if (my $smooth = delete $o->{smoothface}) {
444 my %kv = split /\s+/, $smooth; 589 my %kv = split /\s+/, $smooth;
445 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 590 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
454 } 599 }
455 } 600 }
456 } 601 }
457 602
458 sub process_trs { 603 sub process_trs {
459 while (my $job = $c_trs->get) {
460 my ($dir, $file) = @$job; 604 my ($dir, $file) = @_;
461 my $path = "$dir/$file"; 605 my $path = "$dir/$file";
462 606
463 my $trs; 607 my $trs;
464 if (0 > aio_load $path, $trs) { 608 if (0 > aio_load $path, $trs) {
465 warn "$path: $!, skipping.\n"; 609 warn "$path: $!, skipping.\n";
466 next; 610 return;
467 } 611 }
468 612
469 $TRS .= $trs; 613 $TRS .= $trs;
470 }
471 } 614 }
472 615
473 my %FILECACHE; 616 my %FILECACHE;
474 617
475 sub load_cached($;$) { 618 sub load_cached($;$) {
… …
487 630
488 $FILECACHE{$_[0]} 631 $FILECACHE{$_[0]}
489 } 632 }
490 633
491 sub process_res { 634 sub process_res {
492 while (my $job = $c_res->get) {
493 my ($dir, $file, $type) = @$job; 635 my ($dir, $file, $type) = @_;
494 636
495 my $data; 637 my $data;
496 aio_load "$dir/$file", $data; 638 aio_load "$dir/$file", $data;
497 639
498 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 640 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
499 641
500 next if $meta && !exists $meta->{$file}; 642 utf8::decode $dir;
643 utf8::decode $file;
501 644
645 # a meta file for resources is now mandatory
646 unless (exists $meta->{$file}) {
647 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
648 return;
649 }
650
502 $meta = { 651 $meta = {
503 %{ $meta->{"" } || {} }, 652 %{ $meta->{"" } || {} },
504 %{ $meta->{$file} || {} }, 653 %{ $meta->{$file} || {} },
505 }; 654 };
506 655
507 if ($meta->{license} =~ s/^#//) { 656 if ($meta->{license} =~ s/^#//) {
508 $meta->{license} = ({ 657 $meta->{license} = ({
509 "pd" => "Public Domain", 658 "pd" => "Public Domain",
510 "gpl" => "GNU General Public License, version 3.0 or any later", 659 "gpl" => "GNU General Public License, version 3.0 or any later",
511 "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/",
512 "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/",
513 "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/",
514 })->{$meta->{license}} 664 })->{$meta->{license}}
515 || warn "$dir/$file: license tag '$meta->{license}' not found."; 665 || warn "$dir/$file: license tag '$meta->{license}' not found.";
516 } 666 }
517 667
668 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
669 ($meta->{author} = $1) =~ s/_/ /g;
670 }
671
518 $file =~ s/\.res$//; 672 $file =~ s/\.res$//;
519 $file =~ s/\.(ogg|wav|jpg|png)$//; 673 $file =~ s/\.(ogg|wav|jpg|png)$//;
520 674
521 substr $dir, 0, 1 + length $PATH, ""; 675 substr $dir, 0, 1 + length $PATH, "";
522 676
677 if (my $filter = $meta->{cfutil_filter}) {
678 if ($filter eq "yaml2json") {
679 $data = JSON::XS::encode_json YAML::XS::Load $data;
680 } elsif ($filter eq "json2json") {
681 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
682 } elsif ($filter eq "perl2json") {
683 $data = eval $data; die if $@;
684 $data = JSON::XS::encode_json $data;
685 } else {
686 warn "$dir/$file: unknown filter $filter, skipping\n";
687 }
688 }
689
523 $RESOURCE{"$dir/$file"} = { 690 $RESOURCE{"$dir/$file"} = {
524 type => (delete $meta->{type}) || $type, 691 type => (exists $meta->{type} ? delete $meta->{type} : $type),
525 data => $data, 692 data => $data,
526 chksum => (Digest::MD5::md5 $data),
527 %$meta ? (meta => $meta) : (), 693 %$meta ? (meta => $meta) : (),
528 }; 694 };
695 }
696
697 sub process_any {
698 while (my ($func, @args) = @{ $c_any->get }) {
699 $func->(@args);
529 } 700 }
530 } 701 }
531 702
532 sub find_files; 703 sub find_files;
533 sub find_files { 704 sub find_files {
534 my ($path) = @_; 705 my ($path) = @_;
535 706
707 my $grp = IO::AIO::aio_group;
708
709 my $scandir; $scandir = sub {
710 my ($path) = @_;
711
536 IO::AIO::aioreq_pri 4; 712 IO::AIO::aioreq_pri 4;
537 IO::AIO::aio_scandir $path, 4, sub { 713 add $grp IO::AIO::aio_scandir $path, 4, sub {
538 my ($dirs, $nondirs) = @_; 714 my ($dirs, $nondirs) = @_;
539 715
540 find_files "$path/$_" 716 $scandir->("$path/$_")
541 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 717 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
542 718
543 my $dir = $path; 719 my $dir = $path;
544 substr $dir, 0, 1 + length $PATH, ""; 720 substr $dir, 0, 1 + length $PATH, "";
545 721
546 for my $file (@$nondirs) { 722 for my $file (@$nondirs) {
547 if ($dir =~ /^music(?:\/|$)/) { 723 if ($dir =~ /^music(?:\/|$)/) {
548 $c_res->put ([$path, $file, 3]) # FT_MUSIC 724 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
549 if $file =~ /\.(ogg)$/; 725 if $file =~ /\.(ogg)$/;
550 726
551 } elsif ($dir =~ /^sound(?:\/|$)/) { 727 } elsif ($dir =~ /^sound(?:\/|$)/) {
552 $c_res->put ([$path, $file, 5]) # FT_SOUND 728 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
553 if $file =~ /\.(wav|ogg)$/; 729 if $file =~ /\.(wav|ogg)$/;
554 730
555 } elsif ($dir =~ /^res(?:\/|$)/) { 731 } elsif ($dir =~ /^res(?:\/|$)/) {
556 $c_res->put ([$path, $file, 0]) # FT_FACE
557 if $file =~ /\.(jpg|png)$/; 732 if ($file =~ /\.(jpg|png)$/) {
558 $c_res->put ([$path, $file, 7]) # FT_RSRC 733 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
559 if $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 }
560 739
561 } elsif ($file =~ /\.png$/) { 740 } elsif ($file =~ /\.png$/) {
562 push @c_png, ["$path/$file", 0]; 741 push @c_png, ["$path/$file", 0];
563 742
743 } elsif ($file =~ /\.faceinfo$/) {
744 $c_any->put ([\&process_faceinfo, $path, $file]);
745
564 } elsif ($file =~ /\.trs$/) { 746 } elsif ($file =~ /\.trs$/) {
565 $c_trs->put ([$path, $file]); 747 $c_any->put ([\&process_trs, $path, $file]);
566 748
567 } elsif ($file =~ /\.arc$/) { 749 } elsif ($file =~ /\.arc$/) {
568 $c_arc->put ([$path, $file]); 750 $c_arc->put ([$path, $file]);
569 751
570 } else { 752 } else {
571 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 753 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
572 } 754 }
755 }
573 } 756 };
574 }; 757 };
758
759 $scandir->($path);
760 aio_wait $grp;
761 }
762
763 sub generate_plurals {
764# use Lingua::EN::Inflect ();
765# Lingua::EN::Inflect::classical;
766# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
767# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
768#
769# for my $a (@ARC) {
770# my $name = $a->{name} || $a->{_name};
771#
772# next unless $a->{name_pl};
773# next if $a->{invisible};
774# next if $a->{is_floor};
775# next if $a->{no_pick};
776#
777# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
778# my $pl = $test =~ /^(?:eq|p:.)$/
779# ? $name
780# : Lingua::EN::Inflect::PL $name;
781#
782# if ($pl ne $a->{name_pl}) {
783# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
784# }
785# }
575 } 786 }
576 787
577 sub inst_arch($) { 788 sub inst_arch($) {
578 my (undef, $path) = @_; 789 my (undef, $path) = @_;
579 790
… …
592 if (!-d "$path/treasures") { 803 if (!-d "$path/treasures") {
593 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";
594 exit 1 unless $FORCE; 805 exit 1 unless $FORCE;
595 } 806 }
596 807
597 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;
598 812
599 find_files $path; 813 find_files $path;
600 814
601 my @a_arc = map +(async \&process_arc), 1..2; 815 $c_arc->shutdown;
602 my @a_res = map +(async \&process_res), 1..2; 816 $c_any->shutdown;
603 my @a_trs = map +(async \&process_trs), 1..2;
604
605 IO::AIO::flush;
606
607 $c_res->put (undef) for @a_res;
608 $c_arc->put (undef) for @a_arc;
609 $c_trs->put (undef) for @a_trs;
610
611 print "start file scan, arc, res processing...\n" if $VERBOSE;
612 817
613 $_->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
614 819
615 print "end arc, start png processing...\n" if $VERBOSE; 820 print "end arc, start png processing...\n" if $VERBOSE;
616 821
617 # four png crunchers work fine for my 2x smp machine 822 # eight png crunchers work fine for my 4x smp machine
618 my @a_png = map +(async \&process_png), 1..4; 823 my @a_png = map +(async \&process_png), 1..8;
619 824
620 $_->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;
621 830
622 print "scanning done, processing results...\n" if $VERBOSE; 831 print "scanning done, processing results...\n" if $VERBOSE;
623 { 832 {
624 # remove path prefix from editor_folder 833 # remove path prefix from editor_folder
834 $_->{editor_folder} =~ /^\x00/
625 substr $_->{editor_folder}, 0, 1 + length $path, "" 835 and substr $_->{editor_folder}, 0, 2 + length $path, ""
626 for values %ARC; 836 for values %ARC;
627 837
628 print "resolving inheritance tree...\n" if $VERBOSE; 838 print "resolving inheritance tree...\n" if $VERBOSE;
629 # resolve inherit 839 # resolve inherit
630 while () { 840 while () {
631 my $progress; 841 my $progress;
632 my $loop; 842 my $loop;
633 843
634 for my $o (values %ARC) { 844 for my $o (values %ARC) {
635 if (my $other = $o->{inherit}) { 845 for my $other (split /,/, $o->{inherit}) {
636 if (my $s = $ARC{$other}) { 846 if (my $s = $ARC{$other}) {
637 if ($s->{inherit}) { 847 if ($s->{inherit}) {
638 $loop = $s; 848 $loop = $s;
639 } else { 849 } else {
640 delete $o->{inherit}; 850 delete $o->{inherit};
… …
642 delete @s{qw(_name more name name_pl)}; 852 delete @s{qw(_name more name name_pl)};
643 %$o = ( %s, %$o ); 853 %$o = ( %s, %$o );
644 ++$progress; 854 ++$progress;
645 } 855 }
646 } else { 856 } else {
647 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";
648 delete $ARC{$o->{_name}}; 858 delete $ARC{$o->{_name}};
649 } 859 }
650 } 860 }
651 } 861 }
652 862
… …
659 } 869 }
660 870
661 # 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
662 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 872 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
663 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
885 #print "generating plurals...\n" if $VERBOSE;
886 #generate_plurals;
887
664 print "writing archetypes...\n" if $VERBOSE; 888 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
665 open my $fh, ">:utf8", "$DATADIR/archetypes~" 889 open my $fh, ">:utf8", "$DATADIR/archetypes~"
666 or die "$DATADIR/archetypes~: $!"; 890 or die "$DATADIR/archetypes~: $!";
667 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 891 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
892 }
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;
668 } 919 }
669 920
670 { 921 {
671 print "writing treasures...\n" if $VERBOSE; 922 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
672 open my $fh, ">:utf8", "$DATADIR/treasures~" 923 open my $fh, ">:utf8", "$DATADIR/treasures~"
673 or die "$DATADIR/treasures~: $!"; 924 or die "$DATADIR/treasures~: $!";
674 print $fh $TRS; 925 print $fh $TRS;
675 } 926 }
676 927
677 { 928 {
678 print "processing facedata...\n" if $VERBOSE; 929 print "processing facedata...\n" if $VERBOSE;
679 while (my ($k, $v) = each %FACEINFO) { 930 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"; 931 length $v->{data32} or warn "WARNING: face '$k' 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"; 932 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
682 933
934 make_hash $k, $v->{data32}, $v->{hash32};
935 make_hash $k, $v->{data64}, $v->{hash64};
936
683 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";
684 #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";
685 939
686 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 940 exists $v->{visibility}
687 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 941 or warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
688 942
689 if (my $magicmap = $v->{magicmap}) { 943 my $stem = delete $v->{stem};
690 $magicmap =~ y/A-Z_\-/a-z/d; 944 $v->{glyph} // warn "WARNING: face '$k' has glyph, cannot autoglyph at the moment.";
691 $v->{magicmap} = $COLOR{$magicmap}; 945 #$v->{glyph} //= autoglyph $stem, $v;
692 }
693 946
694 delete $v->{arc}; 947 delete $v->{arc};
695 } 948 }
696 949
697 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
698 open my $fh, ">:perlio", "$DATADIR/facedata~" 987 open my $fh, ">:perlio", "$DATADIR/facedata~"
699 or die "$DATADIR/facedata~: $!"; 988 or die "$DATADIR/facedata~: $!";
700 989
701 print $fh freeze { 990 print $fh nfreeze {
702 version => 2, 991 version => 2,
703 faceinfo => \%FACEINFO, 992 faceinfo => \%FACEINFO,
704 animinfo => \%ANIMINFO, 993 animinfo => \%ANIMINFO,
705 resource => \%RESOURCE, 994 resource => \%RESOURCE,
706 }; 995 };
996
707 } 997 }
708 998
709 print "committing files...\n" if $VERBOSE; 999 print "committing files...\n" if $VERBOSE;
710 1000
711 for (qw(archetypes facedata treasures)) { 1001 for (qw(archetypes facedata treasures), @COMMIT) {
712 chmod 0644, "$DATADIR/$_~"; 1002 chmod 0644, "$DATADIR/$_~";
713 rename "$DATADIR/$_~", "$DATADIR/$_" 1003 rename "$DATADIR/$_~", "$DATADIR/$_"
714 or die "$DATADIR/$_: $!"; 1004 or die "$DATADIR/$_: $!";
715 } 1005 }
716 1006

Diff Legend

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