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

Diff Legend

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