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.79 by root, Sun Nov 15 18:04:00 2009 UTC vs.
Revision 1.119 by root, Wed Jan 4 02:48:57 2012 UTC

1#!@PERL@ 1#!@PERL@
2 2
3# 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG. 4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5# 5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 6# Copyright (©) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7# 7#
8# Deliantra is free software: you can redistribute it and/or modify it under 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 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 10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version. 11# option) any later version.
20# <http://www.gnu.org/licenses/>. 20# <http://www.gnu.org/licenses/>.
21# 21#
22# The authors can be reached via e-mail to <support@deliantra.net> 22# The authors can be reached via e-mail to <support@deliantra.net>
23# 23#
24 24
25use strict; 25use common::sense;
26 26
27my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
28my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
29my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
30my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
31 31
32my $CONVERT = "@CONVERT@"; 32my $CONVERT = "@CONVERT@";
33#my $IDENTIFY = "@IDENTIFY@"; 33my $IDENTIFY = "@IDENTIFY@";
34my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
35my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
36my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
37 37
38use Getopt::Long; 38use Getopt::Long;
39use File::Temp; 39use File::Temp;
40use POSIX (); 40use POSIX ();
41use Carp; 41use Carp;
42 42
43use Coro::EV;
44use AnyEvent;
45use YAML::XS (); 43use YAML::XS ();
44use Digest::MD5 ();
45use Storable ();
46use JSON::XS (); 46use JSON::XS ();
47use IO::AIO (); 47use IO::AIO ();
48use Digest::MD5 (); 48use Compress::LZF ();
49 49
50use AnyEvent;
50use Coro 5.12; 51use Coro 5.12;
52use Coro::EV;
51use Coro::AIO; 53use Coro::AIO;
52use Coro::Util; 54use Coro::Util;
53use Coro::Channel; 55use Coro::Channel;
56use Coro::AnyEvent;
54use Coro::Storable; $Storable::canonical = 1; 57use Coro::Storable; $Storable::canonical = 1;
55 58
56use Deliantra; 59use Deliantra;
57 60
58$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 61$SIG{QUIT} = sub { Carp::cluck "QUIT" };
74my $VERBOSE = 1; 77my $VERBOSE = 1;
75my $CACHE = 0; 78my $CACHE = 0;
76my $FORCE; 79my $FORCE;
77my $TMPDIR = "/tmp/cfutil$$~"; 80my $TMPDIR = "/tmp/cfutil$$~";
78my $TMPFILE = "aaaa0"; 81my $TMPFILE = "aaaa0";
82my @COMMIT;
79 83
80our %COLOR = ( 84our %COLOR = (
85 # original cf colours
81 black => 0, 86 black => 0,
82 white => 1, 87 white => 1,
83 navy => 2, 88 navy => 2, # "dark blue"
84 red => 3, 89 red => 3,
85 orange => 4, 90 orange => 4,
86 blue => 5, 91 blue => 5, # "light blue"
87 darkorange => 6, 92 darkorange => 6,
88 green => 7, 93 green => 7,
89 lightgreen => 8, 94 lightgreen => 8,
90 grey => 9, 95 grey => 9,
96 brown => 10, # "yellow"
97 gold => 11, # "light yellow"
98 tan => 12, # yellowish gray
99
100 # new for deliantra
91 brown => 10, 101 none => 13,
102
103 # compatibility to existing archetypes
104 lightblue => 5,
92 gold => 11, 105 gray => 9,
106 yellow => 11,
93 tan => 12, 107 khaki => 12,
94); 108);
95 109
96END { system "rm", "-rf", $TMPDIR } 110END { system "rm", "-rf", $TMPDIR }
97 111
98my $s_INT = EV::signal INT => sub { exit 1 }; 112my $s_INT = AE::signal INT => sub { exit 1 };
99my $s_TERM = EV::signal TERM => sub { exit 1 }; 113my $s_TERM = AE::signal TERM => sub { exit 1 };
100 114
101our %hash; 115our %hash;
102 116
103# here we could try to avoid collisions and reduce chksum size further 117# here we could try to avoid collisions and reduce chksum size further
104sub make_hash($\$\$;$) { 118sub make_hash($\$\$;$) {
105 my ($id, $dataref, $hashref, $clen) = @_; 119 my ($id, $dataref, $hashref, $clen) = @_;
106 120
107 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; 121 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 5;
108 122
109 if (exists $hash{$hash}) { 123 if (exists $hash{$hash}) {
110 # hahs collinion, but some files are simply identical 124 # hash collision, but some files are simply identical
111 if (${$hash{$hash}[1]} ne $$dataref) { 125 if (${$hash{$hash}[1]} ne $$dataref) {
112 warn "hash collision $hash{$hash}[0] vs. $id\n"; 126 warn "ERROR: hash collision $hash{$hash}[0] vs. $id (increase the default \$clen in make_hash?)\n";
113 exit 1; 127 exit 1;
114 } else { 128 } else {
115 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; 129 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
116 } 130 }
117 } 131 }
118 $hash{$hash} = [$id, $dataref, $hashref]; 132 $hash{$hash} = [$id, $dataref, $hashref];
119 133
120 $$hashref = $hash; 134 $$hashref = $hash;
121} 135}
122 136
137sub optipng($) {
138 system $OPTIPNG, "-o5", "-i0", "-q", $_[0];
139 die "$_[0] has zero size, aborting." unless -s $_[0];
140}
141
123mkdir $TMPDIR, 0700 142mkdir $TMPDIR, 0700
124 or die "$TMPDIR: $!"; 143 or die "$TMPDIR: $!";
125 144
126sub fork_sub(&) { 145sub fork_exec(&) {
127 my ($cb) = @_; 146 my ($cb) = @_;
128 147
129 if (my $pid = fork) { 148 if (my $pid = fork) {
130 my $current = $Coro::current; 149 my $current = $Coro::current;
131 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready }); 150 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
136 warn $@; 155 warn $@;
137 POSIX::_exit 1; 156 POSIX::_exit 1;
138 } 157 }
139} 158}
140 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
141sub inst_maps($) { 189sub inst_maps($) {
142 my (undef, $path) = @_; 190 my (undef, $path) = @_;
143 191
144 print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; 192 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
145 193
146 if (!-f "$path/regions") { 194 if (!-f "$path/regions") {
147 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 195 warn "ERROR: '$path' does not look like a maps directory ('regions' file is missing).\n";
148 exit 1 unless $FORCE; 196 exit 1 unless $FORCE;
149 } 197 }
150 198
151 system $RSYNC, "-av", "--chmod=u=rwX,go=rX", 199 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
152 "$path/.", "$DATADIR/maps/.", 200 "$path/.", "$DATADIR/maps/.",
162 our %FACEINFO; 210 our %FACEINFO;
163 our %RESOURCE; 211 our %RESOURCE;
164 our @ARC; 212 our @ARC;
165 our %ARC; 213 our %ARC;
166 our $TRS; 214 our $TRS;
215 our %PNG;
167 our $NFILE; 216 our $NFILE;
168 our $PATH; 217 our $PATH;
169 218
170 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 219 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
171 220
172 our $c_arc = new Coro::Channel; 221 our $c_arc = new Coro::Channel;
173 our $c_trs = new Coro::Channel; 222 our $c_any = new Coro::Channel;
174 our $c_res = new Coro::Channel;
175 223
176 our @c_png; 224 our @c_png;
177 225
178 sub commit_png($$$) { 226 sub commit_png($$$$) {
179 my ($name, $data, $T) = @_; 227 my ($stem, $name, $data, $T) = @_;
180 228
229 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
181 $FACEINFO{$name}{"data$T"} = $data; 230 $FACEINFO{$name}{"data$T"} = $data;
182 } 231 }
183 232
184 sub process_png { 233 sub process_png {
185 while (@c_png) { 234 while (@c_png) {
188 my $png; 237 my $png;
189 aio_lstat $path; 238 aio_lstat $path;
190 my ($size, $mtime) = (stat _)[7,9]; 239 my ($size, $mtime) = (stat _)[7,9];
191 240
192 if (0 > aio_load $path, $png) { 241 if (0 > aio_load $path, $png) {
193 warn "$path: $!, skipping.\n"; 242 warn "ERROR: $path: $!, skipping.\n";
194 next; 243 next;
195 } 244 }
196 245
197 my $stem = $path; 246 my $stem = $path;
198 my $T; 247 my $T;
200 if ($stem =~ s/\.32x32\.png~?$//) { 249 if ($stem =~ s/\.32x32\.png~?$//) {
201 $T = 32; 250 $T = 32;
202 } elsif ($stem =~ s/\.64x64\.png~?$//) { 251 } elsif ($stem =~ s/\.64x64\.png~?$//) {
203 $T = 64; 252 $T = 64;
204 } else { 253 } else {
205 warn "$path: weird filename, skipping.\n"; 254 warn "ERROR: $path: weird filename, skipping.\n";
206 next; 255 next;
207 } 256 }
208 257
209 # quickly extract width and height of the (necessarily PNG) image 258 # quickly extract width and height of the (necessarily PNG) image
210 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 259 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
211 warn "$path: not a recognized png file, skipping.\n"; 260 warn "ERROR: $path: not a recognized png file, skipping.\n";
212 next; 261 next;
213 } 262 }
214 263
215 my ($w, $h) = unpack "NN", $1; 264 my ($w, $h) = unpack "NN", $1;
216 265
217 if ($w < $T || $h < $T) { 266 if ($w < $T || $h < $T) {
218 warn "$path: too small ($w $h), skipping.\n"; 267 warn "ERROR: $path: too small ($w $h), skipping.\n";
219 next; 268 next;
220 } 269 }
221 270
222 if ($w % $T || $h % $T) { 271 if ($w % $T || $h % $T) {
223 warn "$path: weird png size ($w $h), skipping.\n"; 272 warn "ERROR: $path: weird png size ($w $h), skipping.\n";
224 next; 273 next;
225 } 274 }
226 275
227 (my $base = $stem) =~ s/^.*\///; 276 (my $base = $stem) =~ s/^.*\///;
228 277
237 unless ($path =~ /~$/) { 286 unless ($path =~ /~$/) {
238 # possibly enlarge 287 # possibly enlarge
239 if (0 > aio_stat "$stem.64x64.png") { 288 if (0 > aio_stat "$stem.64x64.png") {
240 my $other = "$stem.64x64.png~"; 289 my $other = "$stem.64x64.png~";
241 290
242 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 291 make_file $path, $other, sub {
243 fork_sub { 292 fork_exec {
244 my $CROP; 293 my $CROP;
245 my $SRC = "png:\Q$path\E"; 294 my $SRC = "png:\Q$path\E";
246 295
247 my $is_floor = $arc->{is_floor}; 296 my $is_floor = $arc->{is_floor};
248 my $is_wall = 0; 297 my $is_wall = 0;
302 351
303 system "convert -depth 8 $SRC rgba:-" 352 system "convert -depth 8 $SRC rgba:-"
304 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 353 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
305 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" 354 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
306 and die "convert/cfhq2xa pipeline error: status $? ($!)"; 355 and die "convert/cfhq2xa pipeline error: status $? ($!)";
307 system $OPTIPNG, "-i0", "-q", "$other~"; 356 optipng "$other~";
308 die "$other~ has zero size, aborting." unless -s "$other~";
309 rename "$other~", $other; 357 rename "$other~", $other;
310 }; 358 };
311 } 359 };
312 360
313 push @c_png, [$other, !$CACHE]; 361 push @c_png, [$other, !$CACHE];
314 } 362 }
315 363
316 # possibly scale down 364 # possibly scale down
317 if (0 > aio_stat "$stem.32x32.png") { 365 if (0 > aio_stat "$stem.32x32.png") {
318 my $other = "$stem.32x32.png~"; 366 my $other = "$stem.32x32.png~";
319 367
320 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 368 make_file $path, $other, sub {
321 fork_sub { 369 fork_exec {
322 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 370 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
323 system $OPTIPNG, "-i0", "-q", "$other~"; 371 optipng "$other~";
324 372
325 # reduce smoothfaces >10000 bytes 373 # reduce smoothfaces >10000 bytes
326 # obsolete, no longer required 374 # obsolete, no longer required
327 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { 375 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
328 my $ncolor = 256; 376 my $ncolor = 256;
329 while () { 377 while () {
330 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 378 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
331 system $OPTIPNG, "-i0", "-q", "$other~~"; 379 optipng "$other~~";
332 last if 10000 > -s "$other~~"; 380 last if 10000 > -s "$other~~";
333 $ncolor = int $ncolor * 0.9; 381 $ncolor = int $ncolor * 0.9;
334 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; 382 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
335 } 383 }
336 384
341 } 389 }
342 390
343 die "$other~ has zero size, aborting." unless -s "$other~"; 391 die "$other~ has zero size, aborting." unless -s "$other~";
344 rename "$other~", $other; 392 rename "$other~", $other;
345 }; 393 };
346 } 394 };
347 395
348 #warn "scaled down $path to $other\n";#d# 396 #warn "scaled down $path to $other\n";#d#
349 push @c_png, [$other, !$CACHE]; 397 push @c_png, [$other, !$CACHE];
350 } 398 }
351 } 399 }
352 400
353 (my $face = $stem) =~ s/^.*\///; 401 (my $face = $stem) =~ s/^.*\///;
402
403 for (@{ $fi->{derive} }) {
404 my ($dir, $type) = @$_;
405
406 my $geom = "${T}x${T}";
407 my $dpath = "$dir/$type:$face.$geom.png~";
408
409 if ($type eq "buildmaterial") {
410 my $ov = "$PATH/mapbuilding/buildmaterial.png";
411 make_file [$path, $ov], $dpath, sub {
412 fork_exec {
413 system "$CONVERT -size 64x64 xc:transparent \\( \Q$path\E -geometry 52x52+6+6 \\) -composite \Q$ov\E -composite -geometry $geom png:\Q$dpath\E~";
414 optipng "$dpath~";
415 rename "$dpath~", $dpath;
416 };
417 };
418 } elsif ($type eq "buildmaterial-box") {
419 my $ov = "$PATH/mapbuilding/buildmaterial-box.png";
420 make_file [$path, $ov], $dpath, sub {
421 fork_exec {
422 system "$CONVERT \Q$ov\E "
423 . "\\( \Q$path\E -trim -geometry 34x31\\> "
424 . "-gravity center -background transparent -extent 37x34 +gravity "
425 . "-geometry +22+6 \\) -composite "
426 . "-geometry $geom png:\Q$dpath\E~";
427 optipng "$dpath~";
428 rename "$dpath~", $dpath;
429 };
430 };
431 } elsif ($type eq "buildmaterial-sbox") {
432 my $ov = "$PATH/mapbuilding/buildmaterial-sbox.png";
433 make_file [$path, $ov], $dpath, sub {
434 fork_exec {
435 system "$CONVERT \Q$ov\E "
436 . "\\( \Q$path\E -trim -geometry 16x24\\> "
437 . "-gravity center -background transparent -extent 18x26 +gravity "
438 . "-geometry +26+16 \\) -composite "
439 . "-geometry $geom png:\Q$dpath\E~";
440 optipng "$dpath~";
441 rename "$dpath~", $dpath;
442 };
443 };
444 } else {
445 warn "ERROR: facename $type:$face contains unsupported derivation type.\n";
446 }
447
448 aio_load $dpath, my $png;
449 IO::AIO::aio_unlink $dpath unless $CACHE;
450 commit_png "$dir/$type:$face", "$type:$face", $png, $T;
451 }
354 452
355 # split all bigfaces, but avoid smoothfaces (*_S) 453 # split all bigfaces, but avoid smoothfaces (*_S)
356 if (($w > $T || $h > $T) && $face !~ /_S\./) { 454 if (($w > $T || $h > $T) && $face !~ /_S\./) {
357 # split 455 # split
358 my @tile; 456 my @tile;
363 push @tile, [$x, $y, $file, (stat _)[9]]; 461 push @tile, [$x, $y, $file, (stat _)[9]];
364 } 462 }
365 } 463 }
366 464
367 my $mtime = (lstat $path)[9]; 465 my $mtime = (lstat $path)[9];
368 my @todo = grep { $_->[3] <= $mtime } @tile; 466 my @todo = grep { $_->[3] < $mtime } @tile;
369 if (@todo) { 467 if (@todo) {
370 fork_sub { 468 fork_exec {
371 open my $convert, "|-", $CONVERT, 469 open my $convert, "|-", $CONVERT,
372 "png:-", 470 "png:-",
373 (map { 471 (map {
374 ( 472 (
375 "(", 473 "(",
388 print $convert $png; 486 print $convert $png;
389 close $convert; 487 close $convert;
390 488
391 # pass 2, optimise, and rename 489 # pass 2, optimise, and rename
392 for (@todo) { 490 for (@todo) {
393 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 491 optipng "$_->[2]~";
394 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
395 rename "$_->[2]~", $_->[2]; 492 rename "$_->[2]~", $_->[2];
396 } 493 }
397 }; 494 };
398 } 495 }
399 496
403 500
404 if (0 > aio_load $file, $tile) { 501 if (0 > aio_load $file, $tile) {
405 die "$path: unable to read tile +$x+$y, aborting.\n"; 502 die "$path: unable to read tile +$x+$y, aborting.\n";
406 } 503 }
407 IO::AIO::aio_unlink $file unless $CACHE; 504 IO::AIO::aio_unlink $file unless $CACHE;
408 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 505 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
409 } 506 }
410 } else { 507 } else {
411 # use as-is (either small, use smooth) 508 # use as-is (either small, use smooth)
412 commit_png $face, $png, $T; 509 commit_png $stem, $face, $png, $T;
413 } 510 }
414 511
415 aio_unlink $path if $delete; 512 IO::AIO::aio_unlink $path if $delete;
513 }
514 }
515
516 sub process_faceinfo {
517 my ($dir, $file) = @_;
518 my $path = "$dir/$file";
519
520 my $data;
521 if (0 > aio_load $path, $data) {
522 warn "ERROR: $path: $!, skipping.\n";
523 return;
524 }
525
526 for (split /\n/, $data) {
527 chomp;
528 my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/, $_, 5;
529 # bg not used except for text clients
530
531 utf8::decode $glyph;
532 $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag
533 $glyph =~ s/^"(.+)"$/$1/; # allow for ""-style quoting
534
535 $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet
536
537 (my $fgi = $COLOR{$fg})
538 // warn "ERROR: $path: $face specifies unknown foreground colour '$fg'.\n";
539 (my $bgi = $COLOR{$bg})
540 // warn "ERROR: $path: $face specifies unknown background colour '$bg'.\n";
541
542 my $fi = $FACEINFO{$face} ||= { };
543 $fi->{visibility} = $visibility * 1;
544 $fi->{magicmap} = $fgi; # foreground colour becomes magicmap
545
546 $glyph .= " " if 2 > length $glyph; # TODO kanji
547 die "glyph $face too long" if 2 < length $glyph;
548
549 $fi->{glyph} = "";
550 for (split //, $glyph) {
551 utf8::encode $_;
552 $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_;
553 }
416 } 554 }
417 } 555 }
418 556
419 sub process_arc { 557 sub process_arc {
420 while (my $job = $c_arc->get) { 558 while (my ($dir, $file) = @{ $c_arc->get }) {
421 my ($dir, $file) = @$job;
422
423 my $arc; 559 my $arc;
424 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 560 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
425 561
426 my $arc = read_arch "$dir/$file"; 562 my $arc = read_arch "$dir/$file";
427 for my $o (values %$arc) { 563 for my $o (values %$arc) {
429 for (my $m = $o; $m; $m = $m->{more}) { 565 for (my $m = $o; $m; $m = $m->{more}) {
430 $ARC{$m->{_name}} = $m; 566 $ARC{$m->{_name}} = $m;
431 } 567 }
432 568
433 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge 569 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
434
435 my $visibility = delete $o->{visibility};
436 my $magicmap = delete $o->{magicmap};
437 570
438 # find upper left corner :/ 571 # find upper left corner :/
439 # omg, this is sooo broken 572 # omg, this is sooo broken
440 my ($dx, $dy); 573 my ($dx, $dy);
441 for (my $o = $o; $o; $o = $o->{more}) { 574 for (my $o = $o; $o; $o = $o->{more}) {
448 my $y = $o->{y} - $dy; 581 my $y = $o->{y} - $dy;
449 582
450 my $ext = $x|$y ? "+$x+$y" : ""; 583 my $ext = $x|$y ? "+$x+$y" : "";
451 584
452 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 585 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
453
454 $visibility = delete $o->{visibility} if exists $o->{visibility};
455 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
456 586
457 my $anim = delete $o->{anim}; 587 my $anim = delete $o->{anim};
458 588
459 if ($anim) { 589 if ($anim) {
460 # possibly add $ext to the animation name to avoid 590 # possibly add $ext to the animation name to avoid
484 next if /^facings\s/; 614 next if /^facings\s/;
485 615
486 my $face = $_; 616 my $face = $_;
487 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates 617 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
488 618
489 my $info = $FACEINFO{$face} ||= { }; 619 # handle derived faces
620 if ($face =~ /^([^:]+):(.*)/) {
621 my ($type, $base) = ($1, $2);
622 push @{ $FACEINFO{$base}{derive} }, [$dir, $type];
623 }
624
490 $info->{arc} = $o; 625 $FACEINFO{$face}{arc} = $o;
491 626
492 next if $face =~ /^blank.x11$|^empty.x11$/; 627 next if $face =~ /^blank.x11$|^empty.x11$/;
493
494 $info->{visibility} = $visibility if defined $visibility;
495 $info->{magicmap} = $magicmap if defined $magicmap;
496 } 628 }
497 629
498 if (my $smooth = delete $o->{smoothface}) { 630 if (my $smooth = delete $o->{smoothface}) {
499 my %kv = split /\s+/, $smooth; 631 my %kv = split /\s+/, $smooth;
500 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 632 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
509 } 641 }
510 } 642 }
511 } 643 }
512 644
513 sub process_trs { 645 sub process_trs {
514 while (my $job = $c_trs->get) {
515 my ($dir, $file) = @$job; 646 my ($dir, $file) = @_;
516 my $path = "$dir/$file"; 647 my $path = "$dir/$file";
517 648
518 my $trs; 649 my $trs;
519 if (0 > aio_load $path, $trs) { 650 if (0 > aio_load $path, $trs) {
520 warn "$path: $!, skipping.\n"; 651 warn "ERROR: $path: $!, skipping.\n";
521 next; 652 return;
522 } 653 }
523 654
524 $TRS .= $trs; 655 $TRS .= $trs;
525 }
526 } 656 }
527 657
528 my %FILECACHE; 658 my %FILECACHE;
529 659
530 sub load_cached($;$) { 660 sub load_cached($;$) {
531 unless (exists $FILECACHE{$_[0]}) { 661 unless (exists $FILECACHE{$_[0]}) {
532 my $data; 662 my $data;
533 if (0 < aio_load $_[0], $data) { 663 if (0 < aio_load $_[0], $data) {
534 if ($_[1]) { 664 if ($_[1]) {
535 $data = eval { $_[1]->($data) }; 665 $data = eval { $_[1]->($data) };
536 warn "$_[0]: $@" if $@; 666 warn "ERROR: $_[0]: $@" if $@;
537 } 667 }
538 } 668 }
539 669
540 $FILECACHE{$_[0]} = $data; 670 $FILECACHE{$_[0]} = $data;
541 } 671 }
542 672
543 $FILECACHE{$_[0]} 673 $FILECACHE{$_[0]}
544 } 674 }
545 675
676 # convert an image and a palette to some indexed 2d-matrix structure
677 sub process_plt {
678 my ($base, $plt) = @_;
679
680 my ($w, $h) = imgsize "$base.png";
681
682 $w * $h
683 or die "$base.png: unable to identify correct size\n";
684
685 my @plt;
686 my %map;
687
688 for (split /\n/, $plt) {
689 next unless /\S/;
690 next if /^\s*#/;
691
692 /^([0-9a-fA-F]{3,6})\s*(.*?)\s*$/
693 or die "unparseable palette entry for $base.plt: $_";
694
695 my ($rgb, $name) = ($1, $2);
696
697 $rgb =~ s/^(.)(.)(.)$/$1$1$2$2$3$3/;
698
699 $map{pack "H*", $rgb} = chr @plt;
700 push @plt, $name;
701 }
702
703 make_file ["$base.plt", "$base.png"], "$base.tbl~", sub {
704 warn "building $base\n" if $VERBOSE >= 3;
705
706 fork_exec {
707 open my $png, "-|", $CONVERT, qw(-depth 8 --), "$base.png", "rgb:"
708 or die "$base.png: $!";
709
710 local $/;
711 $png = <$png>;
712
713 $w * $h * 3 == length $png
714 or die "$base.png: failed to read enough data from file\n";
715
716 $png =~ s/(...)/$map{$1}/ge;
717
718 $w * $h == length $png
719 or die "$base.png: failed to map all data - wrong palette?\n";
720
721 {
722 open my $fh, ">:raw", "$base.tbl~~"
723 or die "$base.tbl~~: $!";
724 syswrite $fh, $png;
725 }
726
727 rename "$base.tbl~~", "$base.tbl~";
728 };
729 };
730
731 0 <= aio_load "$base.tbl~", my $tbl
732 or die "$base.tbl~: $!";
733
734 IO::AIO::aio_unlink "$base.tbl~" unless $CACHE;
735
736 Compress::LZF::compress nfreeze {
737 w => $w,
738 h => $h,
739 plt => \@plt,
740 tbl => $tbl,
741 }
742 }
743
546 sub process_res { 744 sub process_res {
547 while (my $job = $c_res->get) {
548 my ($dir, $file, $type) = @$job; 745 my ($dir, $file, $type) = @_;
549 746
550 my $data;
551 aio_load "$dir/$file", $data; 747 0 <= aio_load "$dir/$file", my $data
748 or die "$dir/$file: $!";
552 749
553 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 750 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
554 751
555 utf8::decode $dir; 752 utf8::decode $dir;
556 utf8::decode $file; 753 utf8::decode $file;
557 754
558 # a meta file for resources is now mandatory 755 # a meta file for resources is now mandatory
559 unless (exists $meta->{$file}) { 756 unless (exists $meta->{$file}) {
560 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 757 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
561 next; 758 return;
562 } 759 }
563 760
564 $meta = { 761 $meta = {
565 %{ $meta->{"" } || {} }, 762 %{ $meta->{"" } || {} },
566 %{ $meta->{$file} || {} }, 763 %{ $meta->{$file} || {} },
567 }; 764 };
568 765
569 if ($meta->{license} =~ s/^#//) { 766 if ($meta->{license} =~ s/^#//) {
570 $meta->{license} = ({ 767 $meta->{license} = ({
571 "pd" => "Public Domain", 768 "pd" => "Public Domain",
572 "gpl" => "GNU General Public License, version 3.0 or any later", 769 "gpl" => "GNU General Public License, version 3.0 or any later",
573 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 770 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
771 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
574 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", 772 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
575 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 773 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
576 })->{$meta->{license}} 774 })->{$meta->{license}}
577 || warn "$dir/$file: license tag '$meta->{license}' not found."; 775 || warn "ERROR: $dir/$file: license tag '$meta->{license}' not found.";
578 } 776 }
579 777
778 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
779 ($meta->{author} = $1) =~ s/_/ /g;
780 }
781
580 $file =~ s/\.res$//; 782 $file =~ s/\.res$//;
581 $file =~ s/\.(ogg|wav|jpg|png)$//; 783 $file =~ s/\.(ogg|wav|jpg|png)$//;
582 784
583 substr $dir, 0, 1 + length $PATH, ""; 785 if ($file =~ s/\.plt$//) {
584 786 $data = process_plt "$dir/$file", $data;
585 if (my $filter = $meta->{cfutil_filter}) { 787 } elsif (my $filter = delete $meta->{cfutil_filter}) {
586 if ($filter eq "yaml2json") { 788 if ($filter eq "yaml2json") {
587 $data = JSON::XS::encode_json YAML::XS::Load $data; 789 $data = JSON::XS::encode_json YAML::XS::Load $data;
588 } elsif ($filter eq "json2json") { 790 } elsif ($filter eq "json2json") {
589 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 791 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
590 } elsif ($filter eq "perl2json") { 792 } elsif ($filter eq "perl2json") {
591 $data = eval $data; die if $@; 793 $data = eval $data; die if $@;
592 $data = JSON::XS::encode_json $data; 794 $data = JSON::XS::encode_json $data;
593 } else { 795 } else {
594 warn "$dir/$file: unknown filter $filter, skipping\n"; 796 warn "ERROR: $dir/$file: unknown filter $filter, skipping\n";
595 } 797 }
596 } 798 }
597 799
800 substr $dir, 0, 1 + length $PATH, "";
801
598 $RESOURCE{"$dir/$file"} = { 802 $RESOURCE{"$dir/$file"} = {
599 type => (exists $meta->{type} ? delete $meta->{type} : $type), 803 type => (exists $meta->{type} ? delete $meta->{type} : $type),
600 data => $data, 804 data => $data,
601 %$meta ? (meta => $meta) : (), 805 %$meta ? (meta => $meta) : (),
602 }; 806 };
807 }
808
809 sub process_any {
810 while (my ($func, @args) = @{ $c_any->get }) {
811 $func->(@args);
603 } 812 }
604 } 813 }
605 814
606 sub find_files; 815 sub find_files;
607 sub find_files { 816 sub find_files {
608 my ($path) = @_; 817 my ($path) = @_;
609 818
819 my $grp = IO::AIO::aio_group;
820
821 my $scandir; $scandir = sub {
822 my ($path) = @_;
823
610 IO::AIO::aioreq_pri 4; 824 IO::AIO::aioreq_pri 4;
611 IO::AIO::aio_scandir $path, 4, sub { 825 add $grp IO::AIO::aio_scandir $path, 4, sub {
612 my ($dirs, $nondirs) = @_; 826 my ($dirs, $nondirs) = @_;
613 827
614 find_files "$path/$_" 828 $scandir->("$path/$_")
615 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 829 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
616 830
617 my $dir = $path; 831 my $dir = $path;
618 substr $dir, 0, 1 + length $PATH, ""; 832 substr $dir, 0, 1 + length $PATH, "";
619 833
620 for my $file (@$nondirs) { 834 for my $file (@$nondirs) {
621 if ($dir =~ /^music(?:\/|$)/) { 835 if ($dir =~ /^music(?:\/|$)/) {
622 $c_res->put ([$path, $file, 3]) # FT_MUSIC 836 $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC
623 if $file =~ /\.(ogg)$/; 837 if $file =~ /\.(ogg)$/;
624 838
625 } elsif ($dir =~ /^sound(?:\/|$)/) { 839 } elsif ($dir =~ /^sound(?:\/|$)/) {
626 $c_res->put ([$path, $file, 5]) # FT_SOUND 840 $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND
627 if $file =~ /\.(wav|ogg)$/; 841 if $file =~ /\.(wav|ogg)$/;
628 842
629 } elsif ($dir =~ /^res(?:\/|$)/) { 843 } elsif ($dir =~ /^res(?:\/|$)/) {
630 if ($file =~ /\.(jpg|png)$/) { 844 if ($file =~ /\.(jpg|png)$/) {
631 $c_res->put ([$path, $file, 0]) # FT_FACE 845 $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE
632 } elsif ($file =~ /\.(res)$/) { 846 } elsif ($file =~ /\.(res)$/) {
847 $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC
848 } else {
849 $c_any->put ([\&process_res, $path, $file, 6]); # was type undef, but now meta files are mandatory, so any mentioned file surely has a purpose
850 }
851
852 } elsif ($file =~ /\.png$/) {
853 $PNG{$file} = $path;
854
855 } elsif ($file =~ /\.faceinfo$/) {
856 $c_any->put ([\&process_faceinfo, $path, $file]);
857
858 } elsif ($file =~ /\.trs$/) {
859 $c_any->put ([\&process_trs, $path, $file]);
860
861 } elsif ($file =~ /\.arc$/) {
633 $c_res->put ([$path, $file, 6]) # FT_RSRC 862 $c_arc->put ([$path, $file]);
863
634 } else { 864 } else {
635 $c_res->put ([$path, $file, undef]); 865 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
636 } 866 }
637
638 } elsif ($file =~ /\.png$/) {
639 push @c_png, ["$path/$file", 0];
640
641 } elsif ($file =~ /\.trs$/) {
642 $c_trs->put ([$path, $file]);
643
644 } elsif ($file =~ /\.arc$/) {
645 $c_arc->put ([$path, $file]);
646
647 } else { 867 }
648 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
649 }
650 } 868 };
651 }; 869 };
870
871 $scandir->($path);
872 aio_wait $grp;
652 } 873 }
653 874
654 sub generate_plurals { 875 sub generate_plurals {
655# use Lingua::EN::Inflect (); 876# use Lingua::EN::Inflect ();
656# Lingua::EN::Inflect::classical; 877# Lingua::EN::Inflect::classical;
690 "Unless you run verbosely, all following warning\n", 911 "Unless you run verbosely, all following warning\n",
691 "or error messages indicate serious problems.\n", 912 "or error messages indicate serious problems.\n",
692 "\n"; 913 "\n";
693 914
694 if (!-d "$path/treasures") { 915 if (!-d "$path/treasures") {
695 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 916 warn "FATAL: '$path' does not look like an arch directory ('treasures' directory is missing).\n";
696 exit 1 unless $FORCE; 917 exit 1 unless $FORCE;
697 } 918 }
698 919
699 print "scanning files...\n" if $VERBOSE; 920 print "starting file scan, arc, any processing...\n" if $VERBOSE;
921
922 my @a_arc = map +(async \&process_arc), 1..2;
923 my @a_any = map +(async \&process_any), 1..4;
700 924
701 find_files $path; 925 find_files $path;
702 926
703 my @a_arc = map +(async \&process_arc), 1..2;
704 my @a_res = map +(async \&process_res), 1..2;
705 my @a_trs = map +(async \&process_trs), 1..2;
706
707 IO::AIO::flush;
708
709 $c_res->shutdown;
710 $c_arc->shutdown; 927 $c_arc->shutdown;
711 $c_trs->shutdown; 928 $c_any->shutdown;
712
713 print "start file scan, arc, res processing...\n" if $VERBOSE;
714 929
715 $_->join for @a_arc; # need to parse all archetypes before png processing 930 $_->join for @a_arc; # need to parse all archetypes before png processing
931 print "finished arc processing...\n" if $VERBOSE;
716 932
933 # fill png queue
934 for (keys %FACEINFO) {
935 # we only expect source pngs to exist for non-derived
936 # faces, i.e. no split tiles (+x+x) and no face derivates
937 # (xxx:)
938 /^[^:]+\....$/
939 or next;
940
941 my $seen;
942
943 if (exists $PNG{"$_.32x32.png"}) {
944 push @c_png, ["$PNG{\"$_.32x32.png\"}/$_.32x32.png"];
945 $seen = 1;
946 }
947 if (exists $PNG{"$_.64x64.png"}) {
948 push @c_png, ["$PNG{\"$_.64x64.png\"}/$_.64x64.png"];
949 $seen = 1;
950 }
951
952 warn "ERROR: $_: face not found, expect problems.\n"
953 unless $seen;
954 }
955
717 print "end arc, start png processing...\n" if $VERBOSE; 956 print "starting png processing...\n" if $VERBOSE;
718 957
719 # eight png crunchers work fine for my 4x smp machine 958 # eight png crunchers work fine for my 4x smp machine
720 my @a_png = map +(async \&process_png), 1..8; 959 my @a_png = map +(async \&process_png), 1..8;
721 960
722 $_->join for (@a_trs, @a_res, @a_png); 961 $_->join for @a_any;
962 print "finished any processing...\n" if $VERBOSE;
963
964 $_->join for @a_png;
965 print "finished png processing...\n" if $VERBOSE;
723 966
724 print "scanning done, processing results...\n" if $VERBOSE; 967 print "scanning done, processing results...\n" if $VERBOSE;
725 { 968 {
726 # remove path prefix from editor_folder 969 # remove path prefix from editor_folder
727 $_->{editor_folder} =~ /^\x00/ 970 $_->{editor_folder} =~ /^\x00/
733 while () { 976 while () {
734 my $progress; 977 my $progress;
735 my $loop; 978 my $loop;
736 979
737 for my $o (values %ARC) { 980 for my $o (values %ARC) {
738 if (my $other = $o->{inherit}) { 981 for my $other (split /,/, $o->{inherit}) {
739 if (my $s = $ARC{$other}) { 982 if (my $s = $ARC{$other}) {
740 if ($s->{inherit}) { 983 if ($s->{inherit}) {
741 $loop = $s; 984 $loop = $s;
742 } else { 985 } else {
743 delete $o->{inherit}; 986 delete $o->{inherit};
745 delete @s{qw(_name more name name_pl)}; 988 delete @s{qw(_name more name name_pl)};
746 %$o = ( %s, %$o ); 989 %$o = ( %s, %$o );
747 ++$progress; 990 ++$progress;
748 } 991 }
749 } else { 992 } else {
750 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 993 warn "ERROR: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
751 delete $ARC{$o->{_name}}; 994 delete $ARC{$o->{_name}};
752 } 995 }
753 } 996 }
754 } 997 }
755 998
762 } 1005 }
763 1006
764 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 1007 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
765 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 1008 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
766 1009
1010 # fix up archetypes without names, where the archanme doesn't work at all
1011 for (@ARC) {
1012 if (!exists $_->{name} and $_->{_name} =~ /_/) {
1013 for ($_->{name} = $_->{_name}) {
1014 s/(?:_\d+)+$//;
1015 s/_[nesw]+$//;
1016 y/_/ /;
1017 }
1018 }
1019 }
1020
767 print "generating plurals...\n" if $VERBOSE; 1021 #print "generating plurals...\n" if $VERBOSE;
768 generate_plurals; 1022 #generate_plurals;
769 1023
770 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; 1024 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
771 open my $fh, ">:utf8", "$DATADIR/archetypes~" 1025 open my $fh, ">:utf8", "$DATADIR/archetypes~"
772 or die "$DATADIR/archetypes~: $!"; 1026 or die "$DATADIR/archetypes~: $!";
773 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 1027 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
781 } 1035 }
782 1036
783 { 1037 {
784 print "processing facedata...\n" if $VERBOSE; 1038 print "processing facedata...\n" if $VERBOSE;
785 while (my ($k, $v) = each %FACEINFO) { 1039 while (my ($k, $v) = each %FACEINFO) {
786 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 1040 length $v->{data32} or warn "ERROR: face '$k' has no png32 - this will not work.\n";
787 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 1041 length $v->{data64} or warn "ERROR: face '$k' has no png64 - this will not work.\n";
788 1042
789 make_hash $k, $v->{data32}, $v->{hash32}; 1043 make_hash $k, $v->{data32}, $v->{hash32};
790 make_hash $k, $v->{data64}, $v->{hash64}; 1044 make_hash $k, $v->{data64}, $v->{hash64};
791 1045
792 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 1046 #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n";
793 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 1047 #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n";
794 1048
795 if (my $magicmap = $v->{magicmap}) { 1049 $v->{glyph} // warn "ERROR: face '$k' has no glyph - missing faceinfo entry?\n";
796 $magicmap =~ y/A-Z_\-/a-z/d; 1050 $v->{visibility} // warn "ERROR: face '$k' has no visibility info - missing faceinfo entry?\n";
797 $v->{magicmap} = $COLOR{$magicmap}; 1051 $v->{magicmap} // warn "ERROR: face '$k' has no foreground colour - missing faceinfo entry?\n";
798 }
799 1052
800 delete $v->{arc}; 1053 delete @$v{qw(arc stem derive)}; # not used by the server
801 } 1054 }
802 1055
803 print "processing resources...\n" if $VERBOSE; 1056 print "processing resources...\n" if $VERBOSE;
804 my $enc = JSON::XS->new->utf8->canonical->relaxed; 1057 my $enc = JSON::XS->new->utf8->canonical->relaxed;
805 while (my ($k, $v) = each %RESOURCE) { 1058 while (my ($k, $v) = each %RESOURCE) {
806 1059
1060 if ($v->{meta} && $v->{meta}{datadir}) {
1061 delete $RESOURCE{$k};
1062
1063 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
1064
1065 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
1066 open my $fh, ">:raw", "$DATADIR/$k~"
1067 or die "$DATADIR/$k~: $!";
1068 syswrite $fh, $v->{data};
1069 push @COMMIT, $k;
1070
1071 } else {
807 if ($v->{type} & 1) { 1072 if ($v->{type} & 1) {
808 # prepend meta info 1073 # prepend meta info
809 1074
810 my $meta = $enc->encode ({ 1075 my $meta = $enc->encode ({
811 name => $k, 1076 name => $k,
812 %{ $v->{meta} || {} }, 1077 %{ $v->{meta} || {} },
813 }); 1078 });
814 1079
815 $v->{data} = pack "(w/a*)*", $meta, $v->{data}; 1080 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
816 } 1081 }
817 1082
818 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients 1083 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
1084 }
819 } 1085 }
820 1086
821 printf "writing facedata (%d faces, %d anims, %d resources)...\n", 1087 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
822 scalar keys %FACEINFO, 1088 scalar keys %FACEINFO,
823 scalar keys %ANIMINFO, 1089 scalar keys %ANIMINFO,
825 if $VERBOSE; 1091 if $VERBOSE;
826 1092
827 open my $fh, ">:perlio", "$DATADIR/facedata~" 1093 open my $fh, ">:perlio", "$DATADIR/facedata~"
828 or die "$DATADIR/facedata~: $!"; 1094 or die "$DATADIR/facedata~: $!";
829 1095
830 print $fh freeze { 1096 print $fh nfreeze {
831 version => 2, 1097 version => 2,
832 faceinfo => \%FACEINFO, 1098 faceinfo => \%FACEINFO,
833 animinfo => \%ANIMINFO, 1099 animinfo => \%ANIMINFO,
834 resource => \%RESOURCE, 1100 resource => \%RESOURCE,
835 }; 1101 };
836
837 } 1102 }
838 1103
839 print "committing files...\n" if $VERBOSE; 1104 print "committing files...\n" if $VERBOSE;
840 1105
841 for (qw(archetypes facedata treasures)) { 1106 for (qw(archetypes facedata treasures), @COMMIT) {
842 chmod 0644, "$DATADIR/$_~"; 1107 chmod 0644, "$DATADIR/$_~";
843 rename "$DATADIR/$_~", "$DATADIR/$_" 1108 rename "$DATADIR/$_~", "$DATADIR/$_"
844 or die "$DATADIR/$_: $!"; 1109 or die "$DATADIR/$_: $!";
845 } 1110 }
846 1111

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines