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.53 by root, Sun Aug 19 09:27:08 2007 UTC vs.
Revision 1.107 by root, Wed Oct 20 06:36:48 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 Coro::Util; 52use Coro::Util;
25use POSIX ();
26use Digest::MD5;
27use Carp;
28use Coro::Channel; 53use Coro::Channel;
29use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
30 57
31$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
32 59
33sub usage { 60sub usage {
34 warn <<EOF; 61 warn <<EOF;
… …
47my $VERBOSE = 1; 74my $VERBOSE = 1;
48my $CACHE = 0; 75my $CACHE = 0;
49my $FORCE; 76my $FORCE;
50my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
51my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
52 80
53our %COLOR = ( 81our %COLOR = (
82 # original cf colours
54 black => 0, 83 black => 0,
55 white => 1, 84 white => 1,
56 navy => 2, 85 navy => 2, # "dark blue"
57 red => 3, 86 red => 3,
58 orange => 4, 87 orange => 4,
59 blue => 5, 88 blue => 5, # "light blue"
60 darkorange => 6, 89 darkorange => 6,
61 green => 7, 90 green => 7,
62 lightgreen => 8, 91 lightgreen => 8,
63 grey => 9, 92 grey => 9,
93 brown => 10, # "yellow"
94 gold => 11, # "light yellow"
95 tan => 12, # yellowish gray
96
97 # new for deliantra
64 brown => 10, 98 none => 13,
99
100 # compatibility to existing archetypes
101 lightblue => 5,
65 gold => 11, 102 gray => 9,
103 yellow => 11,
66 tan => 12, 104 khaki => 12,
67); 105);
68 106
69END { system "rm", "-rf", $TMPDIR } 107END { system "rm", "-rf", $TMPDIR }
70 108
71Event->signal (signal => "INT", cb => sub { exit 1 }); 109my $s_INT = EV::signal INT => sub { exit 1 };
72Event->signal (signal => "TERM", cb => sub { exit 1 }); 110my $s_TERM = EV::signal TERM => sub { exit 1 };
111
112our %hash;
113
114# here we could try to avoid collisions and reduce chksum size further
115sub make_hash($\$\$;$) {
116 my ($id, $dataref, $hashref, $clen) = @_;
117
118 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
119
120 if (exists $hash{$hash}) {
121 # hash collision, but some files are simply identical
122 if (${$hash{$hash}[1]} ne $$dataref) {
123 warn "hash collision $hash{$hash}[0] vs. $id\n";
124 exit 1;
125 } else {
126 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
127 }
128 }
129 $hash{$hash} = [$id, $dataref, $hashref];
130
131 $$hashref = $hash;
132}
73 133
74mkdir $TMPDIR, 0700 134mkdir $TMPDIR, 0700
75 or die "$TMPDIR: $!"; 135 or die "$TMPDIR: $!";
76 136
77sub fork_sub(&) { 137sub fork_sub(&) {
… …
97 if (!-f "$path/regions") { 157 if (!-f "$path/regions") {
98 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 158 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
99 exit 1 unless $FORCE; 159 exit 1 unless $FORCE;
100 } 160 }
101 161
102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 162 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
163 "$path/.", "$DATADIR/maps/.",
164 "--exclude", "CVS", "--exclude", "/world-precomposed",
165 "--delete", "--delete-excluded"
103 and die "map installation failed.\n"; 166 and die "map installation failed.\n";
104 167
105 print "maps installed successfully.\n"; 168 print "maps installed successfully.\n";
106} 169}
107 170
… …
116 our $PATH; 179 our $PATH;
117 180
118 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 181 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
119 182
120 our $c_arc = new Coro::Channel; 183 our $c_arc = new Coro::Channel;
121 our $c_trs = new Coro::Channel; 184 our $c_any = new Coro::Channel;
122 our $c_res = new Coro::Channel;
123 185
124 our @c_png; 186 our @c_png;
125 187
126 sub commit_png($$$) { 188 sub commit_png($$$$) {
127 my ($name, $data, $T) = @_; 189 my ($stem, $name, $data, $T) = @_;
128 190
191 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
129 $FACEINFO{$name}{"data$T"} = $data; 192 $FACEINFO{$name}{"data$T"} = $data;
130 } 193 }
131 194
132 sub process_png { 195 sub process_png {
133 while (@c_png) { 196 while (@c_png) {
… …
170 if ($w % $T || $h % $T) { 233 if ($w % $T || $h % $T) {
171 warn "$path: weird png size ($w $h), skipping.\n"; 234 warn "$path: weird png size ($w $h), skipping.\n";
172 next; 235 next;
173 } 236 }
174 237
238 (my $base = $stem) =~ s/^.*\///;
239
240 my $fi = $FACEINFO{$base};
241 unless ($fi) {
242 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
243 #next;
244 }
245
246 my $arc = $fi->{arc} || { };
247
175 unless ($path =~ /~$/) { 248 unless ($path =~ /~$/) {
176 # possibly enlarge 249 # possibly enlarge
177 if (0 > aio_stat "$stem.64x64.png") { 250 if (0 > aio_stat "$stem.64x64.png") {
178 my $other = "$stem.64x64.png~"; 251 my $other = "$stem.64x64.png~";
179 252
180 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 253 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
181 fork_sub { 254 fork_sub {
182 my $CROP; 255 my $CROP;
183 my $SRC = "png:\Q$path\E"; 256 my $SRC = "png:\Q$path\E";
184 257
185 # check if this is a wall. ultra-ugly. ultra-ultra-ugly. 258 my $is_floor = $arc->{is_floor};
259 my $is_wall = 0;
260
261 my ($wall_pfx, $wall_dir, $wall_sfx);
262
263 if (
264 !$is_floor
265 && !$arc->{alive}
266 && $arc->{move_block} eq "all"
186 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { 267 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
268 ) {
187 my ($pfx, $dir, $sfx) = ($1, hex $2, $3); 269 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
188 #check for 0..F images to be sure(?) this is a wall 270
189 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { 271 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
272 $is_wall = 1;
273 }
274 }
275
276 if ($is_wall || $is_floor) {
190 # add a 4px border and add other images around it 277 # add a 4px border and add other images around it
191 $CROP = "-shave 8x8 +repage"; 278 $CROP = "-shave 8x8 +repage";
192 279
193 $w += 8; 280 $w += 8;
194 $h += 8; 281 $h += 8;
195 282
196 $SRC = "-size ${w}x${h} xc:transparent"; 283 $SRC = "-size ${w}x${h} xc:transparent";
197 $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; 284 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
198 285
199 # 8 surrounding images 286 # 8 surrounding images
200 for ( 287 for (
201 # x y b r0 r1 288 # x y b r0 r1
202 [-1, -1, 0, 6], 289 [-1, -1, 0, 6],
203 [ 0, -1, 1, 10, 14], 290 [ 0, -1, 1, 10, 14],
204 [+1, -1, 0, 12], 291 [+1, -1, 0, 12],
205 292
206 [-1, 0, 8, 5, 7], 293 [-1, 0, 8, 5, 7],
207 # 294 #
208 [+1, 0, 2, 5, 13], 295 [+1, 0, 2, 5, 13],
209 296
210 [-1, +1, 0, 3], 297 [-1, +1, 0, 3],
211 [ 0, +1, 4, 10, 11], 298 [ 0, +1, 4, 10, 11],
212 [+1, +1, 0, 9], 299 [+1, +1, 0, 9],
213 ) { 300 ) {
214 my ($x, $y, $d, $r0, $r1) = @$_; 301 my ($x, $y, $d, $r0, $r1) = @$_;
302
303 my $tile = $is_floor ? $path
304 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
305 : die;
306
215 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", 307 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
216 "\Q$pfx", 308 "\Q$tile",
217 ($dir & $d) ? $r1 : $r0,
218 "\Q$sfx",
219 $x * ($w - 8) + 4, 309 $x * ($w - 8) + 4,
220 $y * ($h - 8) + 4; 310 $y * ($h - 8) + 4;
221 }
222 } 311 }
223 } 312 }
224 313
225 system "convert -depth 8 $SRC rgba:-" 314 system "convert -depth 8 $SRC rgba:-"
226 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 315 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
… …
243 fork_sub { 332 fork_sub {
244 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 333 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
245 system $OPTIPNG, "-i0", "-q", "$other~"; 334 system $OPTIPNG, "-i0", "-q", "$other~";
246 335
247 # reduce smoothfaces >10000 bytes 336 # reduce smoothfaces >10000 bytes
337 # obsolete, no longer required
248 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 338 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
249 my $ncolor = 256; 339 my $ncolor = 256;
250 while () { 340 while () {
251 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 341 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
252 system $OPTIPNG, "-i0", "-q", "$other~~"; 342 system $OPTIPNG, "-i0", "-q", "$other~~";
253 last if 10000 > -s "$other~~"; 343 last if 10000 > -s "$other~~";
… …
324 414
325 if (0 > aio_load $file, $tile) { 415 if (0 > aio_load $file, $tile) {
326 die "$path: unable to read tile +$x+$y, aborting.\n"; 416 die "$path: unable to read tile +$x+$y, aborting.\n";
327 } 417 }
328 IO::AIO::aio_unlink $file unless $CACHE; 418 IO::AIO::aio_unlink $file unless $CACHE;
329 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 419 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
330 } 420 }
331 } else { 421 } else {
332 # use as-is (either small, use smooth) 422 # use as-is (either small, use smooth)
333 commit_png $face, $png, $T; 423 commit_png $stem, $face, $png, $T;
334 } 424 }
335 425
336 aio_unlink $path if $delete; 426 aio_unlink $path if $delete;
337 } 427 }
338 } 428 }
339 429
430 sub process_faceinfo {
431 my ($dir, $file) = @_;
432 my $path = "$dir/$file";
433
434 my $data;
435 if (0 > aio_load $path, $data) {
436 warn "$path: $!, skipping.\n";
437 return;
438 }
439
440 for (split /\n/, $data) {
441 chomp;
442 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/;
443 # bg not used except for text clients
444
445 utf8::decode $glyph;
446 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
447
448 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
449
450 (my $fgi = $COLOR{$fg})
451 // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n";
452 (my $bgi = $COLOR{$bg})
453 // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n";
454
455 my $fi = $FACEINFO{$face} ||= { };
456 $fi->{visibility} = $visibility * 1;
457 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
458
459 $glyph .= " " if 2 > length $glyph; # TODO kanji
460 die "glyph $face too long" if 2 < length $glyph;
461
462 $fi->{glyph} = "";
463 for (split //, $glyph) {
464 utf8::encode $_;
465 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
466 }
467 }
468 }
469
340 sub process_arc { 470 sub process_arc {
341 while (my $job = $c_arc->get) { 471 while (my ($dir, $file) = @{ $c_arc->get }) {
342 my ($dir, $file) = @$job;
343
344 my $arc; 472 my $arc;
345 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 473 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
346 474
347 my $arc = read_arch "$dir/$file"; 475 my $arc = read_arch "$dir/$file";
348 for my $o (values %$arc) { 476 for my $o (values %$arc) {
349 push @ARC, $o; 477 push @ARC, $o;
350 for (my $m = $o; $m; $m = $m->{more}) { 478 for (my $m = $o; $m; $m = $m->{more}) {
351 $ARC{$m->{_name}} = $m; 479 $ARC{$m->{_name}} = $m;
352 } 480 }
353 481
354 $o->{editor_folder} = $dir; 482 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
355
356 my $visibility = delete $o->{visibility};
357 my $magicmap = delete $o->{magicmap};
358 483
359 # find upper left corner :/ 484 # find upper left corner :/
360 # omg, this is sooo broken 485 # omg, this is sooo broken
361 my ($dx, $dy); 486 my ($dx, $dy);
362 for (my $o = $o; $o; $o = $o->{more}) { 487 for (my $o = $o; $o; $o = $o->{more}) {
… …
369 my $y = $o->{y} - $dy; 494 my $y = $o->{y} - $dy;
370 495
371 my $ext = $x|$y ? "+$x+$y" : ""; 496 my $ext = $x|$y ? "+$x+$y" : "";
372 497
373 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
374
375 $visibility = delete $o->{visibility} if exists $o->{visibility};
376 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
377 499
378 my $anim = delete $o->{anim}; 500 my $anim = delete $o->{anim};
379 501
380 if ($anim) { 502 if ($anim) {
381 # possibly add $ext to the animation name to avoid 503 # possibly add $ext to the animation name to avoid
… …
399 facings => $facings, 521 facings => $facings,
400 frames => \@frames, 522 frames => \@frames,
401 }; 523 };
402 } 524 }
403 525
404 for my $face ($o->{face} || (), @{$anim || []}) { 526 for ($o->{face} || (), @{$anim || []}) {
405 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 527 next if /^facings\s/;
406 528
529 my $face = $_;
530 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
531
407 my $info = $FACEINFO{$face} ||= {}; 532 my $info = $FACEINFO{$face} ||= { };
408
409 $info->{arc} = $o; 533 $info->{arc} = $o;
410 $info->{visibility} = $visibility if defined $visibility; 534
411 $info->{magicmap} = $magicmap if defined $magicmap; 535 next if $face =~ /^blank.x11$|^empty.x11$/;
412 } 536 }
413 537
414 if (my $smooth = delete $o->{smoothface}) { 538 if (my $smooth = delete $o->{smoothface}) {
415 my %kv =split /\s+/, $smooth; 539 my %kv = split /\s+/, $smooth;
416 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 540 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
417 while (my ($face, $smooth) = each %kv) { 541 while (my ($face, $smooth) = each %kv) {
542 $FACEINFO{$smooth}{arc} = $o;
543
418 $FACEINFO{$face}{smooth} = $smooth; 544 $FACEINFO{$face}{smooth} = $smooth;
419 $FACEINFO{$face}{smoothlevel} = $level; 545 $FACEINFO{$face}{smoothlevel} = $level;
420 } 546 }
421 } 547 }
422 } 548 }
423 } 549 }
424 } 550 }
425 } 551 }
426 552
427 sub process_trs { 553 sub process_trs {
428 while (my $job = $c_trs->get) {
429 my ($dir, $file) = @$job; 554 my ($dir, $file) = @_;
430 my $path = "$dir/$file"; 555 my $path = "$dir/$file";
431 556
432 my $trs; 557 my $trs;
433 if (0 > aio_load $path, $trs) { 558 if (0 > aio_load $path, $trs) {
434 warn "$path: $!, skipping.\n"; 559 warn "$path: $!, skipping.\n";
435 next; 560 return;
436 } 561 }
437 562
438 $TRS .= $trs; 563 $TRS .= $trs;
439 }
440 } 564 }
441 565
442 my %FILECACHE; 566 my %FILECACHE;
443 567
444 sub load_cached($;$) { 568 sub load_cached($;$) {
… …
456 580
457 $FILECACHE{$_[0]} 581 $FILECACHE{$_[0]}
458 } 582 }
459 583
460 sub process_res { 584 sub process_res {
461 while (my $job = $c_res->get) {
462 my ($dir, $file, $type) = @$job; 585 my ($dir, $file, $type) = @_;
463 586
464 my $data; 587 my $data;
465 aio_load "$dir/$file", $data; 588 aio_load "$dir/$file", $data;
466 589
467 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 590 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
468 591
469 next if $meta && !exists $meta->{$file}; 592 utf8::decode $dir;
593 utf8::decode $file;
470 594
595 # a meta file for resources is now mandatory
596 unless (exists $meta->{$file}) {
597 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
598 return;
599 }
600
471 $meta = { 601 $meta = {
472 %{ $meta->{"" } || {} }, 602 %{ $meta->{"" } || {} },
473 %{ $meta->{$file} || {} }, 603 %{ $meta->{$file} || {} },
474 }; 604 };
475 605
476 if ($meta->{license} =~ s/^#//) { 606 if ($meta->{license} =~ s/^#//) {
477 $meta->{license} = ({ 607 $meta->{license} = ({
478 "pd" => "Public Domain", 608 "pd" => "Public Domain",
479 "gpl" => "GNU General Public License, version 3.0 or any later", 609 "gpl" => "GNU General Public License, version 3.0 or any later",
480 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 610 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
611 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
481 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 612 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
482 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 613 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
483 })->{$meta->{license}} 614 })->{$meta->{license}}
484 || warn "$dir/$file: license tag '$meta->{license}' not found."; 615 || warn "$dir/$file: license tag '$meta->{license}' not found.";
485 } 616 }
486 617
618 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
619 ($meta->{author} = $1) =~ s/_/ /g;
620 }
621
487 $file =~ s/\.res$//; 622 $file =~ s/\.res$//;
488 $file =~ s/\.(ogg|wav|jpg|png)$//; 623 $file =~ s/\.(ogg|wav|jpg|png)$//;
489 624
490 substr $dir, 0, 1 + length $PATH, ""; 625 substr $dir, 0, 1 + length $PATH, "";
491 626
627 if (my $filter = $meta->{cfutil_filter}) {
628 if ($filter eq "yaml2json") {
629 $data = JSON::XS::encode_json YAML::XS::Load $data;
630 } elsif ($filter eq "json2json") {
631 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
632 } elsif ($filter eq "perl2json") {
633 $data = eval $data; die if $@;
634 $data = JSON::XS::encode_json $data;
635 } else {
636 warn "$dir/$file: unknown filter $filter, skipping\n";
637 }
638 }
639
492 $RESOURCE{"$dir/$file"} = { 640 $RESOURCE{"$dir/$file"} = {
493 type => (delete $meta->{type}) || $type, 641 type => (exists $meta->{type} ? delete $meta->{type} : $type),
494 data => $data, 642 data => $data,
495 chksum => (Digest::MD5::md5 $data),
496 %$meta ? (meta => $meta) : (), 643 %$meta ? (meta => $meta) : (),
497 }; 644 };
645 }
646
647 sub process_any {
648 while (my ($func, @args) = @{ $c_any->get }) {
649 $func->(@args);
498 } 650 }
499 } 651 }
500 652
501 sub find_files; 653 sub find_files;
502 sub find_files { 654 sub find_files {
503 my ($path) = @_; 655 my ($path) = @_;
504 656
657 my $grp = IO::AIO::aio_group;
658
659 my $scandir; $scandir = sub {
660 my ($path) = @_;
661
505 IO::AIO::aioreq_pri 4; 662 IO::AIO::aioreq_pri 4;
506 IO::AIO::aio_scandir $path, 4, sub { 663 add $grp IO::AIO::aio_scandir $path, 4, sub {
507 my ($dirs, $nondirs) = @_; 664 my ($dirs, $nondirs) = @_;
508 665
509 find_files "$path/$_" 666 $scandir->("$path/$_")
510 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 667 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
511 668
512 my $dir = $path; 669 my $dir = $path;
513 substr $dir, 0, 1 + length $PATH, ""; 670 substr $dir, 0, 1 + length $PATH, "";
514 671
515 for my $file (@$nondirs) { 672 for my $file (@$nondirs) {
516 if ($dir =~ /^music(?:\/|$)/) { 673 if ($dir =~ /^music(?:\/|$)/) {
517 $c_res->put ([$path, $file, 3]) # FT_MUSIC 674 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
518 if $file =~ /\.(ogg)$/; 675 if $file =~ /\.(ogg)$/;
519 676
520 } elsif ($dir =~ /^sound(?:\/|$)/) { 677 } elsif ($dir =~ /^sound(?:\/|$)/) {
521 $c_res->put ([$path, $file, 5]) # FT_SOUND 678 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
522 if $file =~ /\.(wav|ogg)$/; 679 if $file =~ /\.(wav|ogg)$/;
523 680
524 } elsif ($dir =~ /^res(?:\/|$)/) { 681 } elsif ($dir =~ /^res(?:\/|$)/) {
525 $c_res->put ([$path, $file, 0]) # FT_FACE
526 if $file =~ /\.(jpg|png)$/; 682 if ($file =~ /\.(jpg|png)$/) {
527 $c_res->put ([$path, $file, 7]) # FT_RSRC 683 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
528 if $file =~ /\.(res)$/; 684 } elsif ($file =~ /\.(res)$/) {
685 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
686 } else {
687 $c_any->put ([\&process_res, $path, $file, undef]);
688 }
529 689
530 } elsif ($file =~ /\.png$/) { 690 } elsif ($file =~ /\.png$/) {
531 push @c_png, ["$path/$file", 0]; 691 push @c_png, ["$path/$file", 0];
532 692
693 } elsif ($file =~ /\.faceinfo$/) {
694 $c_any->put ([\&process_faceinfo, $path, $file]);
695
533 } elsif ($file =~ /\.trs$/) { 696 } elsif ($file =~ /\.trs$/) {
534 $c_trs->put ([$path, $file]); 697 $c_any->put ([\&process_trs, $path, $file]);
535 698
536 } elsif ($file =~ /\.arc$/) { 699 } elsif ($file =~ /\.arc$/) {
537 $c_arc->put ([$path, $file]); 700 $c_arc->put ([$path, $file]);
538 701
539 } else { 702 } else {
540 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 703 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
541 } 704 }
705 }
542 } 706 };
543 }; 707 };
708
709 $scandir->($path);
710 aio_wait $grp;
711 }
712
713 sub generate_plurals {
714# use Lingua::EN::Inflect ();
715# Lingua::EN::Inflect::classical;
716# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
717# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
718#
719# for my $a (@ARC) {
720# my $name = $a->{name} || $a->{_name};
721#
722# next unless $a->{name_pl};
723# next if $a->{invisible};
724# next if $a->{is_floor};
725# next if $a->{no_pick};
726#
727# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
728# my $pl = $test =~ /^(?:eq|p:.)$/
729# ? $name
730# : Lingua::EN::Inflect::PL $name;
731#
732# if ($pl ne $a->{name_pl}) {
733# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
734# }
735# }
544 } 736 }
545 737
546 sub inst_arch($) { 738 sub inst_arch($) {
547 my (undef, $path) = @_; 739 my (undef, $path) = @_;
548 740
… …
561 if (!-d "$path/treasures") { 753 if (!-d "$path/treasures") {
562 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 754 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
563 exit 1 unless $FORCE; 755 exit 1 unless $FORCE;
564 } 756 }
565 757
566 print "scanning files...\n" if $VERBOSE; 758 print "start file scan, arc, any processing...\n" if $VERBOSE;
759
760 my @a_arc = map +(async \&process_arc), 1..2;
761 my @a_any = map +(async \&process_any), 1..4;
567 762
568 find_files $path; 763 find_files $path;
569 764
570 my @a_arc = map +(async \&process_arc), 1..2; 765 $c_arc->shutdown;
571 my @a_res = map +(async \&process_res), 1..2; 766 $c_any->shutdown;
572 my @a_trs = map +(async \&process_trs), 1..2;
573
574 IO::AIO::flush;
575
576 $c_res->put (undef) for @a_res;
577 $c_arc->put (undef) for @a_arc;
578 $c_trs->put (undef) for @a_trs;
579
580 print "start file scan, arc, res processing...\n" if $VERBOSE;
581 767
582 $_->join for @a_arc; # need to parse all archetypes before png processing 768 $_->join for @a_arc; # need to parse all archetypes before png processing
583 769
584 print "end arc, start png processing...\n" if $VERBOSE; 770 print "end arc, start png processing...\n" if $VERBOSE;
585 771
586 # four png crunchers work fine for my 2x smp machine 772 # eight png crunchers work fine for my 4x smp machine
587 my @a_png = map +(async \&process_png), 1..4; 773 my @a_png = map +(async \&process_png), 1..8;
588 774
589 $_->join for (@a_trs, @a_res, @a_png); 775 print "end any processing...\n" if $VERBOSE;
776 $_->join for @a_any;
777
778 print "end png processing...\n" if $VERBOSE;
779 $_->join for @a_png;
590 780
591 print "scanning done, processing results...\n" if $VERBOSE; 781 print "scanning done, processing results...\n" if $VERBOSE;
592 { 782 {
593 # remove path prefix from editor_folder 783 # remove path prefix from editor_folder
784 $_->{editor_folder} =~ /^\x00/
594 substr $_->{editor_folder}, 0, 1 + length $path, "" 785 and substr $_->{editor_folder}, 0, 2 + length $path, ""
595 for values %ARC; 786 for values %ARC;
596 787
597 print "resolving inheritance tree...\n" if $VERBOSE; 788 print "resolving inheritance tree...\n" if $VERBOSE;
598 # resolve inherit 789 # resolve inherit
599 while () { 790 while () {
600 my $progress; 791 my $progress;
601 my $loop; 792 my $loop;
602 793
603 for my $o (values %ARC) { 794 for my $o (values %ARC) {
604 if (my $other = $o->{inherit}) { 795 for my $other (split /,/, $o->{inherit}) {
605 if (my $s = $ARC{$other}) { 796 if (my $s = $ARC{$other}) {
606 if ($s->{inherit}) { 797 if ($s->{inherit}) {
607 $loop = $s; 798 $loop = $s;
608 } else { 799 } else {
609 delete $o->{inherit}; 800 delete $o->{inherit};
… …
611 delete @s{qw(_name more name name_pl)}; 802 delete @s{qw(_name more name name_pl)};
612 %$o = ( %s, %$o ); 803 %$o = ( %s, %$o );
613 ++$progress; 804 ++$progress;
614 } 805 }
615 } else { 806 } else {
616 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 807 warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
617 delete $ARC{$o->{_name}}; 808 delete $ARC{$o->{_name}};
618 } 809 }
619 } 810 }
620 } 811 }
621 812
… …
628 } 819 }
629 820
630 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 821 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
631 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 822 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
632 823
824 # fix up archetypes without names, where the archanme doesn't work at all
825 for (@ARC) {
826 if (!exists $_->{name} and $_->{_name} =~ /_/) {
827 for ($_->{name} = $_->{_name}) {
828 s/(?:_\d+)+$//;
829 s/_[nesw]+$//;
830 y/_/ /;
831 }
832 }
833 }
834
835 #print "generating plurals...\n" if $VERBOSE;
836 #generate_plurals;
837
633 print "writing archetypes...\n" if $VERBOSE; 838 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
634 open my $fh, ">:utf8", "$DATADIR/archetypes~" 839 open my $fh, ">:utf8", "$DATADIR/archetypes~"
635 or die "$DATADIR/archetypes~: $!"; 840 or die "$DATADIR/archetypes~: $!";
636 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 841 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
637 } 842 }
638 843
639 { 844 {
640 print "writing treasures...\n" if $VERBOSE; 845 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
641 open my $fh, ">:utf8", "$DATADIR/treasures~" 846 open my $fh, ">:utf8", "$DATADIR/treasures~"
642 or die "$DATADIR/treasures~: $!"; 847 or die "$DATADIR/treasures~: $!";
643 print $fh $TRS; 848 print $fh $TRS;
644 } 849 }
645 850
646 { 851 {
647 print "processing facedata...\n" if $VERBOSE; 852 print "processing facedata...\n" if $VERBOSE;
648 while (my ($k, $v) = each %FACEINFO) { 853 while (my ($k, $v) = each %FACEINFO) {
649 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 854 length $v->{data32} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n";
650 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 855 length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\n";
651 856
857 make_hash $k, $v->{data32}, $v->{hash32};
858 make_hash $k, $v->{data64}, $v->{hash64};
859
652 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 860 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
653 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 861 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
654 862
655 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 863 $v->{glyph} // warn "WARNING: face '$k' has glyph.";
656 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 864 $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n";
865 $v->{magicmap} // warn "WARNING: face '$k' has foreground colour.";
657 866
658 if (my $magicmap = $v->{magicmap}) { 867 delete @$v{qw(arc stem)}; # not used by the server
659 $magicmap =~ y/A-Z_\-/a-z/d; 868 }
660 $v->{magicmap} = $COLOR{$magicmap}; 869
870 print "processing resources...\n" if $VERBOSE;
871 my $enc = JSON::XS->new->utf8->canonical->relaxed;
872 while (my ($k, $v) = each %RESOURCE) {
873
874 if ($v->{meta} && $v->{meta}{datadir}) {
875 delete $RESOURCE{$k};
876
877 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
878
879 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
880 open my $fh, ">:raw", "$DATADIR/$k~"
881 or die "$DATADIR/$k~: $!";
882 syswrite $fh, $v->{data};
883 push @COMMIT, $k;
884
885 } else {
886 if ($v->{type} & 1) {
887 # prepend meta info
888
889 my $meta = $enc->encode ({
890 name => $k,
891 %{ $v->{meta} || {} },
892 });
893
894 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
661 } 895 }
662 896
663 delete $v->{arc}; 897 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
664 } 898 }
899 }
665 900
666 print "writing facedata...\n" if $VERBOSE; 901 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
902 scalar keys %FACEINFO,
903 scalar keys %ANIMINFO,
904 scalar keys %RESOURCE
905 if $VERBOSE;
906
667 open my $fh, ">:perlio", "$DATADIR/facedata~" 907 open my $fh, ">:perlio", "$DATADIR/facedata~"
668 or die "$DATADIR/facedata~: $!"; 908 or die "$DATADIR/facedata~: $!";
669 909
670 print $fh freeze { 910 print $fh nfreeze {
671 version => 2, 911 version => 2,
672 faceinfo => \%FACEINFO, 912 faceinfo => \%FACEINFO,
673 animinfo => \%ANIMINFO, 913 animinfo => \%ANIMINFO,
674 resource => \%RESOURCE, 914 resource => \%RESOURCE,
675 }; 915 };
916
676 } 917 }
677 918
678 print "committing files...\n" if $VERBOSE; 919 print "committing files...\n" if $VERBOSE;
679 920
680 for (qw(archetypes facedata treasures)) { 921 for (qw(archetypes facedata treasures), @COMMIT) {
681 chmod 0644, "$DATADIR/$_~"; 922 chmod 0644, "$DATADIR/$_~";
682 rename "$DATADIR/$_~", "$DATADIR/$_" 923 rename "$DATADIR/$_~", "$DATADIR/$_"
683 or die "$DATADIR/$_: $!"; 924 or die "$DATADIR/$_: $!";
684 } 925 }
685 926

Diff Legend

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