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

Diff Legend

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