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

Diff Legend

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