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

Diff Legend

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