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

Diff Legend

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