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.110 by root, Mon Feb 7 20:27:11 2011 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,2010 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;
55
56use Deliantra;
31 57
32$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
33 59
34sub usage { 60sub usage {
35 warn <<EOF; 61 warn <<EOF;
48my $VERBOSE = 1; 74my $VERBOSE = 1;
49my $CACHE = 0; 75my $CACHE = 0;
50my $FORCE; 76my $FORCE;
51my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
52my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
53 80
54our %COLOR = ( 81our %COLOR = (
82 # original cf colours
55 black => 0, 83 black => 0,
56 white => 1, 84 white => 1,
57 navy => 2, 85 navy => 2, # "dark blue"
58 red => 3, 86 red => 3,
59 orange => 4, 87 orange => 4,
60 blue => 5, 88 blue => 5, # "light blue"
61 darkorange => 6, 89 darkorange => 6,
62 green => 7, 90 green => 7,
63 lightgreen => 8, 91 lightgreen => 8,
64 grey => 9, 92 grey => 9,
93 brown => 10, # "yellow"
94 gold => 11, # "light yellow"
95 tan => 12, # yellowish gray
96
97 # new for deliantra
65 brown => 10, 98 none => 13,
99
100 # compatibility to existing archetypes
101 lightblue => 5,
66 gold => 11, 102 gray => 9,
103 yellow => 11,
67 tan => 12, 104 khaki => 12,
68); 105);
69 106
70END { system "rm", "-rf", $TMPDIR } 107END { system "rm", "-rf", $TMPDIR }
71 108
72Event->signal (signal => "INT", cb => sub { exit 1 }); 109my $s_INT = EV::signal INT => sub { exit 1 };
73Event->signal (signal => "TERM", cb => sub { exit 1 }); 110my $s_TERM = EV::signal TERM => sub { exit 1 };
111
112our %hash;
113
114# here we could try to avoid collisions and reduce chksum size further
115sub make_hash($\$\$;$) {
116 my ($id, $dataref, $hashref, $clen) = @_;
117
118 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
119
120 if (exists $hash{$hash}) {
121 # hash collision, but some files are simply identical
122 if (${$hash{$hash}[1]} ne $$dataref) {
123 warn "hash collision $hash{$hash}[0] vs. $id\n";
124 exit 1;
125 } else {
126 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
127 }
128 }
129 $hash{$hash} = [$id, $dataref, $hashref];
130
131 $$hashref = $hash;
132}
74 133
75mkdir $TMPDIR, 0700 134mkdir $TMPDIR, 0700
76 or die "$TMPDIR: $!"; 135 or die "$TMPDIR: $!";
77 136
78sub fork_sub(&) { 137sub fork_sub(&) {
120 our $PATH; 179 our $PATH;
121 180
122 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 181 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
123 182
124 our $c_arc = new Coro::Channel; 183 our $c_arc = new Coro::Channel;
125 our $c_trs = new Coro::Channel; 184 our $c_any = new Coro::Channel;
126 our $c_res = new Coro::Channel;
127 185
128 our @c_png; 186 our @c_png;
129 187
130 sub commit_png($$$) { 188 sub commit_png($$$$) {
131 my ($name, $data, $T) = @_; 189 my ($stem, $name, $data, $T) = @_;
132 190
191 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
133 $FACEINFO{$name}{"data$T"} = $data; 192 $FACEINFO{$name}{"data$T"} = $data;
134 } 193 }
135 194
136 sub process_png { 195 sub process_png {
137 while (@c_png) { 196 while (@c_png) {
273 fork_sub { 332 fork_sub {
274 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 333 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
275 system $OPTIPNG, "-i0", "-q", "$other~"; 334 system $OPTIPNG, "-i0", "-q", "$other~";
276 335
277 # reduce smoothfaces >10000 bytes 336 # reduce smoothfaces >10000 bytes
337 # obsolete, no longer required
278 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 338 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
279 my $ncolor = 256; 339 my $ncolor = 256;
280 while () { 340 while () {
281 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 341 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
282 system $OPTIPNG, "-i0", "-q", "$other~~"; 342 system $OPTIPNG, "-i0", "-q", "$other~~";
283 last if 10000 > -s "$other~~"; 343 last if 10000 > -s "$other~~";
354 414
355 if (0 > aio_load $file, $tile) { 415 if (0 > aio_load $file, $tile) {
356 die "$path: unable to read tile +$x+$y, aborting.\n"; 416 die "$path: unable to read tile +$x+$y, aborting.\n";
357 } 417 }
358 IO::AIO::aio_unlink $file unless $CACHE; 418 IO::AIO::aio_unlink $file unless $CACHE;
359 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 419 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
360 } 420 }
361 } else { 421 } else {
362 # use as-is (either small, use smooth) 422 # use as-is (either small, use smooth)
363 commit_png $face, $png, $T; 423 commit_png $stem, $face, $png, $T;
364 } 424 }
365 425
366 aio_unlink $path if $delete; 426 aio_unlink $path if $delete;
367 } 427 }
368 } 428 }
369 429
430 sub process_faceinfo {
431 my ($dir, $file) = @_;
432 my $path = "$dir/$file";
433
434 my $data;
435 if (0 > aio_load $path, $data) {
436 warn "$path: $!, skipping.\n";
437 return;
438 }
439
440 for (split /\n/, $data) {
441 chomp;
442 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5;
443 # bg not used except for text clients
444
445 utf8::decode $glyph;
446 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
447 $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting
448
449 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
450
451 (my $fgi = $COLOR{$fg})
452 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
453 (my $bgi = $COLOR{$bg})
454 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
455
456 my $fi = $FACEINFO{$face} ||= { };
457 $fi->{visibility} = $visibility * 1;
458 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
459
460 $glyph .= " " if 2 > length $glyph; # TODO kanji
461 die "glyph $face too long" if 2 < length $glyph;
462
463 $fi->{glyph} = "";
464 for (split //, $glyph) {
465 utf8::encode $_;
466 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
467 }
468 }
469 }
470
370 sub process_arc { 471 sub process_arc {
371 while (my $job = $c_arc->get) { 472 while (my ($dir, $file) = @{ $c_arc->get }) {
372 my ($dir, $file) = @$job;
373
374 my $arc; 473 my $arc;
375 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 474 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
376 475
377 my $arc = read_arch "$dir/$file"; 476 my $arc = read_arch "$dir/$file";
378 for my $o (values %$arc) { 477 for my $o (values %$arc) {
379 push @ARC, $o; 478 push @ARC, $o;
380 for (my $m = $o; $m; $m = $m->{more}) { 479 for (my $m = $o; $m; $m = $m->{more}) {
381 $ARC{$m->{_name}} = $m; 480 $ARC{$m->{_name}} = $m;
382 } 481 }
383 482
384 $o->{editor_folder} = $dir; 483 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
385
386 my $visibility = delete $o->{visibility};
387 my $magicmap = delete $o->{magicmap};
388 484
389 # find upper left corner :/ 485 # find upper left corner :/
390 # omg, this is sooo broken 486 # omg, this is sooo broken
391 my ($dx, $dy); 487 my ($dx, $dy);
392 for (my $o = $o; $o; $o = $o->{more}) { 488 for (my $o = $o; $o; $o = $o->{more}) {
399 my $y = $o->{y} - $dy; 495 my $y = $o->{y} - $dy;
400 496
401 my $ext = $x|$y ? "+$x+$y" : ""; 497 my $ext = $x|$y ? "+$x+$y" : "";
402 498
403 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 499 $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 500
408 my $anim = delete $o->{anim}; 501 my $anim = delete $o->{anim};
409 502
410 if ($anim) { 503 if ($anim) {
411 # possibly add $ext to the animation name to avoid 504 # possibly add $ext to the animation name to avoid
439 532
440 my $info = $FACEINFO{$face} ||= { }; 533 my $info = $FACEINFO{$face} ||= { };
441 $info->{arc} = $o; 534 $info->{arc} = $o;
442 535
443 next if $face =~ /^blank.x11$|^empty.x11$/; 536 next if $face =~ /^blank.x11$|^empty.x11$/;
444
445 $info->{visibility} = $visibility if defined $visibility;
446 $info->{magicmap} = $magicmap if defined $magicmap;
447 } 537 }
448 538
449 if (my $smooth = delete $o->{smoothface}) { 539 if (my $smooth = delete $o->{smoothface}) {
450 my %kv = split /\s+/, $smooth; 540 my %kv = split /\s+/, $smooth;
451 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 541 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
460 } 550 }
461 } 551 }
462 } 552 }
463 553
464 sub process_trs { 554 sub process_trs {
465 while (my $job = $c_trs->get) {
466 my ($dir, $file) = @$job; 555 my ($dir, $file) = @_;
467 my $path = "$dir/$file"; 556 my $path = "$dir/$file";
468 557
469 my $trs; 558 my $trs;
470 if (0 > aio_load $path, $trs) { 559 if (0 > aio_load $path, $trs) {
471 warn "$path: $!, skipping.\n"; 560 warn "$path: $!, skipping.\n";
472 next; 561 return;
473 } 562 }
474 563
475 $TRS .= $trs; 564 $TRS .= $trs;
476 }
477 } 565 }
478 566
479 my %FILECACHE; 567 my %FILECACHE;
480 568
481 sub load_cached($;$) { 569 sub load_cached($;$) {
493 581
494 $FILECACHE{$_[0]} 582 $FILECACHE{$_[0]}
495 } 583 }
496 584
497 sub process_res { 585 sub process_res {
498 while (my $job = $c_res->get) {
499 my ($dir, $file, $type) = @$job; 586 my ($dir, $file, $type) = @_;
500 587
501 my $data; 588 my $data;
502 aio_load "$dir/$file", $data; 589 aio_load "$dir/$file", $data;
503 590
504 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 591 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
505 592
506 utf8::decode $dir; 593 utf8::decode $dir;
507 utf8::decode $file; 594 utf8::decode $file;
508 595
509 # a meta file for resources is now mandatory 596 # a meta file for resources is now mandatory
510 unless (exists $meta->{$file}) { 597 unless (exists $meta->{$file}) {
511 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 598 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
512 next; 599 return;
513 } 600 }
514 601
515 $meta = { 602 $meta = {
516 %{ $meta->{"" } || {} }, 603 %{ $meta->{"" } || {} },
517 %{ $meta->{$file} || {} }, 604 %{ $meta->{$file} || {} },
518 }; 605 };
519 606
520 if ($meta->{license} =~ s/^#//) { 607 if ($meta->{license} =~ s/^#//) {
521 $meta->{license} = ({ 608 $meta->{license} = ({
522 "pd" => "Public Domain", 609 "pd" => "Public Domain",
523 "gpl" => "GNU General Public License, version 3.0 or any later", 610 "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/", 611 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
612 "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/", 613 "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/", 614 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
527 })->{$meta->{license}} 615 })->{$meta->{license}}
528 || warn "$dir/$file: license tag '$meta->{license}' not found."; 616 || warn "$dir/$file: license tag '$meta->{license}' not found.";
529 } 617 }
530 618
619 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
620 ($meta->{author} = $1) =~ s/_/ /g;
621 }
622
531 $file =~ s/\.res$//; 623 $file =~ s/\.res$//;
532 $file =~ s/\.(ogg|wav|jpg|png)$//; 624 $file =~ s/\.(ogg|wav|jpg|png)$//;
533 625
534 substr $dir, 0, 1 + length $PATH, ""; 626 substr $dir, 0, 1 + length $PATH, "";
535 627
536 if (my $filter = $meta->{cfutil_filter}) { 628 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") { 629 if ($filter eq "yaml2json") {
538 $data = JSON::XS::encode_json YAML::Load $data; 630 $data = JSON::XS::encode_json YAML::XS::Load $data;
539 } elsif ($filter eq "json2json") { 631 } elsif ($filter eq "json2json") {
540 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 632 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
541 } elsif ($filter eq "perl2json") { 633 } elsif ($filter eq "perl2json") {
542 $data = eval $data; die if $@; 634 $data = eval $data; die if $@;
543 $data = JSON::XS::encode_json $data; 635 $data = JSON::XS::encode_json $data;
544 } else { 636 } else {
545 warn "$dir/$file: unknown filter $filter, skipping\n"; 637 warn "$dir/$file: unknown filter $filter, skipping\n";
546 } 638 }
547 } 639 }
548 640
549 $RESOURCE{"$dir/$file"} = { 641 $RESOURCE{"$dir/$file"} = {
550 type => (exists $meta->{type} ? delete $meta->{type} : $type), 642 type => (exists $meta->{type} ? delete $meta->{type} : $type),
551 data => $data, 643 data => $data,
552 %$meta ? (meta => $meta) : (), 644 %$meta ? (meta => $meta) : (),
553 }; 645 };
646 }
647
648 sub process_any {
649 while (my ($func, @args) = @{ $c_any->get }) {
650 $func->(@args);
554 } 651 }
555 } 652 }
556 653
557 sub find_files; 654 sub find_files;
558 sub find_files { 655 sub find_files {
559 my ($path) = @_; 656 my ($path) = @_;
560 657
658 my $grp = IO::AIO::aio_group;
659
660 my $scandir; $scandir = sub {
661 my ($path) = @_;
662
561 IO::AIO::aioreq_pri 4; 663 IO::AIO::aioreq_pri 4;
562 IO::AIO::aio_scandir $path, 4, sub { 664 add $grp IO::AIO::aio_scandir $path, 4, sub {
563 my ($dirs, $nondirs) = @_; 665 my ($dirs, $nondirs) = @_;
564 666
565 find_files "$path/$_" 667 $scandir->("$path/$_")
566 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 668 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
567 669
568 my $dir = $path; 670 my $dir = $path;
569 substr $dir, 0, 1 + length $PATH, ""; 671 substr $dir, 0, 1 + length $PATH, "";
570 672
571 for my $file (@$nondirs) { 673 for my $file (@$nondirs) {
572 if ($dir =~ /^music(?:\/|$)/) { 674 if ($dir =~ /^music(?:\/|$)/) {
573 $c_res->put ([$path, $file, 3]) # FT_MUSIC 675 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
574 if $file =~ /\.(ogg)$/; 676 if $file =~ /\.(ogg)$/;
575 677
576 } elsif ($dir =~ /^sound(?:\/|$)/) { 678 } elsif ($dir =~ /^sound(?:\/|$)/) {
577 $c_res->put ([$path, $file, 5]) # FT_SOUND 679 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
578 if $file =~ /\.(wav|ogg)$/; 680 if $file =~ /\.(wav|ogg)$/;
579 681
580 } elsif ($dir =~ /^res(?:\/|$)/) { 682 } elsif ($dir =~ /^res(?:\/|$)/) {
581 if ($file =~ /\.(jpg|png)$/) { 683 if ($file =~ /\.(jpg|png)$/) {
582 $c_res->put ([$path, $file, 0]) # FT_FACE 684 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
583 } elsif ($file =~ /\.(res)$/) { 685 } elsif ($file =~ /\.(res)$/) {
686 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
687 } else {
688 $c_any->put ([\&process_res, $path, $file, undef]);
689 }
690
691 } elsif ($file =~ /\.png$/) {
692 push @c_png, ["$path/$file", 0];
693
694 } elsif ($file =~ /\.faceinfo$/) {
695 $c_any->put ([\&process_faceinfo, $path, $file]);
696
697 } elsif ($file =~ /\.trs$/) {
698 $c_any->put ([\&process_trs, $path, $file]);
699
700 } elsif ($file =~ /\.arc$/) {
584 $c_res->put ([$path, $file, 6]) # FT_RSRC 701 $c_arc->put ([$path, $file]);
702
585 } else { 703 } else {
586 $c_res->put ([$path, $file, undef]);
587 }
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 {
599 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 704 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
600 } 705 }
706 }
601 } 707 };
602 }; 708 };
709
710 $scandir->($path);
711 aio_wait $grp;
712 }
713
714 sub generate_plurals {
715# use Lingua::EN::Inflect ();
716# Lingua::EN::Inflect::classical;
717# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
718# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
719#
720# for my $a (@ARC) {
721# my $name = $a->{name} || $a->{_name};
722#
723# next unless $a->{name_pl};
724# next if $a->{invisible};
725# next if $a->{is_floor};
726# next if $a->{no_pick};
727#
728# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
729# my $pl = $test =~ /^(?:eq|p:.)$/
730# ? $name
731# : Lingua::EN::Inflect::PL $name;
732#
733# if ($pl ne $a->{name_pl}) {
734# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
735# }
736# }
603 } 737 }
604 738
605 sub inst_arch($) { 739 sub inst_arch($) {
606 my (undef, $path) = @_; 740 my (undef, $path) = @_;
607 741
620 if (!-d "$path/treasures") { 754 if (!-d "$path/treasures") {
621 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 755 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
622 exit 1 unless $FORCE; 756 exit 1 unless $FORCE;
623 } 757 }
624 758
625 print "scanning files...\n" if $VERBOSE; 759 print "start file scan, arc, any processing...\n" if $VERBOSE;
760
761 my @a_arc = map +(async \&process_arc), 1..2;
762 my @a_any = map +(async \&process_any), 1..4;
626 763
627 find_files $path; 764 find_files $path;
628 765
629 my @a_arc = map +(async \&process_arc), 1..2; 766 $c_arc->shutdown;
630 my @a_res = map +(async \&process_res), 1..2; 767 $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 768
641 $_->join for @a_arc; # need to parse all archetypes before png processing 769 $_->join for @a_arc; # need to parse all archetypes before png processing
642 770
643 print "end arc, start png processing...\n" if $VERBOSE; 771 print "end arc, start png processing...\n" if $VERBOSE;
644 772
645 # four png crunchers work fine for my 2x smp machine 773 # eight png crunchers work fine for my 4x smp machine
646 my @a_png = map +(async \&process_png), 1..4; 774 my @a_png = map +(async \&process_png), 1..8;
647 775
648 $_->join for (@a_trs, @a_res, @a_png); 776 print "end any processing...\n" if $VERBOSE;
777 $_->join for @a_any;
778
779 print "end png processing...\n" if $VERBOSE;
780 $_->join for @a_png;
649 781
650 print "scanning done, processing results...\n" if $VERBOSE; 782 print "scanning done, processing results...\n" if $VERBOSE;
651 { 783 {
652 # remove path prefix from editor_folder 784 # remove path prefix from editor_folder
785 $_->{editor_folder} =~ /^\x00/
653 substr $_->{editor_folder}, 0, 1 + length $path, "" 786 and substr $_->{editor_folder}, 0, 2 + length $path, ""
654 for values %ARC; 787 for values %ARC;
655 788
656 print "resolving inheritance tree...\n" if $VERBOSE; 789 print "resolving inheritance tree...\n" if $VERBOSE;
657 # resolve inherit 790 # resolve inherit
658 while () { 791 while () {
659 my $progress; 792 my $progress;
660 my $loop; 793 my $loop;
661 794
662 for my $o (values %ARC) { 795 for my $o (values %ARC) {
663 if (my $other = $o->{inherit}) { 796 for my $other (split /,/, $o->{inherit}) {
664 if (my $s = $ARC{$other}) { 797 if (my $s = $ARC{$other}) {
665 if ($s->{inherit}) { 798 if ($s->{inherit}) {
666 $loop = $s; 799 $loop = $s;
667 } else { 800 } else {
668 delete $o->{inherit}; 801 delete $o->{inherit};
670 delete @s{qw(_name more name name_pl)}; 803 delete @s{qw(_name more name name_pl)};
671 %$o = ( %s, %$o ); 804 %$o = ( %s, %$o );
672 ++$progress; 805 ++$progress;
673 } 806 }
674 } else { 807 } else {
675 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 808 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
676 delete $ARC{$o->{_name}}; 809 delete $ARC{$o->{_name}};
677 } 810 }
678 } 811 }
679 } 812 }
680 813
687 } 820 }
688 821
689 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 822 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
690 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 823 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
691 824
825 # fix up archetypes without names, where the archanme doesn't work at all
826 for (@ARC) {
827 if (!exists $_->{name} and $_->{_name} =~ /_/) {
828 for ($_->{name} = $_->{_name}) {
829 s/(?:_\d+)+$//;
830 s/_[nesw]+$//;
831 y/_/ /;
832 }
833 }
834 }
835
836 #print "generating plurals...\n" if $VERBOSE;
837 #generate_plurals;
838
692 print "writing archetypes...\n" if $VERBOSE; 839 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
693 open my $fh, ">:utf8", "$DATADIR/archetypes~" 840 open my $fh, ">:utf8", "$DATADIR/archetypes~"
694 or die "$DATADIR/archetypes~: $!"; 841 or die "$DATADIR/archetypes~: $!";
695 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 842 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
696 } 843 }
697 844
698 { 845 {
699 print "writing treasures...\n" if $VERBOSE; 846 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
700 open my $fh, ">:utf8", "$DATADIR/treasures~" 847 open my $fh, ">:utf8", "$DATADIR/treasures~"
701 or die "$DATADIR/treasures~: $!"; 848 or die "$DATADIR/treasures~: $!";
702 print $fh $TRS; 849 print $fh $TRS;
703 } 850 }
704 851
705 { 852 {
706 print "processing facedata...\n" if $VERBOSE; 853 print "processing facedata...\n" if $VERBOSE;
707 while (my ($k, $v) = each %FACEINFO) { 854 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"; 855 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"; 856 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
710 857
858 make_hash $k, $v->{data32}, $v->{hash32};
859 make_hash $k, $v->{data64}, $v->{hash64};
860
711 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 861 #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"; 862 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
713 863
714 if (my $magicmap = $v->{magicmap}) { 864 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
715 $magicmap =~ y/A-Z_\-/a-z/d; 865 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
716 $v->{magicmap} = $COLOR{$magicmap}; 866 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
867
868 delete @$v{qw(arc stem)}; # not used by the server
869 }
870
871 print "processing resources...\n" if $VERBOSE;
872 my $enc = JSON::XS->new->utf8->canonical->relaxed;
873 while (my ($k, $v) = each %RESOURCE) {
874
875 if ($v->{meta} && $v->{meta}{datadir}) {
876 delete $RESOURCE{$k};
877
878 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
879
880 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
881 open my $fh, ">:raw", "$DATADIR/$k~"
882 or die "$DATADIR/$k~: $!";
883 syswrite $fh, $v->{data};
884 push @COMMIT, $k;
885
886 } else {
887 if ($v->{type} & 1) {
888 # prepend meta info
889
890 my $meta = $enc->encode ({
891 name => $k,
892 %{ $v->{meta} || {} },
893 });
894
895 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
717 } 896 }
718 897
719 delete $v->{arc}; 898 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
720 } 899 }
900 }
721 901
722 print "writing facedata...\n" if $VERBOSE; 902 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
903 scalar keys %FACEINFO,
904 scalar keys %ANIMINFO,
905 scalar keys %RESOURCE
906 if $VERBOSE;
907
723 open my $fh, ">:perlio", "$DATADIR/facedata~" 908 open my $fh, ">:perlio", "$DATADIR/facedata~"
724 or die "$DATADIR/facedata~: $!"; 909 or die "$DATADIR/facedata~: $!";
725 910
726 print $fh freeze { 911 print $fh nfreeze {
727 version => 2, 912 version => 2,
728 faceinfo => \%FACEINFO, 913 faceinfo => \%FACEINFO,
729 animinfo => \%ANIMINFO, 914 animinfo => \%ANIMINFO,
730 resource => \%RESOURCE, 915 resource => \%RESOURCE,
731 }; 916 };
917
732 } 918 }
733 919
734 print "committing files...\n" if $VERBOSE; 920 print "committing files...\n" if $VERBOSE;
735 921
736 for (qw(archetypes facedata treasures)) { 922 for (qw(archetypes facedata treasures), @COMMIT) {
737 chmod 0644, "$DATADIR/$_~"; 923 chmod 0644, "$DATADIR/$_~";
738 rename "$DATADIR/$_~", "$DATADIR/$_" 924 rename "$DATADIR/$_~", "$DATADIR/$_"
739 or die "$DATADIR/$_: $!"; 925 or die "$DATADIR/$_: $!";
740 } 926 }
741 927

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines