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.96 by root, Wed Oct 6 00:28:15 2010 UTC

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

Diff Legend

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