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

Diff Legend

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