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.72 by root, Mon Oct 12 14:01:00 2009 UTC vs.
Revision 1.115 by root, Sat May 14 17:41:57 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,2011 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@";
9 31
10my $CONVERT = "@CONVERT@"; 32my $CONVERT = "@CONVERT@";
11#my $IDENTIFY = "@IDENTIFY@"; 33my $IDENTIFY = "@IDENTIFY@";
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;
17use Coro::EV; 39use File::Temp;
18use AnyEvent; 40use POSIX ();
41use Carp;
42
19use YAML::XS (); 43use YAML::XS ();
44use Digest::MD5 ();
45use Storable ();
20use JSON::XS (); 46use JSON::XS ();
21use IO::AIO (); 47use IO::AIO ();
22use File::Temp; 48use Compress::LZF ();
23use Deliantra; 49
50use AnyEvent;
24use Coro 5.12; 51use Coro 5.12;
52use Coro::EV;
25use Coro::AIO; 53use Coro::AIO;
26use Coro::Util; 54use Coro::Util;
27use POSIX ();
28use Carp;
29use Coro::Channel; 55use Coro::Channel;
56use Coro::AnyEvent;
30use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
58
59use Deliantra;
31 60
32$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
33 62
34sub usage { 63sub usage {
35 warn <<EOF; 64 warn <<EOF;
… …
48my $VERBOSE = 1; 77my $VERBOSE = 1;
49my $CACHE = 0; 78my $CACHE = 0;
50my $FORCE; 79my $FORCE;
51my $TMPDIR = "/tmp/cfutil$$~"; 80my $TMPDIR = "/tmp/cfutil$$~";
52my $TMPFILE = "aaaa0"; 81my $TMPFILE = "aaaa0";
82my @COMMIT;
53 83
54our %COLOR = ( 84our %COLOR = (
85 # original cf colours
55 black => 0, 86 black => 0,
56 white => 1, 87 white => 1,
57 navy => 2, 88 navy => 2, # "dark blue"
58 red => 3, 89 red => 3,
59 orange => 4, 90 orange => 4,
60 blue => 5, 91 blue => 5, # "light blue"
61 darkorange => 6, 92 darkorange => 6,
62 green => 7, 93 green => 7,
63 lightgreen => 8, 94 lightgreen => 8,
64 grey => 9, 95 grey => 9,
96 brown => 10, # "yellow"
97 gold => 11, # "light yellow"
98 tan => 12, # yellowish gray
99
100 # new for deliantra
65 brown => 10, 101 none => 13,
102
103 # compatibility to existing archetypes
104 lightblue => 5,
66 gold => 11, 105 gray => 9,
106 yellow => 11,
67 tan => 12, 107 khaki => 12,
68); 108);
69 109
70END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
71 111
72my $s_INT = EV::signal INT => sub { exit 1 }; 112my $s_INT = EV::signal INT => sub { exit 1 };
73my $s_TERM = EV::signal TERM => sub { exit 1 }; 113my $s_TERM = EV::signal TERM => sub { exit 1 };
74 114
115our %hash;
116
117# here we could try to avoid collisions and reduce chksum size further
118sub make_hash($\$\$;$) {
119 my ($id, $dataref, $hashref, $clen) = @_;
120
121 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5;
122
123 if (exists $hash{$hash}) {
124 # hash collision, but some files are simply identical
125 if (${$hash{$hash}[1]} ne $$dataref) {
126 warn "hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n";
127 exit 1;
128 } else {
129 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
130 }
131 }
132 $hash{$hash} = [$id, $dataref, $hashref];
133
134 $$hashref = $hash;
135}
136
137sub optipng($) {
138 system $OPTIPNG, "-o5", "-i0", "-q", $_[0];
139 die "$_[0] has zero size, aborting." unless -s $_[0];
140}
141
75mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
76 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
77 144
78sub fork_sub(&) { 145sub fork_exec(&) {
79 my ($cb) = @_; 146 my ($cb) = @_;
80 147
81 if (my $pid = fork) { 148 if (my $pid = fork) {
82 my $current = $Coro::current; 149 my $current = $Coro::current;
83 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 150 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
… …
88 warn $@; 155 warn $@;
89 POSIX::_exit 1; 156 POSIX::_exit 1;
90 } 157 }
91} 158}
92 159
160sub imgsize($) {
161 open my $fh, "-|", $IDENTIFY, qw(-ping -format %w,%h --), $_[0]
162 or die "$IDENTIFY: $!";
163
164 Coro::AnyEvent::readable $fh;
165
166 my ($w, $h) = split /,/, <$fh>;
167
168 ($w+0, $h+0)
169}
170
171# make $dst from $src, if not uptodate, by calling $how
172sub make_file($$$) {
173 my ($src, $dst, $how) = @_;
174
175 my $t = (aio_stat $dst) ? -1 : (stat _)[9];
176
177 for (ref $src ? @$src : $src) {
178 aio_stat $_
179 and die "$_: $!";
180
181 if ((stat _)[9] > $t) {
182 # outdated, redo
183 $how->();
184 last;
185 }
186 }
187}
188
93sub inst_maps($) { 189sub inst_maps($) {
94 my (undef, $path) = @_; 190 my (undef, $path) = @_;
95 191
96 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 192 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
97 193
… …
120 our $PATH; 216 our $PATH;
121 217
122 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 218 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
123 219
124 our $c_arc = new Coro::Channel; 220 our $c_arc = new Coro::Channel;
125 our $c_trs = new Coro::Channel; 221 our $c_any = new Coro::Channel;
126 our $c_res = new Coro::Channel;
127 222
128 our @c_png; 223 our @c_png;
129 224
130 sub commit_png($$$) { 225 sub commit_png($$$$) {
131 my ($name, $data, $T) = @_; 226 my ($stem, $name, $data, $T) = @_;
132 227
228 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
133 $FACEINFO{$name}{"data$T"} = $data; 229 $FACEINFO{$name}{"data$T"} = $data;
134 } 230 }
135 231
136 sub process_png { 232 sub process_png {
137 while (@c_png) { 233 while (@c_png) {
… …
189 unless ($path =~ /~$/) { 285 unless ($path =~ /~$/) {
190 # possibly enlarge 286 # possibly enlarge
191 if (0 > aio_stat "$stem.64x64.png") { 287 if (0 > aio_stat "$stem.64x64.png") {
192 my $other = "$stem.64x64.png~"; 288 my $other = "$stem.64x64.png~";
193 289
194 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 290 make_file $path, $other, sub {
195 fork_sub { 291 fork_exec {
196 my $CROP; 292 my $CROP;
197 my $SRC = "png:\Q$path\E"; 293 my $SRC = "png:\Q$path\E";
198 294
199 my $is_floor = $arc->{is_floor}; 295 my $is_floor = $arc->{is_floor};
200 my $is_wall = 0; 296 my $is_wall = 0;
… …
254 350
255 system "convert -depth 8 $SRC rgba:-" 351 system "convert -depth 8 $SRC rgba:-"
256 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 352 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
257 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" 353 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
258 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 354 and die "convert/cfhq2xa pipeline error: status $? ($!)";
259 system $OPTIPNG, "-i0", "-q", "$other~"; 355 optipng "$other~";
260 die "$other~ has zero size, aborting." unless -s "$other~";
261 rename "$other~", $other; 356 rename "$other~", $other;
262 }; 357 };
263 } 358 };
264 359
265 push @c_png, [$other, !$CACHE]; 360 push @c_png, [$other, !$CACHE];
266 } 361 }
267 362
268 # possibly scale down 363 # possibly scale down
269 if (0 > aio_stat "$stem.32x32.png") { 364 if (0 > aio_stat "$stem.32x32.png") {
270 my $other = "$stem.32x32.png~"; 365 my $other = "$stem.32x32.png~";
271 366
272 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 367 make_file $path, $other, sub {
273 fork_sub { 368 fork_exec {
274 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 369 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
275 system $OPTIPNG, "-i0", "-q", "$other~"; 370 optipng "$other~";
276 371
277 # reduce smoothfaces >10000 bytes 372 # reduce smoothfaces >10000 bytes
278 # obsolete, no longer required 373 # obsolete, no longer required
279 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { 374 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
280 my $ncolor = 256; 375 my $ncolor = 256;
281 while () { 376 while () {
282 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 377 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
283 system $OPTIPNG, "-i0", "-q", "$other~~"; 378 optipng "$other~~";
284 last if 10000 > -s "$other~~"; 379 last if 10000 > -s "$other~~";
285 $ncolor = int $ncolor * 0.9; 380 $ncolor = int $ncolor * 0.9;
286 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 381 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
287 } 382 }
288 383
… …
293 } 388 }
294 389
295 die "$other~ has zero size, aborting." unless -s "$other~"; 390 die "$other~ has zero size, aborting." unless -s "$other~";
296 rename "$other~", $other; 391 rename "$other~", $other;
297 }; 392 };
298 } 393 };
299 394
300 #warn "scaled down $path to $other\n";#d# 395 #warn "scaled down $path to $other\n";#d#
301 push @c_png, [$other, !$CACHE]; 396 push @c_png, [$other, !$CACHE];
302 } 397 }
303 } 398 }
… …
317 } 412 }
318 413
319 my $mtime = (lstat $path)[9]; 414 my $mtime = (lstat $path)[9];
320 my @todo = grep { $_->[3] <= $mtime } @tile; 415 my @todo = grep { $_->[3] <= $mtime } @tile;
321 if (@todo) { 416 if (@todo) {
322 fork_sub { 417 fork_exec {
323 open my $convert, "|-", $CONVERT, 418 open my $convert, "|-", $CONVERT,
324 "png:-", 419 "png:-",
325 (map { 420 (map {
326 ( 421 (
327 "(", 422 "(",
… …
340 print $convert $png; 435 print $convert $png;
341 close $convert; 436 close $convert;
342 437
343 # pass 2, optimise, and rename 438 # pass 2, optimise, and rename
344 for (@todo) { 439 for (@todo) {
345 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 440 optipng "$_->[2]~";
346 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
347 rename "$_->[2]~", $_->[2]; 441 rename "$_->[2]~", $_->[2];
348 } 442 }
349 }; 443 };
350 } 444 }
351 445
… …
355 449
356 if (0 > aio_load $file, $tile) { 450 if (0 > aio_load $file, $tile) {
357 die "$path: unable to read tile +$x+$y, aborting.\n"; 451 die "$path: unable to read tile +$x+$y, aborting.\n";
358 } 452 }
359 IO::AIO::aio_unlink $file unless $CACHE; 453 IO::AIO::aio_unlink $file unless $CACHE;
360 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 454 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
361 } 455 }
362 } else { 456 } else {
363 # use as-is (either small, use smooth) 457 # use as-is (either small, use smooth)
364 commit_png $face, $png, $T; 458 commit_png $stem, $face, $png, $T;
365 } 459 }
366 460
367 aio_unlink $path if $delete; 461 aio_unlink $path if $delete;
368 } 462 }
369 } 463 }
370 464
465 sub process_faceinfo {
466 my ($dir, $file) = @_;
467 my $path = "$dir/$file";
468
469 my $data;
470 if (0 > aio_load $path, $data) {
471 warn "$path: $!, skipping.\n";
472 return;
473 }
474
475 for (split /\n/, $data) {
476 chomp;
477 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5;
478 # bg not used except for text clients
479
480 utf8::decode $glyph;
481 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
482 $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting
483
484 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
485
486 (my $fgi = $COLOR{$fg})
487 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
488 (my $bgi = $COLOR{$bg})
489 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
490
491 my $fi = $FACEINFO{$face} ||= { };
492 $fi->{visibility} = $visibility * 1;
493 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
494
495 $glyph .= " " if 2 > length $glyph; # TODO kanji
496 die "glyph $face too long" if 2 < length $glyph;
497
498 $fi->{glyph} = "";
499 for (split //, $glyph) {
500 utf8::encode $_;
501 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
502 }
503 }
504 }
505
371 sub process_arc { 506 sub process_arc {
372 while (my $job = $c_arc->get) { 507 while (my ($dir, $file) = @{ $c_arc->get }) {
373 my ($dir, $file) = @$job;
374
375 my $arc; 508 my $arc;
376 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 509 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
377 510
378 my $arc = read_arch "$dir/$file"; 511 my $arc = read_arch "$dir/$file";
379 for my $o (values %$arc) { 512 for my $o (values %$arc) {
380 push @ARC, $o; 513 push @ARC, $o;
381 for (my $m = $o; $m; $m = $m->{more}) { 514 for (my $m = $o; $m; $m = $m->{more}) {
382 $ARC{$m->{_name}} = $m; 515 $ARC{$m->{_name}} = $m;
383 } 516 }
384 517
385 $o->{editor_folder} = $dir; 518 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
386
387 my $visibility = delete $o->{visibility};
388 my $magicmap = delete $o->{magicmap};
389 519
390 # find upper left corner :/ 520 # find upper left corner :/
391 # omg, this is sooo broken 521 # omg, this is sooo broken
392 my ($dx, $dy); 522 my ($dx, $dy);
393 for (my $o = $o; $o; $o = $o->{more}) { 523 for (my $o = $o; $o; $o = $o->{more}) {
… …
400 my $y = $o->{y} - $dy; 530 my $y = $o->{y} - $dy;
401 531
402 my $ext = $x|$y ? "+$x+$y" : ""; 532 my $ext = $x|$y ? "+$x+$y" : "";
403 533
404 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 534 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
405
406 $visibility = delete $o->{visibility} if exists $o->{visibility};
407 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
408 535
409 my $anim = delete $o->{anim}; 536 my $anim = delete $o->{anim};
410 537
411 if ($anim) { 538 if ($anim) {
412 # possibly add $ext to the animation name to avoid 539 # possibly add $ext to the animation name to avoid
… …
440 567
441 my $info = $FACEINFO{$face} ||= { }; 568 my $info = $FACEINFO{$face} ||= { };
442 $info->{arc} = $o; 569 $info->{arc} = $o;
443 570
444 next if $face =~ /^blank.x11$|^empty.x11$/; 571 next if $face =~ /^blank.x11$|^empty.x11$/;
445
446 $info->{visibility} = $visibility if defined $visibility;
447 $info->{magicmap} = $magicmap if defined $magicmap;
448 } 572 }
449 573
450 if (my $smooth = delete $o->{smoothface}) { 574 if (my $smooth = delete $o->{smoothface}) {
451 my %kv = split /\s+/, $smooth; 575 my %kv = split /\s+/, $smooth;
452 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 576 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
… …
461 } 585 }
462 } 586 }
463 } 587 }
464 588
465 sub process_trs { 589 sub process_trs {
466 while (my $job = $c_trs->get) {
467 my ($dir, $file) = @$job; 590 my ($dir, $file) = @_;
468 my $path = "$dir/$file"; 591 my $path = "$dir/$file";
469 592
470 my $trs; 593 my $trs;
471 if (0 > aio_load $path, $trs) { 594 if (0 > aio_load $path, $trs) {
472 warn "$path: $!, skipping.\n"; 595 warn "$path: $!, skipping.\n";
473 next; 596 return;
474 } 597 }
475 598
476 $TRS .= $trs; 599 $TRS .= $trs;
477 }
478 } 600 }
479 601
480 my %FILECACHE; 602 my %FILECACHE;
481 603
482 sub load_cached($;$) { 604 sub load_cached($;$) {
… …
493 } 615 }
494 616
495 $FILECACHE{$_[0]} 617 $FILECACHE{$_[0]}
496 } 618 }
497 619
620 # convert an image and a palette to some indexed 2d-matrix structure
621 sub process_plt {
622 my ($base, $plt) = @_;
623
624 my ($w, $h) = imgsize "$base.png";
625
626 $w * $h
627 or die "$base.png: unable to identify correct size\n";
628
629 my @plt;
630 my %map;
631
632 for (split /\n/, $plt) {
633 next unless /\S/;
634 next if /^\s*#/;
635
636 /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/
637 or die "unparseable palette entry for $base.plt: $_";
638
639 my ($rgb, $name) = ($1, $2);
640
641 $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/;
642
643 $map{pack "H*", $rgb} = chr @plt;
644 push @plt, $name;
645 }
646
647 make_file ["$base.plt", "$base.png"], "$base.tbl~", sub {
648 warn "building $base\n" if $VERBOSE >= 3;
649
650 fork_exec {
651 open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:"
652 or die "$base.png: $!";
653
654 local $/;
655 $png = <$png>;
656
657 $w * $h * 3 == length $png
658 or die "$base.png: failed to read enough data from file\n";
659
660 $png =~ s/(...)/$map{$1}/ge;
661
662 $w * $h == length $png
663 or die "$base.png: failed to map all data - wrong palette?\n";
664
665 {
666 open my $fh, ">:raw", "$base.tbl~~"
667 or die "$base.tbl~~: $!";
668 syswrite $fh, $png;
669 }
670
671 rename "$base.tbl~~", "$base.tbl~";
672 };
673 };
674
675 0 <= aio_load "$base.tbl~", my $tbl
676 or die "$base.tbl~: $!";
677
678 IO::AIO::aio_unlink "$base.tbl~" unless $CACHE;
679
680 Compress::LZF::compress nfreeze {
681 w => $w,
682 h => $h,
683 plt => \@plt,
684 tbl => $tbl,
685 }
686 }
687
498 sub process_res { 688 sub process_res {
499 while (my $job = $c_res->get) {
500 my ($dir, $file, $type) = @$job; 689 my ($dir, $file, $type) = @_;
501 690
502 my $data;
503 aio_load "$dir/$file", $data; 691 0 <= aio_load "$dir/$file", my $data
692 or die "$dir/$file: $!";
504 693
505 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 694 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
506 695
507 utf8::decode $dir; 696 utf8::decode $dir;
508 utf8::decode $file; 697 utf8::decode $file;
509 698
510 # a meta file for resources is now mandatory 699 # a meta file for resources is now mandatory
511 unless (exists $meta->{$file}) { 700 unless (exists $meta->{$file}) {
512 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 701 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
513 next; 702 return;
514 } 703 }
515 704
516 $meta = { 705 $meta = {
517 %{ $meta->{"" } || {} }, 706 %{ $meta->{"" } || {} },
518 %{ $meta->{$file} || {} }, 707 %{ $meta->{$file} || {} },
519 }; 708 };
520 709
521 if ($meta->{license} =~ s/^#//) { 710 if ($meta->{license} =~ s/^#//) {
522 $meta->{license} = ({ 711 $meta->{license} = ({
523 "pd" => "Public Domain", 712 "pd" => "Public Domain",
524 "gpl" => "GNU General Public License, version 3.0 or any later", 713 "gpl" => "GNU General Public License, version 3.0 or any later",
525 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 714 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
715 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
526 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 716 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
527 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 717 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
528 })->{$meta->{license}} 718 })->{$meta->{license}}
529 || warn "$dir/$file: license tag '$meta->{license}' not found."; 719 || warn "$dir/$file: license tag '$meta->{license}' not found.";
530 } 720 }
531 721
722 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
723 ($meta->{author} = $1) =~ s/_/ /g;
724 }
725
532 $file =~ s/\.res$//; 726 $file =~ s/\.res$//;
533 $file =~ s/\.(ogg|wav|jpg|png)$//; 727 $file =~ s/\.(ogg|wav|jpg|png)$//;
534 728
535 substr $dir, 0, 1 + length $PATH, ""; 729 if ($file =~ s/\.plt$//) {
536 730 $data = process_plt "$dir/$file", $data;
537 if (my $filter = $meta->{cfutil_filter}) { 731 } elsif (my $filter = $meta->{cfutil_filter}) {
538 if ($filter eq "yaml2json") { 732 if ($filter eq "yaml2json") {
539 $data = JSON::XS::encode_json YAML::XS::Load $data; 733 $data = JSON::XS::encode_json YAML::XS::Load $data;
540 } elsif ($filter eq "json2json") { 734 } elsif ($filter eq "json2json") {
541 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 735 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
542 } elsif ($filter eq "perl2json") { 736 } elsif ($filter eq "perl2json") {
543 $data = eval $data; die if $@; 737 $data = eval $data; die if $@;
544 $data = JSON::XS::encode_json $data; 738 $data = JSON::XS::encode_json $data;
545 } else { 739 } else {
546 warn "$dir/$file: unknown filter $filter, skipping\n"; 740 warn "$dir/$file: unknown filter $filter, skipping\n";
547 } 741 }
548 } 742 }
549 743
744 substr $dir, 0, 1 + length $PATH, "";
745
550 $RESOURCE{"$dir/$file"} = { 746 $RESOURCE{"$dir/$file"} = {
551 type => (exists $meta->{type} ? delete $meta->{type} : $type), 747 type => (exists $meta->{type} ? delete $meta->{type} : $type),
552 data => $data, 748 data => $data,
553 %$meta ? (meta => $meta) : (), 749 %$meta ? (meta => $meta) : (),
554 }; 750 };
751 }
752
753 sub process_any {
754 while (my ($func, @args) = @{ $c_any->get }) {
755 $func->(@args);
555 } 756 }
556 } 757 }
557 758
558 sub find_files; 759 sub find_files;
559 sub find_files { 760 sub find_files {
560 my ($path) = @_; 761 my ($path) = @_;
561 762
763 my $grp = IO::AIO::aio_group;
764
765 my $scandir; $scandir = sub {
766 my ($path) = @_;
767
562 IO::AIO::aioreq_pri 4; 768 IO::AIO::aioreq_pri 4;
563 IO::AIO::aio_scandir $path, 4, sub { 769 add $grp IO::AIO::aio_scandir $path, 4, sub {
564 my ($dirs, $nondirs) = @_; 770 my ($dirs, $nondirs) = @_;
565 771
566 find_files "$path/$_" 772 $scandir->("$path/$_")
567 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 773 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
568 774
569 my $dir = $path; 775 my $dir = $path;
570 substr $dir, 0, 1 + length $PATH, ""; 776 substr $dir, 0, 1 + length $PATH, "";
571 777
572 for my $file (@$nondirs) { 778 for my $file (@$nondirs) {
573 if ($dir =~ /^music(?:\/|$)/) { 779 if ($dir =~ /^music(?:\/|$)/) {
574 $c_res->put ([$path, $file, 3]) # FT_MUSIC 780 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
575 if $file =~ /\.(ogg)$/; 781 if $file =~ /\.(ogg)$/;
576 782
577 } elsif ($dir =~ /^sound(?:\/|$)/) { 783 } elsif ($dir =~ /^sound(?:\/|$)/) {
578 $c_res->put ([$path, $file, 5]) # FT_SOUND 784 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
579 if $file =~ /\.(wav|ogg)$/; 785 if $file =~ /\.(wav|ogg)$/;
580 786
581 } elsif ($dir =~ /^res(?:\/|$)/) { 787 } elsif ($dir =~ /^res(?:\/|$)/) {
582 if ($file =~ /\.(jpg|png)$/) { 788 if ($file =~ /\.(jpg|png)$/) {
583 $c_res->put ([$path, $file, 0]) # FT_FACE 789 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
584 } elsif ($file =~ /\.(res)$/) { 790 } elsif ($file =~ /\.(res)$/) {
791 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
792 } else {
793 $c_any->put ([\&process_res, $path, $file, undef]);
794 }
795
796 } elsif ($file =~ /\.png$/) {
797 push @c_png, ["$path/$file", 0];
798
799 } elsif ($file =~ /\.faceinfo$/) {
800 $c_any->put ([\&process_faceinfo, $path, $file]);
801
802 } elsif ($file =~ /\.trs$/) {
803 $c_any->put ([\&process_trs, $path, $file]);
804
805 } elsif ($file =~ /\.arc$/) {
585 $c_res->put ([$path, $file, 6]) # FT_RSRC 806 $c_arc->put ([$path, $file]);
807
586 } else { 808 } else {
587 $c_res->put ([$path, $file, undef]); 809 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
588 } 810 }
589
590 } elsif ($file =~ /\.png$/) {
591 push @c_png, ["$path/$file", 0];
592
593 } elsif ($file =~ /\.trs$/) {
594 $c_trs->put ([$path, $file]);
595
596 } elsif ($file =~ /\.arc$/) {
597 $c_arc->put ([$path, $file]);
598
599 } else { 811 }
600 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
601 }
602 } 812 };
603 }; 813 };
814
815 $scandir->($path);
816 aio_wait $grp;
817 }
818
819 sub generate_plurals {
820# use Lingua::EN::Inflect ();
821# Lingua::EN::Inflect::classical;
822# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
823# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
824#
825# for my $a (@ARC) {
826# my $name = $a->{name} || $a->{_name};
827#
828# next unless $a->{name_pl};
829# next if $a->{invisible};
830# next if $a->{is_floor};
831# next if $a->{no_pick};
832#
833# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
834# my $pl = $test =~ /^(?:eq|p:.)$/
835# ? $name
836# : Lingua::EN::Inflect::PL $name;
837#
838# if ($pl ne $a->{name_pl}) {
839# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
840# }
841# }
604 } 842 }
605 843
606 sub inst_arch($) { 844 sub inst_arch($) {
607 my (undef, $path) = @_; 845 my (undef, $path) = @_;
608 846
… …
621 if (!-d "$path/treasures") { 859 if (!-d "$path/treasures") {
622 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 860 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
623 exit 1 unless $FORCE; 861 exit 1 unless $FORCE;
624 } 862 }
625 863
626 print "scanning files...\n" if $VERBOSE; 864 print "starting file scan, arc, any processing...\n" if $VERBOSE;
865
866 my @a_arc = map +(async \&process_arc), 1..2;
867 my @a_any = map +(async \&process_any), 1..4;
627 868
628 find_files $path; 869 find_files $path;
629 870
630 my @a_arc = map +(async \&process_arc), 1..2;
631 my @a_res = map +(async \&process_res), 1..2;
632 my @a_trs = map +(async \&process_trs), 1..2;
633
634 IO::AIO::flush;
635
636 $c_res->shutdown;
637 $c_arc->shutdown; 871 $c_arc->shutdown;
638 $c_trs->shutdown; 872 $c_any->shutdown;
639
640 print "start file scan, arc, res processing...\n" if $VERBOSE;
641 873
642 $_->join for @a_arc; # need to parse all archetypes before png processing 874 $_->join for @a_arc; # need to parse all archetypes before png processing
875 print "ended arc processing...\n" if $VERBOSE;
643 876
644 print "end arc, start png processing...\n" if $VERBOSE; 877 print "starting png processing...\n" if $VERBOSE;
645 878
646 # eight png crunchers work fine for my 4x smp machine 879 # eight png crunchers work fine for my 4x smp machine
647 my @a_png = map +(async \&process_png), 1..8; 880 my @a_png = map +(async \&process_png), 1..8;
648 881
649 $_->join for (@a_trs, @a_res, @a_png); 882 $_->join for @a_any;
883 print "ended any processing...\n" if $VERBOSE;
884
885 $_->join for @a_png;
886 print "ended png processing...\n" if $VERBOSE;
650 887
651 print "scanning done, processing results...\n" if $VERBOSE; 888 print "scanning done, processing results...\n" if $VERBOSE;
652 { 889 {
653 # remove path prefix from editor_folder 890 # remove path prefix from editor_folder
891 $_->{editor_folder} =~ /^\x00/
654 substr $_->{editor_folder}, 0, 1 + length $path, "" 892 and substr $_->{editor_folder}, 0, 2 + length $path, ""
655 for values %ARC; 893 for values %ARC;
656 894
657 print "resolving inheritance tree...\n" if $VERBOSE; 895 print "resolving inheritance tree...\n" if $VERBOSE;
658 # resolve inherit 896 # resolve inherit
659 while () { 897 while () {
660 my $progress; 898 my $progress;
661 my $loop; 899 my $loop;
662 900
663 for my $o (values %ARC) { 901 for my $o (values %ARC) {
664 if (my $other = $o->{inherit}) { 902 for my $other (split /,/, $o->{inherit}) {
665 if (my $s = $ARC{$other}) { 903 if (my $s = $ARC{$other}) {
666 if ($s->{inherit}) { 904 if ($s->{inherit}) {
667 $loop = $s; 905 $loop = $s;
668 } else { 906 } else {
669 delete $o->{inherit}; 907 delete $o->{inherit};
… …
671 delete @s{qw(_name more name name_pl)}; 909 delete @s{qw(_name more name name_pl)};
672 %$o = ( %s, %$o ); 910 %$o = ( %s, %$o );
673 ++$progress; 911 ++$progress;
674 } 912 }
675 } else { 913 } else {
676 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 914 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
677 delete $ARC{$o->{_name}}; 915 delete $ARC{$o->{_name}};
678 } 916 }
679 } 917 }
680 } 918 }
681 919
… …
688 } 926 }
689 927
690 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 928 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
691 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 929 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
692 930
931 # fix up archetypes without names, where the archanme doesn't work at all
932 for (@ARC) {
933 if (!exists $_->{name} and $_->{_name} =~ /_/) {
934 for ($_->{name} = $_->{_name}) {
935 s/(?:_\d+)+$//;
936 s/_[nesw]+$//;
937 y/_/ /;
938 }
939 }
940 }
941
942 #print "generating plurals...\n" if $VERBOSE;
943 #generate_plurals;
944
693 print "writing archetypes...\n" if $VERBOSE; 945 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
694 open my $fh, ">:utf8", "$DATADIR/archetypes~" 946 open my $fh, ">:utf8", "$DATADIR/archetypes~"
695 or die "$DATADIR/archetypes~: $!"; 947 or die "$DATADIR/archetypes~: $!";
696 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 948 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
697 } 949 }
698 950
699 { 951 {
700 print "writing treasures...\n" if $VERBOSE; 952 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
701 open my $fh, ">:utf8", "$DATADIR/treasures~" 953 open my $fh, ">:utf8", "$DATADIR/treasures~"
702 or die "$DATADIR/treasures~: $!"; 954 or die "$DATADIR/treasures~: $!";
703 print $fh $TRS; 955 print $fh $TRS;
704 } 956 }
705 957
706 { 958 {
707 print "processing facedata...\n" if $VERBOSE; 959 print "processing facedata...\n" if $VERBOSE;
708 while (my ($k, $v) = each %FACEINFO) { 960 while (my ($k, $v) = each %FACEINFO) {
709 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 961 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
710 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 962 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
711 963
964 make_hash $k, $v->{data32}, $v->{hash32};
965 make_hash $k, $v->{data64}, $v->{hash64};
966
712 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 967 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
713 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 968 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
714 969
715 if (my $magicmap = $v->{magicmap}) { 970 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
716 $magicmap =~ y/A-Z_\-/a-z/d; 971 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
717 $v->{magicmap} = $COLOR{$magicmap}; 972 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
973
974 delete @$v{qw(arc stem)}; # not used by the server
975 }
976
977 print "processing resources...\n" if $VERBOSE;
978 my $enc = JSON::XS->new->utf8->canonical->relaxed;
979 while (my ($k, $v) = each %RESOURCE) {
980
981 if ($v->{meta} && $v->{meta}{datadir}) {
982 delete $RESOURCE{$k};
983
984 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
985
986 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
987 open my $fh, ">:raw", "$DATADIR/$k~"
988 or die "$DATADIR/$k~: $!";
989 syswrite $fh, $v->{data};
990 push @COMMIT, $k;
991
992 } else {
993 if ($v->{type} & 1) {
994 # prepend meta info
995
996 my $meta = $enc->encode ({
997 name => $k,
998 %{ $v->{meta} || {} },
999 });
1000
1001 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
718 } 1002 }
719 1003
720 delete $v->{arc}; 1004 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
721 } 1005 }
1006 }
722 1007
723 print "writing facedata...\n" if $VERBOSE; 1008 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
1009 scalar keys %FACEINFO,
1010 scalar keys %ANIMINFO,
1011 scalar keys %RESOURCE
1012 if $VERBOSE;
1013
724 open my $fh, ">:perlio", "$DATADIR/facedata~" 1014 open my $fh, ">:perlio", "$DATADIR/facedata~"
725 or die "$DATADIR/facedata~: $!"; 1015 or die "$DATADIR/facedata~: $!";
726 1016
727 print $fh freeze { 1017 print $fh nfreeze {
728 version => 2, 1018 version => 2,
729 faceinfo => \%FACEINFO, 1019 faceinfo => \%FACEINFO,
730 animinfo => \%ANIMINFO, 1020 animinfo => \%ANIMINFO,
731 resource => \%RESOURCE, 1021 resource => \%RESOURCE,
732 }; 1022 };
733 } 1023 }
734 1024
735 print "committing files...\n" if $VERBOSE; 1025 print "committing files...\n" if $VERBOSE;
736 1026
737 for (qw(archetypes facedata treasures)) { 1027 for (qw(archetypes facedata treasures), @COMMIT) {
738 chmod 0644, "$DATADIR/$_~"; 1028 chmod 0644, "$DATADIR/$_~";
739 rename "$DATADIR/$_~", "$DATADIR/$_" 1029 rename "$DATADIR/$_~", "$DATADIR/$_"
740 or die "$DATADIR/$_: $!"; 1030 or die "$DATADIR/$_: $!";
741 } 1031 }
742 1032

Diff Legend

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