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

Diff Legend

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