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.17 by root, Wed Mar 14 16:23:26 2007 UTC vs.
Revision 1.102 by root, Wed Oct 6 18:23:52 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines