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.68 by root, Mon Jan 14 10:12:13 2008 UTC vs.
Revision 1.103 by root, Sat Oct 16 09:20:58 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;
19use YAML (); 45use YAML::XS ();
20use JSON::XS (); 46use JSON::XS ();
21use IO::AIO (); 47use IO::AIO ();
22use File::Temp; 48use Digest::MD5 ();
23use Deliantra; 49
24use Coro; 50use Coro 5.12;
25use Coro::AIO; 51use Coro::AIO;
26use Coro::Util; 52use Coro::Util;
27use POSIX ();
28use Carp;
29use Coro::Channel; 53use Coro::Channel;
30use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
31 55
56use Deliantra;
57
32$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
59
60sub WRITE_FACEINFO() { 0 }
33 61
34sub usage { 62sub usage {
35 warn <<EOF; 63 warn <<EOF;
36Usage: cfutil [-v] [-q] [--force] [--cache] 64Usage: cfutil [-v] [-q] [--force] [--cache]
37 [--install-arch path] 65 [--install-arch path]
… …
48my $VERBOSE = 1; 76my $VERBOSE = 1;
49my $CACHE = 0; 77my $CACHE = 0;
50my $FORCE; 78my $FORCE;
51my $TMPDIR = "/tmp/cfutil$$~"; 79my $TMPDIR = "/tmp/cfutil$$~";
52my $TMPFILE = "aaaa0"; 80my $TMPFILE = "aaaa0";
81my @COMMIT;
53 82
54our %COLOR = ( 83our %COLOR = (
84 # original cf colours
55 black => 0, 85 black => 0,
56 white => 1, 86 white => 1,
57 navy => 2, 87 navy => 2, # "dark blue"
58 red => 3, 88 red => 3,
59 orange => 4, 89 orange => 4,
60 blue => 5, 90 blue => 5, # "light blue"
61 darkorange => 6, 91 darkorange => 6,
62 green => 7, 92 green => 7,
63 lightgreen => 8, 93 lightgreen => 8,
64 grey => 9, 94 grey => 9,
95 brown => 10, # "yellow"
96 gold => 11, # "light yellow"
97 tan => 12, # yellowish gray
98
99 # new for deliantra
65 brown => 10, 100 none => 13,
101
102 # compatibility to existing archetypes
103 lightblue => 5,
66 gold => 11, 104 gray => 9,
105 yellow => 11,
67 tan => 12, 106 khaki => 12,
68); 107);
69 108
70END { system "rm", "-rf", $TMPDIR } 109END { system "rm", "-rf", $TMPDIR }
71 110
72Event->signal (signal => "INT", cb => sub { exit 1 }); 111my $s_INT = EV::signal INT => sub { exit 1 };
73Event->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}
74 135
75mkdir $TMPDIR, 0700 136mkdir $TMPDIR, 0700
76 or die "$TMPDIR: $!"; 137 or die "$TMPDIR: $!";
77 138
78sub fork_sub(&) { 139sub fork_sub(&) {
… …
108 169
109 print "maps installed successfully.\n"; 170 print "maps installed successfully.\n";
110} 171}
111 172
112{ 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{
113 our %ANIMINFO; 231 our %ANIMINFO;
114 our %FACEINFO; 232 our %FACEINFO;
115 our %RESOURCE; 233 our %RESOURCE;
116 our @ARC; 234 our @ARC;
117 our %ARC; 235 our %ARC;
… …
120 our $PATH; 238 our $PATH;
121 239
122 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 240 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
123 241
124 our $c_arc = new Coro::Channel; 242 our $c_arc = new Coro::Channel;
125 our $c_trs = new Coro::Channel; 243 our $c_any = new Coro::Channel;
126 our $c_res = new Coro::Channel;
127 244
128 our @c_png; 245 our @c_png;
129 246
130 sub commit_png($$$) { 247 sub commit_png($$$$) {
131 my ($name, $data, $T) = @_; 248 my ($stem, $name, $data, $T) = @_;
132 249
250 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
133 $FACEINFO{$name}{"data$T"} = $data; 251 $FACEINFO{$name}{"data$T"} = $data;
134 } 252 }
135 253
136 sub process_png { 254 sub process_png {
137 while (@c_png) { 255 while (@c_png) {
… …
273 fork_sub { 391 fork_sub {
274 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~";
275 system $OPTIPNG, "-i0", "-q", "$other~"; 393 system $OPTIPNG, "-i0", "-q", "$other~";
276 394
277 # reduce smoothfaces >10000 bytes 395 # reduce smoothfaces >10000 bytes
396 # obsolete, no longer required
278 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 397 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
279 my $ncolor = 256; 398 my $ncolor = 256;
280 while () { 399 while () {
281 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 400 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
282 system $OPTIPNG, "-i0", "-q", "$other~~"; 401 system $OPTIPNG, "-i0", "-q", "$other~~";
283 last if 10000 > -s "$other~~"; 402 last if 10000 > -s "$other~~";
… …
354 473
355 if (0 > aio_load $file, $tile) { 474 if (0 > aio_load $file, $tile) {
356 die "$path: unable to read tile +$x+$y, aborting.\n"; 475 die "$path: unable to read tile +$x+$y, aborting.\n";
357 } 476 }
358 IO::AIO::aio_unlink $file unless $CACHE; 477 IO::AIO::aio_unlink $file unless $CACHE;
359 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 478 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
360 } 479 }
361 } else { 480 } else {
362 # use as-is (either small, use smooth) 481 # use as-is (either small, use smooth)
363 commit_png $face, $png, $T; 482 commit_png $stem, $face, $png, $T;
364 } 483 }
365 484
366 aio_unlink $path if $delete; 485 aio_unlink $path if $delete;
367 } 486 }
368 } 487 }
369 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 (my $fgi = $COLOR{$fg})
505 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
506 (my $bgi = $COLOR{$bg})
507 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
508
509 my $fi = $FACEINFO{$face} ||= { };
510 $fi->{visibility} = $visibility * 1;
511 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
512 $fi->{glyph} = (chr $fgi) . (chr $bgi) . $glyph;
513 # bg not used except for text clients
514 }
515 }
516
370 sub process_arc { 517 sub process_arc {
371 while (my $job = $c_arc->get) { 518 while (my ($dir, $file) = @{ $c_arc->get }) {
372 my ($dir, $file) = @$job;
373
374 my $arc; 519 my $arc;
375 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 520 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
376 521
377 my $arc = read_arch "$dir/$file"; 522 my $arc = read_arch "$dir/$file";
378 for my $o (values %$arc) { 523 for my $o (values %$arc) {
379 push @ARC, $o; 524 push @ARC, $o;
380 for (my $m = $o; $m; $m = $m->{more}) { 525 for (my $m = $o; $m; $m = $m->{more}) {
381 $ARC{$m->{_name}} = $m; 526 $ARC{$m->{_name}} = $m;
382 } 527 }
383 528
384 $o->{editor_folder} = $dir; 529 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
385
386 my $visibility = delete $o->{visibility};
387 my $magicmap = delete $o->{magicmap};
388 530
389 # find upper left corner :/ 531 # find upper left corner :/
390 # omg, this is sooo broken 532 # omg, this is sooo broken
391 my ($dx, $dy); 533 my ($dx, $dy);
392 for (my $o = $o; $o; $o = $o->{more}) { 534 for (my $o = $o; $o; $o = $o->{more}) {
… …
399 my $y = $o->{y} - $dy; 541 my $y = $o->{y} - $dy;
400 542
401 my $ext = $x|$y ? "+$x+$y" : ""; 543 my $ext = $x|$y ? "+$x+$y" : "";
402 544
403 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 545 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
404
405 $visibility = delete $o->{visibility} if exists $o->{visibility};
406 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
407 546
408 my $anim = delete $o->{anim}; 547 my $anim = delete $o->{anim};
409 548
410 if ($anim) { 549 if ($anim) {
411 # possibly add $ext to the animation name to avoid 550 # possibly add $ext to the animation name to avoid
… …
439 578
440 my $info = $FACEINFO{$face} ||= { }; 579 my $info = $FACEINFO{$face} ||= { };
441 $info->{arc} = $o; 580 $info->{arc} = $o;
442 581
443 next if $face =~ /^blank.x11$|^empty.x11$/; 582 next if $face =~ /^blank.x11$|^empty.x11$/;
444
445 $info->{visibility} = $visibility if defined $visibility;
446 $info->{magicmap} = $magicmap if defined $magicmap;
447 } 583 }
448 584
449 if (my $smooth = delete $o->{smoothface}) { 585 if (my $smooth = delete $o->{smoothface}) {
450 my %kv = split /\s+/, $smooth; 586 my %kv = split /\s+/, $smooth;
451 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 587 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
460 } 596 }
461 } 597 }
462 } 598 }
463 599
464 sub process_trs { 600 sub process_trs {
465 while (my $job = $c_trs->get) {
466 my ($dir, $file) = @$job; 601 my ($dir, $file) = @_;
467 my $path = "$dir/$file"; 602 my $path = "$dir/$file";
468 603
469 my $trs; 604 my $trs;
470 if (0 > aio_load $path, $trs) { 605 if (0 > aio_load $path, $trs) {
471 warn "$path: $!, skipping.\n"; 606 warn "$path: $!, skipping.\n";
472 next; 607 return;
473 } 608 }
474 609
475 $TRS .= $trs; 610 $TRS .= $trs;
476 }
477 } 611 }
478 612
479 my %FILECACHE; 613 my %FILECACHE;
480 614
481 sub load_cached($;$) { 615 sub load_cached($;$) {
… …
493 627
494 $FILECACHE{$_[0]} 628 $FILECACHE{$_[0]}
495 } 629 }
496 630
497 sub process_res { 631 sub process_res {
498 while (my $job = $c_res->get) {
499 my ($dir, $file, $type) = @$job; 632 my ($dir, $file, $type) = @_;
500 633
501 my $data; 634 my $data;
502 aio_load "$dir/$file", $data; 635 aio_load "$dir/$file", $data;
503 636
504 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 637 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
505 638
506 utf8::decode $dir; 639 utf8::decode $dir;
507 utf8::decode $file; 640 utf8::decode $file;
508 641
509 # a meta file for resources is now mandatory 642 # a meta file for resources is now mandatory
510 unless (exists $meta->{$file}) { 643 unless (exists $meta->{$file}) {
511 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 644 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
512 next; 645 return;
513 } 646 }
514 647
515 $meta = { 648 $meta = {
516 %{ $meta->{"" } || {} }, 649 %{ $meta->{"" } || {} },
517 %{ $meta->{$file} || {} }, 650 %{ $meta->{$file} || {} },
518 }; 651 };
519 652
520 if ($meta->{license} =~ s/^#//) { 653 if ($meta->{license} =~ s/^#//) {
521 $meta->{license} = ({ 654 $meta->{license} = ({
522 "pd" => "Public Domain", 655 "pd" => "Public Domain",
523 "gpl" => "GNU General Public License, version 3.0 or any later", 656 "gpl" => "GNU General Public License, version 3.0 or any later",
524 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 657 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
658 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
525 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 659 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
526 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 660 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
527 })->{$meta->{license}} 661 })->{$meta->{license}}
528 || warn "$dir/$file: license tag '$meta->{license}' not found."; 662 || warn "$dir/$file: license tag '$meta->{license}' not found.";
529 } 663 }
530 664
665 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
666 ($meta->{author} = $1) =~ s/_/ /g;
667 }
668
531 $file =~ s/\.res$//; 669 $file =~ s/\.res$//;
532 $file =~ s/\.(ogg|wav|jpg|png)$//; 670 $file =~ s/\.(ogg|wav|jpg|png)$//;
533 671
534 substr $dir, 0, 1 + length $PATH, ""; 672 substr $dir, 0, 1 + length $PATH, "";
535 673
536 if (my $filter = $meta->{cfutil_filter}) { 674 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") { 675 if ($filter eq "yaml2json") {
538 $data = JSON::XS::encode_json YAML::Load $data; 676 $data = JSON::XS::encode_json YAML::XS::Load $data;
539 } elsif ($filter eq "json2json") { 677 } elsif ($filter eq "json2json") {
540 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 678 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
541 } elsif ($filter eq "perl2json") { 679 } elsif ($filter eq "perl2json") {
542 $data = eval $data; die if $@; 680 $data = eval $data; die if $@;
543 $data = JSON::XS::encode_json $data; 681 $data = JSON::XS::encode_json $data;
544 } else { 682 } else {
545 warn "$dir/$file: unknown filter $filter, skipping\n"; 683 warn "$dir/$file: unknown filter $filter, skipping\n";
546 } 684 }
547 } 685 }
548 686
549 $RESOURCE{"$dir/$file"} = { 687 $RESOURCE{"$dir/$file"} = {
550 type => (exists $meta->{type} ? delete $meta->{type} : $type), 688 type => (exists $meta->{type} ? delete $meta->{type} : $type),
551 data => $data, 689 data => $data,
552 %$meta ? (meta => $meta) : (), 690 %$meta ? (meta => $meta) : (),
553 }; 691 };
692 }
693
694 sub process_any {
695 while (my ($func, @args) = @{ $c_any->get }) {
696 $func->(@args);
554 } 697 }
555 } 698 }
556 699
557 sub find_files; 700 sub find_files;
558 sub find_files { 701 sub find_files {
559 my ($path) = @_; 702 my ($path) = @_;
560 703
704 my $grp = IO::AIO::aio_group;
705
706 my $scandir; $scandir = sub {
707 my ($path) = @_;
708
561 IO::AIO::aioreq_pri 4; 709 IO::AIO::aioreq_pri 4;
562 IO::AIO::aio_scandir $path, 4, sub { 710 add $grp IO::AIO::aio_scandir $path, 4, sub {
563 my ($dirs, $nondirs) = @_; 711 my ($dirs, $nondirs) = @_;
564 712
565 find_files "$path/$_" 713 $scandir->("$path/$_")
566 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 714 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
567 715
568 my $dir = $path; 716 my $dir = $path;
569 substr $dir, 0, 1 + length $PATH, ""; 717 substr $dir, 0, 1 + length $PATH, "";
570 718
571 for my $file (@$nondirs) { 719 for my $file (@$nondirs) {
572 if ($dir =~ /^music(?:\/|$)/) { 720 if ($dir =~ /^music(?:\/|$)/) {
573 $c_res->put ([$path, $file, 3]) # FT_MUSIC 721 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
574 if $file =~ /\.(ogg)$/; 722 if $file =~ /\.(ogg)$/;
575 723
576 } elsif ($dir =~ /^sound(?:\/|$)/) { 724 } elsif ($dir =~ /^sound(?:\/|$)/) {
577 $c_res->put ([$path, $file, 5]) # FT_SOUND 725 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
578 if $file =~ /\.(wav|ogg)$/; 726 if $file =~ /\.(wav|ogg)$/;
579 727
580 } elsif ($dir =~ /^res(?:\/|$)/) { 728 } elsif ($dir =~ /^res(?:\/|$)/) {
581 if ($file =~ /\.(jpg|png)$/) { 729 if ($file =~ /\.(jpg|png)$/) {
582 $c_res->put ([$path, $file, 0]) # FT_FACE 730 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
583 } elsif ($file =~ /\.(res)$/) { 731 } elsif ($file =~ /\.(res)$/) {
732 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
733 } else {
734 $c_any->put ([\&process_res, $path, $file, undef]);
735 }
736
737 } elsif ($file =~ /\.png$/) {
738 push @c_png, ["$path/$file", 0];
739
740 } elsif ($file =~ /\.faceinfo$/) {
741 $c_any->put ([\&process_faceinfo, $path, $file]);
742
743 } elsif ($file =~ /\.trs$/) {
744 $c_any->put ([\&process_trs, $path, $file]);
745
746 } elsif ($file =~ /\.arc$/) {
584 $c_res->put ([$path, $file, 6]) # FT_RSRC 747 $c_arc->put ([$path, $file]);
748
585 } else { 749 } else {
586 $c_res->put ([$path, $file, undef]); 750 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
587 } 751 }
588
589 } elsif ($file =~ /\.png$/) {
590 push @c_png, ["$path/$file", 0];
591
592 } elsif ($file =~ /\.trs$/) {
593 $c_trs->put ([$path, $file]);
594
595 } elsif ($file =~ /\.arc$/) {
596 $c_arc->put ([$path, $file]);
597
598 } else { 752 }
599 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
600 }
601 } 753 };
602 }; 754 };
755
756 $scandir->($path);
757 aio_wait $grp;
758 }
759
760 sub generate_plurals {
761# use Lingua::EN::Inflect ();
762# Lingua::EN::Inflect::classical;
763# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
764# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
765#
766# for my $a (@ARC) {
767# my $name = $a->{name} || $a->{_name};
768#
769# next unless $a->{name_pl};
770# next if $a->{invisible};
771# next if $a->{is_floor};
772# next if $a->{no_pick};
773#
774# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
775# my $pl = $test =~ /^(?:eq|p:.)$/
776# ? $name
777# : Lingua::EN::Inflect::PL $name;
778#
779# if ($pl ne $a->{name_pl}) {
780# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
781# }
782# }
603 } 783 }
604 784
605 sub inst_arch($) { 785 sub inst_arch($) {
606 my (undef, $path) = @_; 786 my (undef, $path) = @_;
607 787
… …
620 if (!-d "$path/treasures") { 800 if (!-d "$path/treasures") {
621 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 801 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
622 exit 1 unless $FORCE; 802 exit 1 unless $FORCE;
623 } 803 }
624 804
625 print "scanning files...\n" if $VERBOSE; 805 print "start file scan, arc, any processing...\n" if $VERBOSE;
806
807 my @a_arc = map +(async \&process_arc), 1..2;
808 my @a_any = map +(async \&process_any), 1..4;
626 809
627 find_files $path; 810 find_files $path;
628 811
629 my @a_arc = map +(async \&process_arc), 1..2; 812 $c_arc->shutdown;
630 my @a_res = map +(async \&process_res), 1..2; 813 $c_any->shutdown;
631 my @a_trs = map +(async \&process_trs), 1..2;
632
633 IO::AIO::flush;
634
635 $c_res->put (undef) for @a_res;
636 $c_arc->put (undef) for @a_arc;
637 $c_trs->put (undef) for @a_trs;
638
639 print "start file scan, arc, res processing...\n" if $VERBOSE;
640 814
641 $_->join for @a_arc; # need to parse all archetypes before png processing 815 $_->join for @a_arc; # need to parse all archetypes before png processing
642 816
643 print "end arc, start png processing...\n" if $VERBOSE; 817 print "end arc, start png processing...\n" if $VERBOSE;
644 818
645 # four png crunchers work fine for my 2x smp machine 819 # eight png crunchers work fine for my 4x smp machine
646 my @a_png = map +(async \&process_png), 1..4; 820 my @a_png = map +(async \&process_png), 1..8;
647 821
648 $_->join for (@a_trs, @a_res, @a_png); 822 print "end any processing...\n" if $VERBOSE;
823 $_->join for @a_any;
824
825 print "end png processing...\n" if $VERBOSE;
826 $_->join for @a_png;
649 827
650 print "scanning done, processing results...\n" if $VERBOSE; 828 print "scanning done, processing results...\n" if $VERBOSE;
651 { 829 {
652 # remove path prefix from editor_folder 830 # remove path prefix from editor_folder
831 $_->{editor_folder} =~ /^\x00/
653 substr $_->{editor_folder}, 0, 1 + length $path, "" 832 and substr $_->{editor_folder}, 0, 2 + length $path, ""
654 for values %ARC; 833 for values %ARC;
655 834
656 print "resolving inheritance tree...\n" if $VERBOSE; 835 print "resolving inheritance tree...\n" if $VERBOSE;
657 # resolve inherit 836 # resolve inherit
658 while () { 837 while () {
659 my $progress; 838 my $progress;
660 my $loop; 839 my $loop;
661 840
662 for my $o (values %ARC) { 841 for my $o (values %ARC) {
663 if (my $other = $o->{inherit}) { 842 for my $other (split /,/, $o->{inherit}) {
664 if (my $s = $ARC{$other}) { 843 if (my $s = $ARC{$other}) {
665 if ($s->{inherit}) { 844 if ($s->{inherit}) {
666 $loop = $s; 845 $loop = $s;
667 } else { 846 } else {
668 delete $o->{inherit}; 847 delete $o->{inherit};
… …
670 delete @s{qw(_name more name name_pl)}; 849 delete @s{qw(_name more name name_pl)};
671 %$o = ( %s, %$o ); 850 %$o = ( %s, %$o );
672 ++$progress; 851 ++$progress;
673 } 852 }
674 } else { 853 } else {
675 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 854 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
676 delete $ARC{$o->{_name}}; 855 delete $ARC{$o->{_name}};
677 } 856 }
678 } 857 }
679 } 858 }
680 859
… …
687 } 866 }
688 867
689 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 868 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
690 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 869 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
691 870
871 print "generating plurals...\n" if $VERBOSE;
872 generate_plurals;
873
692 print "writing archetypes...\n" if $VERBOSE; 874 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
693 open my $fh, ">:utf8", "$DATADIR/archetypes~" 875 open my $fh, ">:utf8", "$DATADIR/archetypes~"
694 or die "$DATADIR/archetypes~: $!"; 876 or die "$DATADIR/archetypes~: $!";
695 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 877 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
696 } 878 }
697 879
880 if (WRITE_FACEINFO) {
881 my @table;
882 for my $face (sort keys %FACEINFO) {
883 my $v = $FACEINFO{$face};
884 (my $xf = $face) =~ s/\+\d+\+\d+$//;
885
886 $v->{magicmap} //= $FACEINFO{$xf}{magicmap};
887 $v->{glyph} //= $FACEINFO{$xf}{glyph};
888
889 $v->{magicmap} =~ y/A-Z_\-/a-z/d;
890
891 delete $v->{glyph} if $v->{glyph} =~ /^\?./;
892
893 my $stem = $v->{stem};
894 $v->{glyph} = $v->{glyph} // ("?" . (autoglyph $stem, $v));
895
896 push @table, [$face, $v->{visibility} || 0, $v->{magicmap} || "none", "none ", $v->{glyph}];
897 }
898 use Text::Table;
899 my $tb = new Text::Table undef, { align => "num" }, undef, undef, undef;
900 $tb->load (@table);
901 open my $fh, ">:raw", "default.faceinfo"or die;
902 print $fh $tb;
903 print "default.faceinfo written, exiting.\n";
904 exit 77;
905 }
906
698 { 907 {
699 print "writing treasures...\n" if $VERBOSE; 908 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
700 open my $fh, ">:utf8", "$DATADIR/treasures~" 909 open my $fh, ">:utf8", "$DATADIR/treasures~"
701 or die "$DATADIR/treasures~: $!"; 910 or die "$DATADIR/treasures~: $!";
702 print $fh $TRS; 911 print $fh $TRS;
703 } 912 }
704 913
705 { 914 {
706 print "processing facedata...\n" if $VERBOSE; 915 print "processing facedata...\n" if $VERBOSE;
707 while (my ($k, $v) = each %FACEINFO) { 916 while (my ($k, $v) = each %FACEINFO) {
708 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 917 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
709 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 918 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
710 919
920 make_hash $k, $v->{data32}, $v->{hash32};
921 make_hash $k, $v->{data64}, $v->{hash64};
922
711 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 923 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
712 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 924 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
713 925
714 if (my $magicmap = $v->{magicmap}) { 926 exists $v->{visibility}
715 $magicmap =~ y/A-Z_\-/a-z/d; 927 or warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
716 $v->{magicmap} = $COLOR{$magicmap}; 928
717 } 929 my $stem = delete $v->{stem};
930 $v->{glyph} // warn "WARNING: face '$k' has glyph, cannot autoglyph at the moment.";
931 #$v->{glyph} //= autoglyph $stem, $v;
718 932
719 delete $v->{arc}; 933 delete $v->{arc};
720 } 934 }
721 935
722 print "writing facedata...\n" if $VERBOSE; 936 print "processing resources...\n" if $VERBOSE;
937 my $enc = JSON::XS->new->utf8->canonical->relaxed;
938 while (my ($k, $v) = each %RESOURCE) {
939
940 if ($v->{meta} && $v->{meta}{datadir}) {
941 delete $RESOURCE{$k};
942
943 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
944
945 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
946 open my $fh, ">:raw", "$DATADIR/$k~"
947 or die "$DATADIR/$k~: $!";
948 syswrite $fh, $v->{data};
949 push @COMMIT, $k;
950
951 } else {
952 if ($v->{type} & 1) {
953 # prepend meta info
954
955 my $meta = $enc->encode ({
956 name => $k,
957 %{ $v->{meta} || {} },
958 });
959
960 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
961 }
962
963 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
964 }
965 }
966
967 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
968 scalar keys %FACEINFO,
969 scalar keys %ANIMINFO,
970 scalar keys %RESOURCE
971 if $VERBOSE;
972
723 open my $fh, ">:perlio", "$DATADIR/facedata~" 973 open my $fh, ">:perlio", "$DATADIR/facedata~"
724 or die "$DATADIR/facedata~: $!"; 974 or die "$DATADIR/facedata~: $!";
725 975
726 print $fh freeze { 976 print $fh nfreeze {
727 version => 2, 977 version => 2,
728 faceinfo => \%FACEINFO, 978 faceinfo => \%FACEINFO,
729 animinfo => \%ANIMINFO, 979 animinfo => \%ANIMINFO,
730 resource => \%RESOURCE, 980 resource => \%RESOURCE,
731 }; 981 };
982
732 } 983 }
733 984
734 print "committing files...\n" if $VERBOSE; 985 print "committing files...\n" if $VERBOSE;
735 986
736 for (qw(archetypes facedata treasures)) { 987 for (qw(archetypes facedata treasures), @COMMIT) {
737 chmod 0644, "$DATADIR/$_~"; 988 chmod 0644, "$DATADIR/$_~";
738 rename "$DATADIR/$_~", "$DATADIR/$_" 989 rename "$DATADIR/$_~", "$DATADIR/$_"
739 or die "$DATADIR/$_: $!"; 990 or die "$DATADIR/$_: $!";
740 } 991 }
741 992

Diff Legend

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