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.56 by root, Sun Aug 19 15:47:56 2007 UTC

… …
6my $exec_prefix = "@exec_prefix@"; 6my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 7my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 8my $DATADIR = "@datadir@/@PACKAGE@";
9 9
10my $CONVERT = "@CONVERT@"; 10my $CONVERT = "@CONVERT@";
11my $IDENTIFY = "@IDENTIFY@"; 11#my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 12my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@";
14 15
15use Getopt::Long; 16use Getopt::Long;
16use Coro::Event; 17use Coro::Event;
17use AnyEvent; 18use AnyEvent;
18use IO::AIO (); 19use IO::AIO ();
19use File::Temp; 20use File::Temp;
20use Crossfire; 21use Crossfire;
21use Coro; 22use Coro;
22use Coro::AIO; 23use Coro::AIO;
24use Coro::Util;
23use POSIX (); 25use POSIX ();
24use Digest::MD5; 26use Digest::MD5;
27use Carp;
28use Coro::Channel;
25use Storable; $Storable::canonical = 1; 29use Coro::Storable; $Storable::canonical = 1;
30
31$SIG{QUIT} = sub { Carp::cluck "QUIT" };
26 32
27sub usage { 33sub usage {
28 warn <<EOF; 34 warn <<EOF;
29Usage: cfutil [-v] [-q] [--force] [--cache] 35Usage: cfutil [-v] [-q] [--force] [--cache]
30 [--install-arch path] 36 [--install-arch path]
… …
42my $CACHE = 0; 48my $CACHE = 0;
43my $FORCE; 49my $FORCE;
44my $TMPDIR = "/tmp/cfutil$$~"; 50my $TMPDIR = "/tmp/cfutil$$~";
45my $TMPFILE = "aaaa0"; 51my $TMPFILE = "aaaa0";
46 52
53our %COLOR = (
54 black => 0,
55 white => 1,
56 navy => 2,
57 red => 3,
58 orange => 4,
59 blue => 5,
60 darkorange => 6,
61 green => 7,
62 lightgreen => 8,
63 grey => 9,
64 brown => 10,
65 gold => 11,
66 tan => 12,
67);
68
47END { system "rm", "-rf", $TMPDIR } 69END { system "rm", "-rf", $TMPDIR }
48 70
49Event->signal (signal => "INT", cb => sub { exit 1 }); 71Event->signal (signal => "INT", cb => sub { exit 1 });
50Event->signal (signal => "TERM", cb => sub { exit 1 }); 72Event->signal (signal => "TERM", cb => sub { exit 1 });
51 73
… …
68} 90}
69 91
70sub inst_maps($) { 92sub inst_maps($) {
71 my (undef, $path) = @_; 93 my (undef, $path) = @_;
72 94
73 print "installing '$path' to '$DATADIR/maps'\n"; 95 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
74 96
75 if (!-f "$path/regions") { 97 if (!-f "$path/regions") {
76 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 98 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
77 exit 1 unless $FORCE; 99 exit 1 unless $FORCE;
78 } 100 }
79 101
80 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
81 and die "map installation failed.\n"; 103 and die "map installation failed.\n";
82 104
83 print "maps installed successfully.\n"; 105 print "maps installed successfully.\n";
84} 106}
85 107
86{ 108{
87 our %PNG32; 109 our %ANIMINFO;
88 our %FACEINFO; 110 our %FACEINFO;
111 our %RESOURCE;
89 our @ARC; 112 our @ARC;
113 our %ARC;
90 our $TRS; 114 our $TRS;
91 our $NFILE; 115 our $NFILE;
92 our %ANIM; 116 our $PATH;
93 117
94 our (@png, @trs, @arc); # files we are interested in 118 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
95 119
120 our $c_arc = new Coro::Channel;
121 our $c_trs = new Coro::Channel;
122 our $c_res = new Coro::Channel;
123
124 our @c_png;
125
96 sub commit_png { 126 sub commit_png($$$) {
97 my ($name, $data) = @_; 127 my ($name, $data, $T) = @_;
98 128
99 $PNG32{$name} = $data; 129 $FACEINFO{$name}{"data$T"} = $data;
100 $FACEINFO{$name} ||= {};
101 } 130 }
102 131
103 sub process_png { 132 sub process_png {
104 while (@png) { 133 while (@c_png) {
105 my $path = pop @png; 134 my ($path, $delete) = @{pop @c_png};
106 135
107 my $png; 136 my $png;
108 aio_lstat $path; 137 aio_lstat $path;
109 my ($size, $mtime) = (stat _)[7,9]; 138 my ($size, $mtime) = (stat _)[7,9];
110 139
111 if (0 > aio_load $path, $png) { 140 if (0 > aio_load $path, $png) {
112 warn "$path: $!, skipping.\n"; 141 warn "$path: $!, skipping.\n";
113 next; 142 next;
114 } 143 }
115 144
145 my $stem = $path;
146 my $T;
147
148 if ($stem =~ s/\.32x32\.png~?$//) {
149 $T = 32;
150 } elsif ($stem =~ s/\.64x64\.png~?$//) {
151 $T = 64;
152 } else {
153 warn "$path: weird filename, skipping.\n";
154 next;
155 }
156
116 # quickly extract width and height of the (necessarily PNG) image 157 # quickly extract width and height of the (necessarily PNG) image
117 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 158 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
118 warn "$path: not a recongized png file, skipping.\n"; 159 warn "$path: not a recognized png file, skipping.\n";
119 next; 160 next;
120 } 161 }
121 162
122 my ($w, $h) = unpack "NN", $1; 163 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 164
132 if ($w < $T || $h < $T) { 165 if ($w < $T || $h < $T) {
133 warn "$path: too small ($w $h), skipping.\n"; 166 warn "$path: too small ($w $h), skipping.\n";
134 next; 167 next;
135 } 168 }
… …
137 if ($w % $T || $h % $T) { 170 if ($w % $T || $h % $T) {
138 warn "$path: weird png size ($w $h), skipping.\n"; 171 warn "$path: weird png size ($w $h), skipping.\n";
139 next; 172 next;
140 } 173 }
141 174
175 (my $base = $stem) =~ s/^.*\///;
176
177 my $fi = $FACEINFO{$base};
178 unless ($fi) {
179 warn "$path: <$base> not referenced by any archetype, skipping.\n";
180 next;
181 }
182
183 my $arc = $FACEINFO{$base}{arc}
184 or die "FATAL: internal error <$base>, cannot continue";
185
186 unless ($path =~ /~$/) {
187 # possibly enlarge
188 if (0 > aio_stat "$stem.64x64.png") {
189 my $other = "$stem.64x64.png~";
190
191 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
192 fork_sub {
193 my $CROP;
194 my $SRC = "png:\Q$path\E";
195
196 my $is_floor = $arc->{is_floor};
197 my $is_wall = 0;
198
199 my ($wall_pfx, $wall_dir, $wall_sfx);
200
201 if (
202 !$is_floor
203 && !$arc->{alive}
204 && $arc->{move_block} eq "all"
205 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
206 ) {
207 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
208
209 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
210 $is_wall = 1;
211 }
212 }
213
214 if ($is_wall || $is_floor) {
215 # add a 4px border and add other images around it
216 $CROP = "-shave 8x8 +repage";
217
218 $w += 8;
219 $h += 8;
220
221 $SRC = "-size ${w}x${h} xc:transparent";
222 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
223
224 # 8 surrounding images
225 for (
226 # x y b r0 r1
227 [-1, -1, 0, 6],
228 [ 0, -1, 1, 10, 14],
229 [+1, -1, 0, 12],
230
231 [-1, 0, 8, 5, 7],
232 #
233 [+1, 0, 2, 5, 13],
234
235 [-1, +1, 0, 3],
236 [ 0, +1, 4, 10, 11],
237 [+1, +1, 0, 9],
238 ) {
239 my ($x, $y, $d, $r0, $r1) = @$_;
240
241 my $tile = $is_floor ? $path
242 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
243 : die;
244
245 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
246 "\Q$tile",
247 $x * ($w - 8) + 4,
248 $y * ($h - 8) + 4;
249 }
250 }
251
252 system "convert -depth 8 $SRC rgba:-"
253 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
254 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
255 and die "convert/cfhq2xa pipeline error: status $? ($!)";
256 system $OPTIPNG, "-i0", "-q", "$other~";
257 die "$other~ has zero size, aborting." unless -s "$other~";
258 rename "$other~", $other;
259 };
260 }
261
262 push @c_png, [$other, !$CACHE];
263 }
264
265 # possibly scale down
266 if (0 > aio_stat "$stem.32x32.png") {
267 my $other = "$stem.32x32.png~";
268
269 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
270 fork_sub {
271 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
272 system $OPTIPNG, "-i0", "-q", "$other~";
273
274 # reduce smoothfaces >10000 bytes
275 if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
276 my $ncolor = 256;
277 while () {
278 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
279 system $OPTIPNG, "-i0", "-q", "$other~~";
280 last if 10000 > -s "$other~~";
281 $ncolor = int $ncolor * 0.9;
282 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
283 }
284
285 printf "reduced %s from %d to %d bytes using %d colours.\n",
286 $other, -s "$other~", -s "$other~~", $ncolor
287 if $VERBOSE >= 2;
288 rename "$other~~", "$other~";
289 }
290
291 die "$other~ has zero size, aborting." unless -s "$other~";
292 rename "$other~", $other;
293 };
294 }
295
296 #warn "scaled down $path to $other\n";#d#
297 push @c_png, [$other, !$CACHE];
298 }
299 }
300
301 (my $face = $stem) =~ s/^.*\///;
302
303 # split all bigfaces, but avoid smoothfaces (*_S)
142 if (($w > $T || $h > $T) && $face !~ /_S\./) { 304 if (($w > $T || $h > $T) && $face !~ /_S\./) {
143 # split 305 # split
144 my @tile; 306 my @tile;
145 for my $x (0 .. (int $w / $T) - 1) { 307 for my $x (0 .. (int $w / $T) - 1) {
146 for my $y (0 .. (int $h / $T) - 1) { 308 for my $y (0 .. (int $h / $T) - 1) {
… …
160 ( 322 (
161 "(", 323 "(",
162 "+clone", 324 "+clone",
163 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), 325 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
164 "+repage", 326 "+repage",
327 -quality => "00",
165 -write => "png:$_->[2]~", 328 -write => "png32:$_->[2]~",
166 "+delete", 329 "+delete",
167 ")", 330 ")",
168 ) 331 )
169 } @todo), 332 } @todo),
170 "null:"; 333 "null:";
… …
174 close $convert; 337 close $convert;
175 338
176 # pass 2, optimise, and rename 339 # pass 2, optimise, and rename
177 for (@todo) { 340 for (@todo) {
178 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 341 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
342 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
179 rename "$_->[2]~", $_->[2]; 343 rename "$_->[2]~", $_->[2];
180 } 344 }
181 }; 345 };
182 } 346 }
183 347
… …
187 351
188 if (0 > aio_load $file, $tile) { 352 if (0 > aio_load $file, $tile) {
189 die "$path: unable to read tile +$x+$y, aborting.\n"; 353 die "$path: unable to read tile +$x+$y, aborting.\n";
190 } 354 }
191 IO::AIO::aio_unlink $file unless $CACHE; 355 IO::AIO::aio_unlink $file unless $CACHE;
192 commit_png $x|$y ? "$face+$x+$y" : $face, $tile; 356 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
193 } 357 }
194 } else { 358 } else {
195 # use as-is (either small, use smooth) 359 # use as-is (either small, use smooth)
196 commit_png $face, $png; 360 commit_png $face, $png, $T;
197 } 361 }
362
363 aio_unlink $path if $delete;
198 } 364 }
199 } 365 }
200 366
201 sub process_arc { 367 sub process_arc {
202 while (@arc) { 368 while (my $job = $c_arc->get) {
203 my ($dir, $file) = @{pop @arc}; 369 my ($dir, $file) = @$job;
204 370
205 my $arc; 371 my $arc;
206 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 372 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
207 373
208 my $arc = read_arch "$dir/$file"; 374 my $arc = read_arch "$dir/$file";
209 for my $o (values %$arc) { 375 for my $o (values %$arc) {
210 push @ARC, $o; 376 push @ARC, $o;
377 for (my $m = $o; $m; $m = $m->{more}) {
378 $ARC{$m->{_name}} = $m;
379 }
211 380
212 $o->{editor_folder} = $dir; 381 $o->{editor_folder} = $dir;
213 382
214 my $visibility = delete $o->{visibility}; 383 my $visibility = delete $o->{visibility};
215 my $magicmap = delete $o->{magicmap}; 384 my $magicmap = delete $o->{magicmap};
… …
226 my $x = $o->{x} - $dx; 395 my $x = $o->{x} - $dx;
227 my $y = $o->{y} - $dy; 396 my $y = $o->{y} - $dy;
228 397
229 my $ext = $x|$y ? "+$x+$y" : ""; 398 my $ext = $x|$y ? "+$x+$y" : "";
230 399
231 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/; 400 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
232 401
233 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 402 $visibility = delete $o->{visibility} if exists $o->{visibility};
234 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 403 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
235 404
236 my $anim = delete $o->{anim}; 405 my $anim = delete $o->{anim};
237 406
238 if ($anim) { 407 if ($anim) {
408 # possibly add $ext to the animation name to avoid
409 # the need to specify archnames for all parts
410 # of a multipart archetype.
239 $o->{animation} = "$o->{_name}"; 411 $o->{animation} = "$o->{_name}";
412 my $facings = 1;
413 my @frames;
240 414
241 for (@$anim) { 415 for (@$anim) {
242 $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/; 416 if (/^facings\s+(\d+)/) {
417 $facings = $1*1;
418 } elsif (/^blank.x11$|^empty.x11$/) {
419 push @frames, $_;
420 } else {
421 push @frames, "$_$ext";
422 }
243 } 423 }
244 424
245 $ANIM{"$o->{_name}$ext"} = 425 $ANIMINFO{$o->{animation}} = {
246 join "", map "$_\n", 426 facings => $facings,
247 "anim $o->{_name}", 427 frames => \@frames,
248 @$anim, 428 };
249 "mina";
250 } 429 }
251 430
252 for my $face ($o->{face} || (), @{$anim || []}) { 431 for my $face ($o->{face} || (), @{$anim || []}) {
253 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 432 next if $face =~ /^facings\s/;
254 433
255 my $info = $FACEINFO{$face} ||= {}; 434 my $info = $FACEINFO{$face} ||= { };
435 $info->{arc} = $o;
436
437 next if $face =~ /^blank.x11$|^empty.x11$/;
256 438
257 $info->{visibility} = $visibility if defined $visibility; 439 $info->{visibility} = $visibility if defined $visibility;
258 $info->{magicmap} = $magicmap if defined $magicmap; 440 $info->{magicmap} = $magicmap if defined $magicmap;
259 } 441 }
260 442
261 if (my $smooth = delete $o->{smoothface}) { 443 if (my $smooth = delete $o->{smoothface}) {
262 my ($face, $smooth) = split /\s+/, $smooth; 444 my %kv = split /\s+/, $smooth;
263 # skip empty_S.x11, it seems to server no purpose whatsoever 445 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
264 # but increases bandwidth demands and worse. 446 while (my ($face, $smooth) = each %kv) {
265 unless ($smooth eq "empty_S.x11") { 447 $FACEINFO{$smooth}{arc} = $o;
448
266 $FACEINFO{$face}{smooth} = $smooth; 449 $FACEINFO{$face}{smooth} = $smooth;
450 $FACEINFO{$face}{smoothlevel} = $level;
267 } 451 }
268 } 452 }
269 } 453 }
270 } 454 }
271 } 455 }
272 } 456 }
273 457
274 sub process_trs { 458 sub process_trs {
275 while (@trs) { 459 while (my $job = $c_trs->get) {
276 my ($dir, $file) = @{pop @trs}; 460 my ($dir, $file) = @$job;
277 my $path = "$dir/$file"; 461 my $path = "$dir/$file";
278 462
279 my $trs; 463 my $trs;
280 if (0 > aio_load $path, $trs) { 464 if (0 > aio_load $path, $trs) {
281 warn "$path: $!, skipping.\n"; 465 warn "$path: $!, skipping.\n";
… …
284 468
285 $TRS .= $trs; 469 $TRS .= $trs;
286 } 470 }
287 } 471 }
288 472
473 my %FILECACHE;
474
475 sub load_cached($;$) {
476 unless (exists $FILECACHE{$_[0]}) {
477 my $data;
478 if (0 < aio_load $_[0], $data) {
479 if ($_[1]) {
480 $data = eval { $_[1]->($data) };
481 warn "$_[0]: $@" if $@;
482 }
483 }
484
485 $FILECACHE{$_[0]} = $data;
486 }
487
488 $FILECACHE{$_[0]}
489 }
490
491 sub process_res {
492 while (my $job = $c_res->get) {
493 my ($dir, $file, $type) = @$job;
494
495 my $data;
496 aio_load "$dir/$file", $data;
497
498 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
499
500 next if $meta && !exists $meta->{$file};
501
502 $meta = {
503 %{ $meta->{"" } || {} },
504 %{ $meta->{$file} || {} },
505 };
506
507 if ($meta->{license} =~ s/^#//) {
508 $meta->{license} = ({
509 "pd" => "Public Domain",
510 "gpl" => "GNU General Public License, version 3.0 or any later",
511 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
512 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
513 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
514 })->{$meta->{license}}
515 || warn "$dir/$file: license tag '$meta->{license}' not found.";
516 }
517
518 $file =~ s/\.res$//;
519 $file =~ s/\.(ogg|wav|jpg|png)$//;
520
521 substr $dir, 0, 1 + length $PATH, "";
522
523 $RESOURCE{"$dir/$file"} = {
524 type => (delete $meta->{type}) || $type,
525 data => $data,
526 chksum => (Digest::MD5::md5 $data),
527 %$meta ? (meta => $meta) : (),
528 };
529 }
530 }
531
289 sub find_files; 532 sub find_files;
290 sub find_files { 533 sub find_files {
291 my ($path) = @_; 534 my ($path) = @_;
292 535
293 IO::AIO::aioreq_pri 4; 536 IO::AIO::aioreq_pri 4;
… …
295 my ($dirs, $nondirs) = @_; 538 my ($dirs, $nondirs) = @_;
296 539
297 find_files "$path/$_" 540 find_files "$path/$_"
298 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 541 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
299 542
543 my $dir = $path;
544 substr $dir, 0, 1 + length $PATH, "";
545
300 for my $file (@$nondirs) { 546 for my $file (@$nondirs) {
547 if ($dir =~ /^music(?:\/|$)/) {
548 $c_res->put ([$path, $file, 3]) # FT_MUSIC
549 if $file =~ /\.(ogg)$/;
550
551 } elsif ($dir =~ /^sound(?:\/|$)/) {
552 $c_res->put ([$path, $file, 5]) # FT_SOUND
553 if $file =~ /\.(wav|ogg)$/;
554
555 } elsif ($dir =~ /^res(?:\/|$)/) {
556 $c_res->put ([$path, $file, 0]) # FT_FACE
557 if $file =~ /\.(jpg|png)$/;
558 $c_res->put ([$path, $file, 7]) # FT_RSRC
559 if $file =~ /\.(res)$/;
560
301 if ($file =~ /\.png$/) { 561 } elsif ($file =~ /\.png$/) {
302 push @png, "$path/$file"; 562 push @c_png, ["$path/$file", 0];
563
303 } elsif ($file =~ /\.trs$/) { 564 } elsif ($file =~ /\.trs$/) {
304 push @trs, [$path, $file]; 565 $c_trs->put ([$path, $file]);
566
305 } elsif ($file =~ /\.arc$/) { 567 } elsif ($file =~ /\.arc$/) {
306 push @arc, [$path, $file]; 568 $c_arc->put ([$path, $file]);
569
307 } else { 570 } else {
308 warn "ignoring $path/$file\n" if $VERBOSE >= 2; 571 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
309 } 572 }
310 } 573 }
311 }; 574 };
312 } 575 }
313 576
314 sub inst_arch($) { 577 sub inst_arch($) {
315 my (undef, $path) = @_; 578 my (undef, $path) = @_;
316 579
580 $PATH = $path;
581
582 print "\n",
317 print "installing '$path' to '$DATADIR'\n"; 583 "Installing '$path' to '$DATADIR'\n",
584 "\n",
585 "This can take a long time if you run this\n",
586 "for the first time or do not use --cache.\n",
587 "\n",
588 "Unless you run verbosely, all following warning\n",
589 "or error messages indicate serious problems.\n",
590 "\n";
318 591
319 if (!-d "$path/treasures") { 592 if (!-d "$path/treasures") {
320 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 593 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
321 exit 1 unless $FORCE; 594 exit 1 unless $FORCE;
322 } 595 }
323 596
597 print "scanning files...\n" if $VERBOSE;
598
324 find_files $path; 599 find_files $path;
600
601 my @a_arc = map +(async \&process_arc), 1..2;
602 my @a_res = map +(async \&process_res), 1..2;
603 my @a_trs = map +(async \&process_trs), 1..2;
604
325 IO::AIO::flush; 605 IO::AIO::flush;
326 606
327 $_->join for ( 607 $c_res->put (undef) for @a_res;
328 (async \&process_png), (async \&process_png), 608 $c_arc->put (undef) for @a_arc;
329 (async \&process_trs), (async \&process_trs), 609 $c_trs->put (undef) for @a_trs;
330 (async \&process_arc), (async \&process_arc),
331 );
332 610
611 print "start file scan, arc, res processing...\n" if $VERBOSE;
612
613 $_->join for @a_arc; # need to parse all archetypes before png processing
614
615 print "end arc, start png processing...\n" if $VERBOSE;
616
617 # four png crunchers work fine for my 2x smp machine
618 my @a_png = map +(async \&process_png), 1..4;
619
620 $_->join for (@a_trs, @a_res, @a_png);
621
622 print "scanning done, processing results...\n" if $VERBOSE;
333 { 623 {
334 open my $fh, ">:utf8", "$DATADIR/animations~" 624 # remove path prefix from editor_folder
335 or die "$DATADIR/animations~: $!"; 625 substr $_->{editor_folder}, 0, 1 + length $path, ""
336 print $fh join "", map $ANIM{$_}, sort keys %ANIM 626 for values %ARC;
627
628 print "resolving inheritance tree...\n" if $VERBOSE;
629 # resolve inherit
630 while () {
631 my $progress;
632 my $loop;
633
634 for my $o (values %ARC) {
635 if (my $other = $o->{inherit}) {
636 if (my $s = $ARC{$other}) {
637 if ($s->{inherit}) {
638 $loop = $s;
639 } else {
640 delete $o->{inherit};
641 my %s = %$s;
642 delete @s{qw(_name more name name_pl)};
643 %$o = ( %s, %$o );
644 ++$progress;
645 }
646 } else {
647 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
648 delete $ARC{$o->{_name}};
649 }
650 }
651 }
652
653 unless ($progress) {
654 die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
655 if $loop;
656
657 last;
658 }
337 } 659 }
338 660
339 { 661 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
662 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
663
664 print "writing archetypes...\n" if $VERBOSE;
340 open my $fh, ">:utf8", "$DATADIR/archetypes~" 665 open my $fh, ">:utf8", "$DATADIR/archetypes~"
341 or die "$DATADIR/archetypes~: $!"; 666 or die "$DATADIR/archetypes~: $!";
342 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; 667 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
343 print $fh Crossfire::archlist_to_string \@ARC;
344 } 668 }
345 669
346 { 670 {
671 print "writing treasures...\n" if $VERBOSE;
347 open my $fh, ">:utf8", "$DATADIR/treasures~" 672 open my $fh, ">:utf8", "$DATADIR/treasures~"
348 or die "$DATADIR/treasures~: $!"; 673 or die "$DATADIR/treasures~: $!";
349 print $fh $TRS; 674 print $fh $TRS;
350 } 675 }
351 676
352 { 677 {
353 while (my ($k, $v) = each %FACEINFO) { 678 print "processing facedata...\n" if $VERBOSE;
354 $v->{data32} ||= delete $PNG32{$k};
355 }
356
357 while (my ($k, $v) = each %FACEINFO) { 679 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"; 680 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
681 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
682
683 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
684 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
359 685
360 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 686 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
687 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
688
689 if (my $magicmap = $v->{magicmap}) {
690 $magicmap =~ y/A-Z_\-/a-z/d;
691 $v->{magicmap} = $COLOR{$magicmap};
361 } 692 }
362 693
694 delete $v->{arc};
695 }
696
697 print "writing facedata...\n" if $VERBOSE;
363 open my $fh, ">:perlio", "$DATADIR/faces~" 698 open my $fh, ">:perlio", "$DATADIR/facedata~"
364 or die "$DATADIR/faces~: $!"; 699 or die "$DATADIR/facedata~: $!";
365 700
366 $FACEINFO{""} = { version => 1}; 701 print $fh freeze {
367 print $fh Storable::nfreeze \%FACEINFO; 702 version => 2,
703 faceinfo => \%FACEINFO,
704 animinfo => \%ANIMINFO,
705 resource => \%RESOURCE,
368 } 706 };
707 }
369 708
709 print "committing files...\n" if $VERBOSE;
710
370 for (qw(archetypes faces animations treasures)) { 711 for (qw(archetypes facedata treasures)) {
371 chmod 0644, "$DATADIR/$_~"; 712 chmod 0644, "$DATADIR/$_~";
372 rename "$DATADIR/$_~", "$DATADIR/$_" 713 rename "$DATADIR/$_~", "$DATADIR/$_"
373 or die "$DATADIR/$_: $!"; 714 or die "$DATADIR/$_: $!";
374 } 715 }
375 716

Diff Legend

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