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.44 by root, Tue Jul 24 04:55:35 2007 UTC vs.
Revision 1.82 by root, Sat Apr 3 22:30:21 2010 UTC

1#!@PERL@ 1#!@PERL@
2
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#
2 24
3use strict; 25use strict;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
… …
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 Carp;
27use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
28 57
29$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
30 59
31sub usage { 60sub usage {
32 warn <<EOF; 61 warn <<EOF;
… …
64 tan => 12, 93 tan => 12,
65); 94);
66 95
67END { system "rm", "-rf", $TMPDIR } 96END { system "rm", "-rf", $TMPDIR }
68 97
69Event->signal (signal => "INT", cb => sub { exit 1 }); 98my $s_INT = EV::signal INT => sub { exit 1 };
70Event->signal (signal => "TERM", cb => sub { exit 1 }); 99my $s_TERM = EV::signal TERM => sub { exit 1 };
100
101our %hash;
102
103# here we could try to avoid collisions and reduce chksum size further
104sub make_hash($\$\$;$) {
105 my ($id, $dataref, $hashref, $clen) = @_;
106
107 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
108
109 if (exists $hash{$hash}) {
110 # hahs collinion, but some files are simply identical
111 if (${$hash{$hash}[1]} ne $$dataref) {
112 warn "hash collision $hash{$hash}[0] vs. $id\n";
113 exit 1;
114 } else {
115 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
116 }
117 }
118 $hash{$hash} = [$id, $dataref, $hashref];
119
120 $$hashref = $hash;
121}
71 122
72mkdir $TMPDIR, 0700 123mkdir $TMPDIR, 0700
73 or die "$TMPDIR: $!"; 124 or die "$TMPDIR: $!";
74 125
75sub fork_sub(&) { 126sub fork_sub(&) {
… …
95 if (!-f "$path/regions") { 146 if (!-f "$path/regions") {
96 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 147 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
97 exit 1 unless $FORCE; 148 exit 1 unless $FORCE;
98 } 149 }
99 150
100 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 151 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
152 "$path/.", "$DATADIR/maps/.",
153 "--exclude", "CVS", "--exclude", "/world-precomposed",
154 "--delete", "--delete-excluded"
101 and die "map installation failed.\n"; 155 and die "map installation failed.\n";
102 156
103 print "maps installed successfully.\n"; 157 print "maps installed successfully.\n";
104} 158}
105 159
… …
113 our $NFILE; 167 our $NFILE;
114 our $PATH; 168 our $PATH;
115 169
116 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 170 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
117 171
118 our (@png, @trs, @arc, @res); # files we are interested in 172 our $c_arc = new Coro::Channel;
173 our $c_trs = new Coro::Channel;
174 our $c_res = new Coro::Channel;
175
176 our @c_png;
119 177
120 sub commit_png($$$) { 178 sub commit_png($$$) {
121 my ($name, $data, $T) = @_; 179 my ($name, $data, $T) = @_;
122 180
123 $FACEINFO{$name}{"data$T"} = $data; 181 $FACEINFO{$name}{"data$T"} = $data;
124 } 182 }
125 183
126 sub process_png { 184 sub process_png {
127 while (@png) { 185 while (@c_png) {
128 my ($path, $delete) = @{pop @png}; 186 my ($path, $delete) = @{pop @c_png};
129 187
130 my $png; 188 my $png;
131 aio_lstat $path; 189 aio_lstat $path;
132 my ($size, $mtime) = (stat _)[7,9]; 190 my ($size, $mtime) = (stat _)[7,9];
133 191
… …
164 if ($w % $T || $h % $T) { 222 if ($w % $T || $h % $T) {
165 warn "$path: weird png size ($w $h), skipping.\n"; 223 warn "$path: weird png size ($w $h), skipping.\n";
166 next; 224 next;
167 } 225 }
168 226
227 (my $base = $stem) =~ s/^.*\///;
228
229 my $fi = $FACEINFO{$base};
230 unless ($fi) {
231 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
232 #next;
233 }
234
235 my $arc = $fi->{arc} || { };
236
169 unless ($path =~ /~$/) { 237 unless ($path =~ /~$/) {
170 # possibly enlarge 238 # possibly enlarge
171 if (0 > aio_stat "$stem.64x64.png") { 239 if (0 > aio_stat "$stem.64x64.png") {
172 my $other = "$stem.64x64.png~"; 240 my $other = "$stem.64x64.png~";
173 241
174 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 242 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175 my $wrap = 0; # for the time being
176 fork_sub { 243 fork_sub {
244 my $CROP;
245 my $SRC = "png:\Q$path\E";
246
247 my $is_floor = $arc->{is_floor};
248 my $is_wall = 0;
249
250 my ($wall_pfx, $wall_dir, $wall_sfx);
251
252 if (
253 !$is_floor
254 && !$arc->{alive}
255 && $arc->{move_block} eq "all"
256 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
257 ) {
258 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
259
260 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
261 $is_wall = 1;
262 }
263 }
264
265 if ($is_wall || $is_floor) {
266 # add a 4px border and add other images around it
267 $CROP = "-shave 8x8 +repage";
268
269 $w += 8;
270 $h += 8;
271
272 $SRC = "-size ${w}x${h} xc:transparent";
273 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
274
275 # 8 surrounding images
276 for (
277 # x y b r0 r1
278 [-1, -1, 0, 6],
279 [ 0, -1, 1, 10, 14],
280 [+1, -1, 0, 12],
281
282 [-1, 0, 8, 5, 7],
283 #
284 [+1, 0, 2, 5, 13],
285
286 [-1, +1, 0, 3],
287 [ 0, +1, 4, 10, 11],
288 [+1, +1, 0, 9],
289 ) {
290 my ($x, $y, $d, $r0, $r1) = @$_;
291
292 my $tile = $is_floor ? $path
293 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
294 : die;
295
296 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
297 "\Q$tile",
298 $x * ($w - 8) + 4,
299 $y * ($h - 8) + 4;
300 }
301 }
302
177 system "convert png:\Q$path\E -depth 8 rgba:-" 303 system "convert -depth 8 $SRC rgba:-"
178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 304 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
179 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 305 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
180 and die "convert/hq2xa pipeline error: status $? ($!)"; 306 and die "convert/cfhq2xa pipeline error: status $? ($!)";
181 system $OPTIPNG, "-i0", "-q", "$other~"; 307 system $OPTIPNG, "-i0", "-q", "$other~";
182 die "$other~ has zero size, aborting." unless -s "$other~"; 308 die "$other~ has zero size, aborting." unless -s "$other~";
183 rename "$other~", $other; 309 rename "$other~", $other;
184 }; 310 };
185 } 311 }
186 312
187 push @png, [$other, !$CACHE]; 313 push @c_png, [$other, !$CACHE];
188 } 314 }
189 315
190 # possibly scale down 316 # possibly scale down
191 if (0 > aio_stat "$stem.32x32.png") { 317 if (0 > aio_stat "$stem.32x32.png") {
192 my $other = "$stem.32x32.png~"; 318 my $other = "$stem.32x32.png~";
… …
195 fork_sub { 321 fork_sub {
196 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 322 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
197 system $OPTIPNG, "-i0", "-q", "$other~"; 323 system $OPTIPNG, "-i0", "-q", "$other~";
198 324
199 # reduce smoothfaces >10000 bytes 325 # reduce smoothfaces >10000 bytes
326 # obsolete, no longer required
200 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 327 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
201 my $ncolor = 256; 328 my $ncolor = 256;
202 while () { 329 while () {
203 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 330 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
204 system $OPTIPNG, "-i0", "-q", "$other~~"; 331 system $OPTIPNG, "-i0", "-q", "$other~~";
205 last if 10000 > -s "$other~~"; 332 last if 10000 > -s "$other~~";
… …
217 rename "$other~", $other; 344 rename "$other~", $other;
218 }; 345 };
219 } 346 }
220 347
221 #warn "scaled down $path to $other\n";#d# 348 #warn "scaled down $path to $other\n";#d#
222 push @png, [$other, !$CACHE]; 349 push @c_png, [$other, !$CACHE];
223 } 350 }
224 } 351 }
225 352
226 (my $face = $stem) =~ s/^.*\///; 353 (my $face = $stem) =~ s/^.*\///;
227 354
… …
288 aio_unlink $path if $delete; 415 aio_unlink $path if $delete;
289 } 416 }
290 } 417 }
291 418
292 sub process_arc { 419 sub process_arc {
293 while (@arc) { 420 while (my $job = $c_arc->get) {
294 my ($dir, $file) = @{pop @arc}; 421 my ($dir, $file) = @$job;
295 422
296 my $arc; 423 my $arc;
297 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 424 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
298 425
299 my $arc = read_arch "$dir/$file"; 426 my $arc = read_arch "$dir/$file";
… …
301 push @ARC, $o; 428 push @ARC, $o;
302 for (my $m = $o; $m; $m = $m->{more}) { 429 for (my $m = $o; $m; $m = $m->{more}) {
303 $ARC{$m->{_name}} = $m; 430 $ARC{$m->{_name}} = $m;
304 } 431 }
305 432
306 $o->{editor_folder} = $dir; 433 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
307 434
308 my $visibility = delete $o->{visibility}; 435 my $visibility = delete $o->{visibility};
309 my $magicmap = delete $o->{magicmap}; 436 my $magicmap = delete $o->{magicmap};
310 437
311 # find upper left corner :/ 438 # find upper left corner :/
… …
351 facings => $facings, 478 facings => $facings,
352 frames => \@frames, 479 frames => \@frames,
353 }; 480 };
354 } 481 }
355 482
356 for my $face ($o->{face} || (), @{$anim || []}) { 483 for ($o->{face} || (), @{$anim || []}) {
357 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 484 next if /^facings\s/;
358 485
486 my $face = $_;
487 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
488
359 my $info = $FACEINFO{$face} ||= {}; 489 my $info = $FACEINFO{$face} ||= { };
490 $info->{arc} = $o;
491
492 next if $face =~ /^blank.x11$|^empty.x11$/;
360 493
361 $info->{visibility} = $visibility if defined $visibility; 494 $info->{visibility} = $visibility if defined $visibility;
362 $info->{magicmap} = $magicmap if defined $magicmap; 495 $info->{magicmap} = $magicmap if defined $magicmap;
363 } 496 }
364 497
365 if (my $smooth = delete $o->{smoothface}) { 498 if (my $smooth = delete $o->{smoothface}) {
366 my %kv =split /\s+/, $smooth; 499 my %kv = split /\s+/, $smooth;
367 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 500 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
368 while (my ($face, $smooth) = each %kv) { 501 while (my ($face, $smooth) = each %kv) {
502 $FACEINFO{$smooth}{arc} = $o;
503
369 $FACEINFO{$face}{smooth} = $smooth; 504 $FACEINFO{$face}{smooth} = $smooth;
370 $FACEINFO{$face}{smoothlevel} = $level; 505 $FACEINFO{$face}{smoothlevel} = $level;
371 } 506 }
372 } 507 }
373 } 508 }
374 } 509 }
375 } 510 }
376 } 511 }
377 512
378 sub process_trs { 513 sub process_trs {
379 while (@trs) { 514 while (my $job = $c_trs->get) {
380 my ($dir, $file) = @{pop @trs}; 515 my ($dir, $file) = @$job;
381 my $path = "$dir/$file"; 516 my $path = "$dir/$file";
382 517
383 my $trs; 518 my $trs;
384 if (0 > aio_load $path, $trs) { 519 if (0 > aio_load $path, $trs) {
385 warn "$path: $!, skipping.\n"; 520 warn "$path: $!, skipping.\n";
… …
388 523
389 $TRS .= $trs; 524 $TRS .= $trs;
390 } 525 }
391 } 526 }
392 527
528 my %FILECACHE;
529
530 sub load_cached($;$) {
531 unless (exists $FILECACHE{$_[0]}) {
532 my $data;
533 if (0 < aio_load $_[0], $data) {
534 if ($_[1]) {
535 $data = eval { $_[1]->($data) };
536 warn "$_[0]: $@" if $@;
537 }
538 }
539
540 $FILECACHE{$_[0]} = $data;
541 }
542
543 $FILECACHE{$_[0]}
544 }
545
393 sub process_res { 546 sub process_res {
394 while (@res) { 547 while (my $job = $c_res->get) {
395 my ($dir, $file, $type) = @{pop @res}; 548 my ($dir, $file, $type) = @$job;
396 549
397 my $data; 550 my $data;
398 aio_load "$dir/$file", $data; 551 aio_load "$dir/$file", $data;
399 552
400 my $copyright; 553 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
401 aio_load "$dir/copyright", $copyright; 554
555 utf8::decode $dir;
556 utf8::decode $file;
557
558 # a meta file for resources is now mandatory
559 unless (exists $meta->{$file}) {
560 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
561 next;
562 }
563
564 $meta = {
565 %{ $meta->{"" } || {} },
566 %{ $meta->{$file} || {} },
567 };
568
569 if ($meta->{license} =~ s/^#//) {
570 $meta->{license} = ({
571 "pd" => "Public Domain",
572 "gpl" => "GNU General Public License, version 3.0 or any later",
573 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
574 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
575 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
576 })->{$meta->{license}}
577 || warn "$dir/$file: license tag '$meta->{license}' not found.";
578 }
402 579
403 $file =~ s/\.res$//; 580 $file =~ s/\.res$//;
404 $file =~ /\.([^.]+)$/ 581 $file =~ s/\.(ogg|wav|jpg|png)$//;
405 or next;
406 582
407 substr $dir, 0, 1 + length $PATH, ""; 583 substr $dir, 0, 1 + length $PATH, "";
408 584
585 if (my $filter = $meta->{cfutil_filter}) {
586 if ($filter eq "yaml2json") {
587 $data = JSON::XS::encode_json YAML::XS::Load $data;
588 } elsif ($filter eq "json2json") {
589 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
590 } elsif ($filter eq "perl2json") {
591 $data = eval $data; die if $@;
592 $data = JSON::XS::encode_json $data;
593 } else {
594 warn "$dir/$file: unknown filter $filter, skipping\n";
595 }
596 }
597
409 $RESOURCE{"$dir/$file"} = { 598 $RESOURCE{"$dir/$file"} = {
410 type => $type, 599 type => (exists $meta->{type} ? delete $meta->{type} : $type),
411 copyright => $copyright,
412 data => $data, 600 data => $data,
413 chksum => Digest::MD5::md5 $data, 601 %$meta ? (meta => $meta) : (),
414 }; 602 };
415 } 603 }
416 } 604 }
417 605
418 sub find_files; 606 sub find_files;
… …
422 IO::AIO::aioreq_pri 4; 610 IO::AIO::aioreq_pri 4;
423 IO::AIO::aio_scandir $path, 4, sub { 611 IO::AIO::aio_scandir $path, 4, sub {
424 my ($dirs, $nondirs) = @_; 612 my ($dirs, $nondirs) = @_;
425 613
426 find_files "$path/$_" 614 find_files "$path/$_"
427 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 615 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
428 616
429 my $dir = $path; 617 my $dir = $path;
430 substr $dir, 0, 1 + length $PATH, ""; 618 substr $dir, 0, 1 + length $PATH, "";
431 619
432 for my $file (@$nondirs) { 620 for my $file (@$nondirs) {
433 if ($dir =~ /^music(?:\/|$)/) { 621 if ($dir =~ /^music(?:\/|$)/) {
434 push @res, [$path, $file, 3] # FT_MUSIC 622 $c_res->put ([$path, $file, 3]) # FT_MUSIC
435 if $file =~ /\.(ogg)$/; 623 if $file =~ /\.(ogg)$/;
436 624
437 } elsif ($dir =~ /^sounds(?:\/|$)/) { 625 } elsif ($dir =~ /^sound(?:\/|$)/) {
438 push @res, [$path, $file, 5] # FT_SOUND 626 $c_res->put ([$path, $file, 5]) # FT_SOUND
439 if $file =~ /\.(wav|ogg)$/; 627 if $file =~ /\.(wav|ogg)$/;
440 628
441 } elsif ($dir =~ /^res(?:\/|$)/) { 629 } elsif ($dir =~ /^res(?:\/|$)/) {
442 push @res, [$path, $file, 0] # FT_FACE
443 if $file =~ /\.(jpg|png)$/; 630 if ($file =~ /\.(jpg|png)$/) {
444 push @res, [$path, $file, 7] # FT_RSRC 631 $c_res->put ([$path, $file, 0]) # FT_FACE
445 if $file =~ /\.(res)$/; 632 } elsif ($file =~ /\.(res)$/) {
633 $c_res->put ([$path, $file, 6]) # FT_RSRC
634 } else {
635 $c_res->put ([$path, $file, undef]);
636 }
446 637
447 } elsif ($file =~ /\.png$/) { 638 } elsif ($file =~ /\.png$/) {
448 push @png, ["$path/$file", 0]; 639 push @c_png, ["$path/$file", 0];
449 640
450 } elsif ($file =~ /\.trs$/) { 641 } elsif ($file =~ /\.trs$/) {
451 push @trs, [$path, $file]; 642 $c_trs->put ([$path, $file]);
452 643
453 } elsif ($file =~ /\.arc$/) { 644 } elsif ($file =~ /\.arc$/) {
454 push @arc, [$path, $file]; 645 $c_arc->put ([$path, $file]);
455 646
456 } else { 647 } else {
457 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 648 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
458 } 649 }
459 } 650 }
460 }; 651 };
652 }
653
654 sub generate_plurals {
655# use Lingua::EN::Inflect ();
656# Lingua::EN::Inflect::classical;
657# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
658# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
659#
660# for my $a (@ARC) {
661# my $name = $a->{name} || $a->{_name};
662#
663# next unless $a->{name_pl};
664# next if $a->{invisible};
665# next if $a->{is_floor};
666# next if $a->{no_pick};
667#
668# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
669# my $pl = $test =~ /^(?:eq|p:.)$/
670# ? $name
671# : Lingua::EN::Inflect::PL $name;
672#
673# if ($pl ne $a->{name_pl}) {
674# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
675# }
676# }
461 } 677 }
462 678
463 sub inst_arch($) { 679 sub inst_arch($) {
464 my (undef, $path) = @_; 680 my (undef, $path) = @_;
465 681
… …
478 if (!-d "$path/treasures") { 694 if (!-d "$path/treasures") {
479 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 695 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
480 exit 1 unless $FORCE; 696 exit 1 unless $FORCE;
481 } 697 }
482 698
699 print "scanning files...\n" if $VERBOSE;
700
483 find_files $path; 701 find_files $path;
702
703 my @a_arc = map +(async \&process_arc), 1..2;
704 my @a_res = map +(async \&process_res), 1..2;
705 my @a_trs = map +(async \&process_trs), 1..2;
706
484 IO::AIO::flush; 707 IO::AIO::flush;
485 708
486 $_->join for ( 709 $c_res->shutdown;
710 $c_arc->shutdown;
711 $c_trs->shutdown;
712
713 print "start file scan, arc, res processing...\n" if $VERBOSE;
714
715 $_->join for @a_arc; # need to parse all archetypes before png processing
716
717 print "end arc, start png processing...\n" if $VERBOSE;
718
487 # four png crunchers work fine for my 2x smp machine 719 # eight png crunchers work fine for my 4x smp machine
488 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 720 my @a_png = map +(async \&process_png), 1..8;
489 (async \&process_trs), (async \&process_trs),
490 (async \&process_arc), (async \&process_arc),
491 (async \&process_res), (async \&process_res),
492 );
493 721
722 $_->join for (@a_trs, @a_res, @a_png);
723
724 print "scanning done, processing results...\n" if $VERBOSE;
494 { 725 {
495 # remove path prefix from editor_folder 726 # remove path prefix from editor_folder
727 $_->{editor_folder} =~ /^\x00/
496 substr $_->{editor_folder}, 0, 1 + length $path, "" 728 and substr $_->{editor_folder}, 0, 2 + length $path, ""
497 for values %ARC; 729 for values %ARC;
498 730
731 print "resolving inheritance tree...\n" if $VERBOSE;
499 # resolve inherit 732 # resolve inherit
500 while () { 733 while () {
501 my $progress; 734 my $progress;
502 my $loop; 735 my $loop;
503 736
504 for my $o (values %ARC) { 737 for my $o (values %ARC) {
505 if (my $other = $o->{inherit}) { 738 for my $other (split /,/, $o->{inherit}) {
506 if (my $s = $ARC{$other}) { 739 if (my $s = $ARC{$other}) {
507 if ($s->{inherit}) { 740 if ($s->{inherit}) {
508 $loop = $s; 741 $loop = $s;
509 } else { 742 } else {
510 delete $o->{inherit}; 743 delete $o->{inherit};
… …
529 } 762 }
530 763
531 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 764 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
532 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 765 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
533 766
767 print "generating plurals...\n" if $VERBOSE;
768 generate_plurals;
769
770 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
534 open my $fh, ">:utf8", "$DATADIR/archetypes~" 771 open my $fh, ">:utf8", "$DATADIR/archetypes~"
535 or die "$DATADIR/archetypes~: $!"; 772 or die "$DATADIR/archetypes~: $!";
536 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 773 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
537 } 774 }
538 775
539 { 776 {
777 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
540 open my $fh, ">:utf8", "$DATADIR/treasures~" 778 open my $fh, ">:utf8", "$DATADIR/treasures~"
541 or die "$DATADIR/treasures~: $!"; 779 or die "$DATADIR/treasures~: $!";
542 print $fh $TRS; 780 print $fh $TRS;
543 } 781 }
544 782
545 { 783 {
784 print "processing facedata...\n" if $VERBOSE;
546 while (my ($k, $v) = each %FACEINFO) { 785 while (my ($k, $v) = each %FACEINFO) {
547 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 786 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
548 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 787 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
549 788
789 make_hash $k, $v->{data32}, $v->{hash32};
790 make_hash $k, $v->{data64}, $v->{hash64};
791
550 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 792 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
551 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 793 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
552
553 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
554 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
555 794
556 if (my $magicmap = $v->{magicmap}) { 795 if (my $magicmap = $v->{magicmap}) {
557 $magicmap =~ y/A-Z_\-/a-z/d; 796 $magicmap =~ y/A-Z_\-/a-z/d;
558 $v->{magicmap} = $COLOR{$magicmap}; 797 $v->{magicmap} = $COLOR{$magicmap};
559 } 798 }
799
800 delete $v->{arc};
801 }
802
803 print "processing resources...\n" if $VERBOSE;
804 my $enc = JSON::XS->new->utf8->canonical->relaxed;
805 while (my ($k, $v) = each %RESOURCE) {
806
807 if ($v->{type} & 1) {
808 # prepend meta info
809
810 my $meta = $enc->encode ({
811 name => $k,
812 %{ $v->{meta} || {} },
813 });
814
815 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
560 } 816 }
817
818 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
819 }
820
821 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
822 scalar keys %FACEINFO,
823 scalar keys %ANIMINFO,
824 scalar keys %RESOURCE
825 if $VERBOSE;
561 826
562 open my $fh, ">:perlio", "$DATADIR/facedata~" 827 open my $fh, ">:perlio", "$DATADIR/facedata~"
563 or die "$DATADIR/facedata~: $!"; 828 or die "$DATADIR/facedata~: $!";
564 829
565 print $fh freeze { 830 print $fh nfreeze {
566 version => 2, 831 version => 2,
567 faceinfo => \%FACEINFO, 832 faceinfo => \%FACEINFO,
568 animinfo => \%ANIMINFO, 833 animinfo => \%ANIMINFO,
569 resource => \%RESOURCE, 834 resource => \%RESOURCE,
570 }; 835 };
836
571 } 837 }
838
839 print "committing files...\n" if $VERBOSE;
572 840
573 for (qw(archetypes facedata treasures)) { 841 for (qw(archetypes facedata treasures)) {
574 chmod 0644, "$DATADIR/$_~"; 842 chmod 0644, "$DATADIR/$_~";
575 rename "$DATADIR/$_~", "$DATADIR/$_" 843 rename "$DATADIR/$_~", "$DATADIR/$_"
576 or die "$DATADIR/$_: $!"; 844 or die "$DATADIR/$_: $!";

Diff Legend

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