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.39 by root, Sun Jul 15 22:39:48 2007 UTC vs.
Revision 1.96 by root, Wed Oct 6 00:28:15 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 POSIX (); 52use Coro::Util;
25use Digest::MD5; 53use Coro::Channel;
26use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
57
58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 59
28sub usage { 60sub usage {
29 warn <<EOF; 61 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 62Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 63 [--install-arch path]
42my $VERBOSE = 1; 74my $VERBOSE = 1;
43my $CACHE = 0; 75my $CACHE = 0;
44my $FORCE; 76my $FORCE;
45my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
46my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
47 80
48our %COLOR = ( 81our %COLOR = (
49 black => 0, 82 black => 0,
50 white => 1, 83 white => 1,
51 navy => 2, 84 navy => 2,
61 tan => 12, 94 tan => 12,
62); 95);
63 96
64END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
65 98
66Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
67Event->signal (signal => "TERM", cb => sub { exit 1 }); 100my $s_TERM = EV::signal TERM => sub { exit 1 };
101
102our %hash;
103
104# here we could try to avoid collisions and reduce chksum size further
105sub make_hash($\$\$;$) {
106 my ($id, $dataref, $hashref, $clen) = @_;
107
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
109
110 if (exists $hash{$hash}) {
111 # hash collision, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n";
114 exit 1;
115 } else {
116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
117 }
118 }
119 $hash{$hash} = [$id, $dataref, $hashref];
120
121 $$hashref = $hash;
122}
68 123
69mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
70 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
71 126
72sub fork_sub(&) { 127sub fork_sub(&) {
92 if (!-f "$path/regions") { 147 if (!-f "$path/regions") {
93 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 148 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
94 exit 1 unless $FORCE; 149 exit 1 unless $FORCE;
95 } 150 }
96 151
97 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 152 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
153 "$path/.", "$DATADIR/maps/.",
154 "--exclude", "CVS", "--exclude", "/world-precomposed",
155 "--delete", "--delete-excluded"
98 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
99 157
100 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
159}
160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163sub autoglyph {
164 my ($stem, $face) = @_;
165
166 if ($stem =~ /^wall\/|Nimwall/) {
167 return $WALL_SUFFIX[hex $1]
168 if $stem =~ /(_[0-9A-F]).x11/;
169
170 "+"
171
172 } elsif ($stem =~ /^monster.*\/(.)/) {
173 $1
174
175 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
176 "."
177
178 } elsif ($stem =~ /^player\//) {
179 "\@"
180
181 } else {
182 substr $stem, 0, 1
183 }
101} 184}
102 185
103{ 186{
104 our %ANIMINFO; 187 our %ANIMINFO;
105 our %FACEINFO; 188 our %FACEINFO;
110 our $NFILE; 193 our $NFILE;
111 our $PATH; 194 our $PATH;
112 195
113 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 196 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
114 197
115 our (@png, @trs, @arc, @res); # files we are interested in 198 our $c_arc = new Coro::Channel;
199 our $c_trs = new Coro::Channel;
200 our $c_res = new Coro::Channel;
116 201
202 our @c_png;
203
117 sub commit_png($$$) { 204 sub commit_png($$$$) {
118 my ($name, $data, $T) = @_; 205 my ($stem, $name, $data, $T) = @_;
119 206
207 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
120 $FACEINFO{$name}{"data$T"} = $data; 208 $FACEINFO{$name}{"data$T"} = $data;
121 } 209 }
122 210
123 sub process_png { 211 sub process_png {
124 while (@png) { 212 while (@c_png) {
125 my ($path, $delete) = @{pop @png}; 213 my ($path, $delete) = @{pop @c_png};
126 214
127 my $png; 215 my $png;
128 aio_lstat $path; 216 aio_lstat $path;
129 my ($size, $mtime) = (stat _)[7,9]; 217 my ($size, $mtime) = (stat _)[7,9];
130 218
161 if ($w % $T || $h % $T) { 249 if ($w % $T || $h % $T) {
162 warn "$path: weird png size ($w $h), skipping.\n"; 250 warn "$path: weird png size ($w $h), skipping.\n";
163 next; 251 next;
164 } 252 }
165 253
254 (my $base = $stem) =~ s/^.*\///;
255
256 my $fi = $FACEINFO{$base};
257 unless ($fi) {
258 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
259 #next;
260 }
261
262 my $arc = $fi->{arc} || { };
263
166 unless ($path =~ /~$/) { 264 unless ($path =~ /~$/) {
167 # possibly enlarge 265 # possibly enlarge
168 if (0 > aio_stat "$stem.64x64.png") { 266 if (0 > aio_stat "$stem.64x64.png") {
169 my $other = "$stem.64x64.png~"; 267 my $other = "$stem.64x64.png~";
170 268
171 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 269 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
172 my $wrap = 0; # for the time being
173 fork_sub { 270 fork_sub {
271 my $CROP;
272 my $SRC = "png:\Q$path\E";
273
274 my $is_floor = $arc->{is_floor};
275 my $is_wall = 0;
276
277 my ($wall_pfx, $wall_dir, $wall_sfx);
278
279 if (
280 !$is_floor
281 && !$arc->{alive}
282 && $arc->{move_block} eq "all"
283 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
284 ) {
285 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
286
287 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
288 $is_wall = 1;
289 }
290 }
291
292 if ($is_wall || $is_floor) {
293 # add a 4px border and add other images around it
294 $CROP = "-shave 8x8 +repage";
295
296 $w += 8;
297 $h += 8;
298
299 $SRC = "-size ${w}x${h} xc:transparent";
300 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
301
302 # 8 surrounding images
303 for (
304 # x y b r0 r1
305 [-1, -1, 0, 6],
306 [ 0, -1, 1, 10, 14],
307 [+1, -1, 0, 12],
308
309 [-1, 0, 8, 5, 7],
310 #
311 [+1, 0, 2, 5, 13],
312
313 [-1, +1, 0, 3],
314 [ 0, +1, 4, 10, 11],
315 [+1, +1, 0, 9],
316 ) {
317 my ($x, $y, $d, $r0, $r1) = @$_;
318
319 my $tile = $is_floor ? $path
320 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
321 : die;
322
323 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
324 "\Q$tile",
325 $x * ($w - 8) + 4,
326 $y * ($h - 8) + 4;
327 }
328 }
329
174 system "convert png:\Q$path\E -depth 8 rgba:-" 330 system "convert -depth 8 $SRC rgba:-"
175 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 331 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
176 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 332 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
177 and die "convert/hq2xa pipeline error: status $? ($!)"; 333 and die "convert/cfhq2xa pipeline error: status $? ($!)";
178 system $OPTIPNG, "-i0", "-q", "$other~"; 334 system $OPTIPNG, "-i0", "-q", "$other~";
179 die "$other~ has zero size, aborting." unless -s "$other~"; 335 die "$other~ has zero size, aborting." unless -s "$other~";
180 rename "$other~", $other; 336 rename "$other~", $other;
181 }; 337 };
182 } 338 }
183 339
184 push @png, [$other, !$CACHE]; 340 push @c_png, [$other, !$CACHE];
185 } 341 }
186 342
187 # possibly scale down 343 # possibly scale down
188 if (0 > aio_stat "$stem.32x32.png") { 344 if (0 > aio_stat "$stem.32x32.png") {
189 my $other = "$stem.32x32.png~"; 345 my $other = "$stem.32x32.png~";
192 fork_sub { 348 fork_sub {
193 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 349 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
194 system $OPTIPNG, "-i0", "-q", "$other~"; 350 system $OPTIPNG, "-i0", "-q", "$other~";
195 351
196 # reduce smoothfaces >10000 bytes 352 # reduce smoothfaces >10000 bytes
353 # obsolete, no longer required
197 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 354 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
198 my $ncolor = 256; 355 my $ncolor = 256;
199 while () { 356 while () {
200 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 357 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
201 system $OPTIPNG, "-i0", "-q", "$other~~"; 358 system $OPTIPNG, "-i0", "-q", "$other~~";
202 last if 10000 > -s "$other~~"; 359 last if 10000 > -s "$other~~";
214 rename "$other~", $other; 371 rename "$other~", $other;
215 }; 372 };
216 } 373 }
217 374
218 #warn "scaled down $path to $other\n";#d# 375 #warn "scaled down $path to $other\n";#d#
219 push @png, [$other, !$CACHE]; 376 push @c_png, [$other, !$CACHE];
220 } 377 }
221 } 378 }
222 379
223 (my $face = $stem) =~ s/^.*\///; 380 (my $face = $stem) =~ s/^.*\///;
224 381
273 430
274 if (0 > aio_load $file, $tile) { 431 if (0 > aio_load $file, $tile) {
275 die "$path: unable to read tile +$x+$y, aborting.\n"; 432 die "$path: unable to read tile +$x+$y, aborting.\n";
276 } 433 }
277 IO::AIO::aio_unlink $file unless $CACHE; 434 IO::AIO::aio_unlink $file unless $CACHE;
278 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 435 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
279 } 436 }
280 } else { 437 } else {
281 # use as-is (either small, use smooth) 438 # use as-is (either small, use smooth)
282 commit_png $face, $png, $T; 439 commit_png $stem, $face, $png, $T;
283 } 440 }
284 441
285 aio_unlink $path if $delete; 442 aio_unlink $path if $delete;
286 } 443 }
287 } 444 }
288 445
289 sub process_arc { 446 sub process_arc {
290 while (@arc) { 447 while (my $job = $c_arc->get) {
291 my ($dir, $file) = @{pop @arc}; 448 my ($dir, $file) = @$job;
292 449
293 my $arc; 450 my $arc;
294 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 451 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
295 452
296 my $arc = read_arch "$dir/$file"; 453 my $arc = read_arch "$dir/$file";
298 push @ARC, $o; 455 push @ARC, $o;
299 for (my $m = $o; $m; $m = $m->{more}) { 456 for (my $m = $o; $m; $m = $m->{more}) {
300 $ARC{$m->{_name}} = $m; 457 $ARC{$m->{_name}} = $m;
301 } 458 }
302 459
303 $o->{editor_folder} = $dir; 460 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
304 461
305 my $visibility = delete $o->{visibility}; 462 my $visibility = delete $o->{visibility};
306 my $magicmap = delete $o->{magicmap}; 463 my $magicmap = delete $o->{magicmap};
464 my $glyph = delete $o->{glyph};
307 465
308 # find upper left corner :/ 466 # find upper left corner :/
309 # omg, this is sooo broken 467 # omg, this is sooo broken
310 my ($dx, $dy); 468 my ($dx, $dy);
311 for (my $o = $o; $o; $o = $o->{more}) { 469 for (my $o = $o; $o; $o = $o->{more}) {
321 479
322 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 480 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
323 481
324 $visibility = delete $o->{visibility} if exists $o->{visibility}; 482 $visibility = delete $o->{visibility} if exists $o->{visibility};
325 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 483 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
484 $glyph = delete $o->{glyph} if exists $o->{glyph};
326 485
327 my $anim = delete $o->{anim}; 486 my $anim = delete $o->{anim};
328 487
329 if ($anim) { 488 if ($anim) {
330 # possibly add $ext to the animation name to avoid 489 # possibly add $ext to the animation name to avoid
348 facings => $facings, 507 facings => $facings,
349 frames => \@frames, 508 frames => \@frames,
350 }; 509 };
351 } 510 }
352 511
353 for my $face ($o->{face} || (), @{$anim || []}) { 512 for ($o->{face} || (), @{$anim || []}) {
354 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 513 next if /^facings\s/;
355 514
515 my $face = $_;
516 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
517
356 my $info = $FACEINFO{$face} ||= {}; 518 my $info = $FACEINFO{$face} ||= { };
519 $info->{arc} = $o;
520
521 next if $face =~ /^blank.x11$|^empty.x11$/;
357 522
358 $info->{visibility} = $visibility if defined $visibility; 523 $info->{visibility} = $visibility if defined $visibility;
359 $info->{magicmap} = $magicmap if defined $magicmap; 524 $info->{magicmap} = $magicmap if defined $magicmap;
525 $info->{glyph} = $glyph if defined $glyph;
360 } 526 }
361 527
362 if (my $smooth = delete $o->{smoothface}) { 528 if (my $smooth = delete $o->{smoothface}) {
363 my %kv =split /\s+/, $smooth; 529 my %kv = split /\s+/, $smooth;
364 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 530 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
365 while (my ($face, $smooth) = each %kv) { 531 while (my ($face, $smooth) = each %kv) {
532 $FACEINFO{$smooth}{arc} = $o;
533
366 $FACEINFO{$face}{smooth} = $smooth; 534 $FACEINFO{$face}{smooth} = $smooth;
367 $FACEINFO{$face}{smoothlevel} = $level; 535 $FACEINFO{$face}{smoothlevel} = $level;
368 } 536 }
369 } 537 }
370 } 538 }
371 } 539 }
372 } 540 }
373 } 541 }
374 542
375 sub process_trs { 543 sub process_trs {
376 while (@trs) { 544 while (my $job = $c_trs->get) {
377 my ($dir, $file) = @{pop @trs}; 545 my ($dir, $file) = @$job;
378 my $path = "$dir/$file"; 546 my $path = "$dir/$file";
379 547
380 my $trs; 548 my $trs;
381 if (0 > aio_load $path, $trs) { 549 if (0 > aio_load $path, $trs) {
382 warn "$path: $!, skipping.\n"; 550 warn "$path: $!, skipping.\n";
385 553
386 $TRS .= $trs; 554 $TRS .= $trs;
387 } 555 }
388 } 556 }
389 557
558 my %FILECACHE;
559
560 sub load_cached($;$) {
561 unless (exists $FILECACHE{$_[0]}) {
562 my $data;
563 if (0 < aio_load $_[0], $data) {
564 if ($_[1]) {
565 $data = eval { $_[1]->($data) };
566 warn "$_[0]: $@" if $@;
567 }
568 }
569
570 $FILECACHE{$_[0]} = $data;
571 }
572
573 $FILECACHE{$_[0]}
574 }
575
390 sub process_res { 576 sub process_res {
391 while (@res) { 577 while (my $job = $c_res->get) {
392 my ($dir, $file) = @{pop @res}; 578 my ($dir, $file, $type) = @$job;
393 579
394 my $data; 580 my $data;
395 aio_load "$dir/$file", $data; 581 aio_load "$dir/$file", $data;
396 582
397 my $copyright; 583 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
398 aio_load "$dir/copyright", $copyright; 584
585 utf8::decode $dir;
586 utf8::decode $file;
587
588 # a meta file for resources is now mandatory
589 unless (exists $meta->{$file}) {
590 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
591 next;
592 }
593
594 $meta = {
595 %{ $meta->{"" } || {} },
596 %{ $meta->{$file} || {} },
597 };
598
599 if ($meta->{license} =~ s/^#//) {
600 $meta->{license} = ({
601 "pd" => "Public Domain",
602 "gpl" => "GNU General Public License, version 3.0 or any later",
603 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
604 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
605 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
606 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
607 })->{$meta->{license}}
608 || warn "$dir/$file: license tag '$meta->{license}' not found.";
609 }
610
611 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
612 ($meta->{author} = $1) =~ s/_/ /g;
613 }
399 614
400 $file =~ s/\.res$//; 615 $file =~ s/\.res$//;
401 $file =~ /\.([^.]+)$/ 616 $file =~ s/\.(ogg|wav|jpg|png)$//;
402 or next;
403
404 my $type = $1;
405 617
406 substr $dir, 0, 1 + length $PATH, ""; 618 substr $dir, 0, 1 + length $PATH, "";
407 619
620 if (my $filter = $meta->{cfutil_filter}) {
621 if ($filter eq "yaml2json") {
622 $data = JSON::XS::encode_json YAML::XS::Load $data;
623 } elsif ($filter eq "json2json") {
624 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
625 } elsif ($filter eq "perl2json") {
626 $data = eval $data; die if $@;
627 $data = JSON::XS::encode_json $data;
628 } else {
629 warn "$dir/$file: unknown filter $filter, skipping\n";
630 }
631 }
632
408 $RESOURCE{"$dir/$file"} = { 633 $RESOURCE{"$dir/$file"} = {
409 type => $1, 634 type => (exists $meta->{type} ? delete $meta->{type} : $type),
410 copyright => $copyright,
411 data => $data, 635 data => $data,
412 chksum => Digest::MD5::md5 $data, 636 %$meta ? (meta => $meta) : (),
413 }; 637 };
414 } 638 }
415 } 639 }
416 640
417 sub find_files; 641 sub find_files;
421 IO::AIO::aioreq_pri 4; 645 IO::AIO::aioreq_pri 4;
422 IO::AIO::aio_scandir $path, 4, sub { 646 IO::AIO::aio_scandir $path, 4, sub {
423 my ($dirs, $nondirs) = @_; 647 my ($dirs, $nondirs) = @_;
424 648
425 find_files "$path/$_" 649 find_files "$path/$_"
426 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 650 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
651
652 my $dir = $path;
653 substr $dir, 0, 1 + length $PATH, "";
427 654
428 for my $file (@$nondirs) { 655 for my $file (@$nondirs) {
656 if ($dir =~ /^music(?:\/|$)/) {
657 $c_res->put ([$path, $file, 3]) # FT_MUSIC
658 if $file =~ /\.(ogg)$/;
659
660 } elsif ($dir =~ /^sound(?:\/|$)/) {
661 $c_res->put ([$path, $file, 5]) # FT_SOUND
662 if $file =~ /\.(wav|ogg)$/;
663
664 } elsif ($dir =~ /^res(?:\/|$)/) {
665 if ($file =~ /\.(jpg|png)$/) {
666 $c_res->put ([$path, $file, 0]) # FT_FACE
667 } elsif ($file =~ /\.(res)$/) {
668 $c_res->put ([$path, $file, 6]) # FT_RSRC
669 } else {
670 $c_res->put ([$path, $file, undef]);
671 }
672
429 if ($file =~ /\.png$/) { 673 } elsif ($file =~ /\.png$/) {
430 push @png, ["$path/$file", 0]; 674 push @c_png, ["$path/$file", 0];
675
431 } elsif ($file =~ /\.trs$/) { 676 } elsif ($file =~ /\.trs$/) {
432 push @trs, [$path, $file]; 677 $c_trs->put ([$path, $file]);
678
433 } elsif ($file =~ /\.arc$/) { 679 } elsif ($file =~ /\.arc$/) {
434 push @arc, [$path, $file]; 680 $c_arc->put ([$path, $file]);
435 } elsif ($file =~ /\.(ogg|jpg|res)$/) { 681
436 push @res, [$path, $file];
437 } else { 682 } else {
438 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 683 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
439 } 684 }
440 } 685 }
441 }; 686 };
687 }
688
689 sub generate_plurals {
690# use Lingua::EN::Inflect ();
691# Lingua::EN::Inflect::classical;
692# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
693# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
694#
695# for my $a (@ARC) {
696# my $name = $a->{name} || $a->{_name};
697#
698# next unless $a->{name_pl};
699# next if $a->{invisible};
700# next if $a->{is_floor};
701# next if $a->{no_pick};
702#
703# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
704# my $pl = $test =~ /^(?:eq|p:.)$/
705# ? $name
706# : Lingua::EN::Inflect::PL $name;
707#
708# if ($pl ne $a->{name_pl}) {
709# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
710# }
711# }
442 } 712 }
443 713
444 sub inst_arch($) { 714 sub inst_arch($) {
445 my (undef, $path) = @_; 715 my (undef, $path) = @_;
446 716
459 if (!-d "$path/treasures") { 729 if (!-d "$path/treasures") {
460 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 730 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
461 exit 1 unless $FORCE; 731 exit 1 unless $FORCE;
462 } 732 }
463 733
734 print "scanning files...\n" if $VERBOSE;
735
464 find_files $path; 736 find_files $path;
737
738 my @a_arc = map +(async \&process_arc), 1..2;
739 my @a_res = map +(async \&process_res), 1..2;
740 my @a_trs = map +(async \&process_trs), 1..2;
741
465 IO::AIO::flush; 742 IO::AIO::flush;
466 743
467 $_->join for ( 744 $c_res->shutdown;
745 $c_arc->shutdown;
746 $c_trs->shutdown;
747
748 print "start file scan, arc, res processing...\n" if $VERBOSE;
749
750 $_->join for @a_arc; # need to parse all archetypes before png processing
751
752 print "end arc, start png processing...\n" if $VERBOSE;
753
468 # four png crunchers work fine for my 2x smp machine 754 # eight png crunchers work fine for my 4x smp machine
469 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 755 my @a_png = map +(async \&process_png), 1..8;
470 (async \&process_trs), (async \&process_trs),
471 (async \&process_arc), (async \&process_arc),
472 (async \&process_res), (async \&process_res),
473 );
474 756
757 $_->join for (@a_trs, @a_res, @a_png);
758
759 print "scanning done, processing results...\n" if $VERBOSE;
475 { 760 {
476 # remove path prefix from editor_folder 761 # remove path prefix from editor_folder
762 $_->{editor_folder} =~ /^\x00/
477 substr $_->{editor_folder}, 0, 1 + length $path, "" 763 and substr $_->{editor_folder}, 0, 2 + length $path, ""
478 for values %ARC; 764 for values %ARC;
479 765
766 print "resolving inheritance tree...\n" if $VERBOSE;
480 # resolve inherit 767 # resolve inherit
481 while () { 768 while () {
482 my $progress; 769 my $progress;
483 my $loop; 770 my $loop;
484 771
485 for my $o (values %ARC) { 772 for my $o (values %ARC) {
486 if (my $other = $o->{inherit}) { 773 for my $other (split /,/, $o->{inherit}) {
487 if (my $s = $ARC{$other}) { 774 if (my $s = $ARC{$other}) {
488 if ($s->{inherit}) { 775 if ($s->{inherit}) {
489 $loop = $s; 776 $loop = $s;
490 } else { 777 } else {
491 delete $o->{inherit}; 778 delete $o->{inherit};
510 } 797 }
511 798
512 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 799 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
513 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 800 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
514 801
802 print "generating plurals...\n" if $VERBOSE;
803 generate_plurals;
804
805 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
515 open my $fh, ">:utf8", "$DATADIR/archetypes~" 806 open my $fh, ">:utf8", "$DATADIR/archetypes~"
516 or die "$DATADIR/archetypes~: $!"; 807 or die "$DATADIR/archetypes~: $!";
517 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 808 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
518 } 809 }
519 810
520 { 811 {
812 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
521 open my $fh, ">:utf8", "$DATADIR/treasures~" 813 open my $fh, ">:utf8", "$DATADIR/treasures~"
522 or die "$DATADIR/treasures~: $!"; 814 or die "$DATADIR/treasures~: $!";
523 print $fh $TRS; 815 print $fh $TRS;
524 } 816 }
525 817
526 { 818 {
819 print "processing facedata...\n" if $VERBOSE;
527 while (my ($k, $v) = each %FACEINFO) { 820 while (my ($k, $v) = each %FACEINFO) {
528 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 821 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
529 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 822 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
530 823
824 make_hash $k, $v->{data32}, $v->{hash32};
825 make_hash $k, $v->{data64}, $v->{hash64};
826
531 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 827 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
532 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 828 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
533
534 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
535 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
536 829
537 if (my $magicmap = $v->{magicmap}) { 830 if (my $magicmap = $v->{magicmap}) {
538 $magicmap =~ y/A-Z_\-/a-z/d; 831 $magicmap =~ y/A-Z_\-/a-z/d;
539 $v->{magicmap} = $COLOR{$magicmap}; 832 $v->{magicmap} = $COLOR{$magicmap};
540 } 833 }
834
835 my $stem = delete $v->{stem};
836 $v->{glyph} //= autoglyph $stem, $v;
837 utf8::encode $v->{glyph};
838 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
839
840 delete $v->{arc};
841 }
842
843 print "processing resources...\n" if $VERBOSE;
844 my $enc = JSON::XS->new->utf8->canonical->relaxed;
845 while (my ($k, $v) = each %RESOURCE) {
846
847 if ($v->{meta} && $v->{meta}{datadir}) {
848 delete $RESOURCE{$k};
849
850 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
851
852 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
853 open my $fh, ">:raw", "$DATADIR/$k~"
854 or die "$DATADIR/$k~: $!";
855 syswrite $fh, $v->{data};
856 push @COMMIT, $k;
857
858 } else {
859 if ($v->{type} & 1) {
860 # prepend meta info
861
862 my $meta = $enc->encode ({
863 name => $k,
864 %{ $v->{meta} || {} },
865 });
866
867 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
868 }
869
870 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
541 } 871 }
872 }
873
874 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
875 scalar keys %FACEINFO,
876 scalar keys %ANIMINFO,
877 scalar keys %RESOURCE
878 if $VERBOSE;
542 879
543 open my $fh, ">:perlio", "$DATADIR/facedata~" 880 open my $fh, ">:perlio", "$DATADIR/facedata~"
544 or die "$DATADIR/facedata~: $!"; 881 or die "$DATADIR/facedata~: $!";
545 882
546 print $fh freeze { 883 print $fh nfreeze {
547 version => 2, 884 version => 2,
548 faceinfo => \%FACEINFO, 885 faceinfo => \%FACEINFO,
549 animinfo => \%ANIMINFO, 886 animinfo => \%ANIMINFO,
550 resource => \%RESOURCE, 887 resource => \%RESOURCE,
551 }; 888 };
552 }
553 889
890 }
891
892 print "committing files...\n" if $VERBOSE;
893
554 for (qw(archetypes facedata treasures)) { 894 for (qw(archetypes facedata treasures), @COMMIT) {
555 chmod 0644, "$DATADIR/$_~"; 895 chmod 0644, "$DATADIR/$_~";
556 rename "$DATADIR/$_~", "$DATADIR/$_" 896 rename "$DATADIR/$_~", "$DATADIR/$_"
557 or die "$DATADIR/$_: $!"; 897 or die "$DATADIR/$_: $!";
558 } 898 }
559 899

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines