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

Diff Legend

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