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

Diff Legend

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