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.52 by root, Sat Aug 18 22:25:35 2007 UTC vs.
Revision 1.81 by root, Sat Apr 3 03:13:48 2010 UTC

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

Diff Legend

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