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.61 by root, Thu Aug 30 07:13:17 2007 UTC vs.
Revision 1.106 by root, Wed Oct 20 06:21:48 2010 UTC

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

Diff Legend

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