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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines