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.43 by root, Mon Jul 23 23:38:18 2007 UTC vs.
Revision 1.55 by root, Sun Aug 19 13:45:43 2007 UTC

… …
19use IO::AIO (); 19use IO::AIO ();
20use File::Temp; 20use File::Temp;
21use Crossfire; 21use Crossfire;
22use Coro; 22use Coro;
23use Coro::AIO; 23use Coro::AIO;
24use Coro::Util;
24use POSIX (); 25use POSIX ();
25use Digest::MD5; 26use Digest::MD5;
26use Carp; 27use Carp;
28use Coro::Channel;
27use Coro::Storable; $Storable::canonical = 1; 29use Coro::Storable; $Storable::canonical = 1;
28 30
29$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 31$SIG{QUIT} = sub { Carp::cluck "QUIT" };
30 32
31sub usage { 33sub usage {
… …
113 our $NFILE; 115 our $NFILE;
114 our $PATH; 116 our $PATH;
115 117
116 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 118 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
117 119
118 our (@png, @trs, @arc, @res); # files we are interested in 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;
119 125
120 sub commit_png($$$) { 126 sub commit_png($$$) {
121 my ($name, $data, $T) = @_; 127 my ($name, $data, $T) = @_;
122 128
123 $FACEINFO{$name}{"data$T"} = $data; 129 $FACEINFO{$name}{"data$T"} = $data;
124 } 130 }
125 131
126 sub process_png { 132 sub process_png {
127 while (@png) { 133 while (@c_png) {
128 my ($path, $delete) = @{pop @png}; 134 my ($path, $delete) = @{pop @c_png};
129 135
130 my $png; 136 my $png;
131 aio_lstat $path; 137 aio_lstat $path;
132 my ($size, $mtime) = (stat _)[7,9]; 138 my ($size, $mtime) = (stat _)[7,9];
133 139
… …
164 if ($w % $T || $h % $T) { 170 if ($w % $T || $h % $T) {
165 warn "$path: weird png size ($w $h), skipping.\n"; 171 warn "$path: weird png size ($w $h), skipping.\n";
166 next; 172 next;
167 } 173 }
168 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
169 unless ($path =~ /~$/) { 186 unless ($path =~ /~$/) {
170 # possibly enlarge 187 # possibly enlarge
171 if (0 > aio_stat "$stem.64x64.png") { 188 if (0 > aio_stat "$stem.64x64.png") {
172 my $other = "$stem.64x64.png~"; 189 my $other = "$stem.64x64.png~";
173 190
174 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 191 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175 my $wrap = 0; # for the time being
176 fork_sub { 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
177 system "convert png:\Q$path\E -depth 8 rgba:-" 252 system "convert -depth 8 $SRC rgba:-"
178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 253 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
179 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 254 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
180 and die "convert/hq2xa pipeline error: status $? ($!)"; 255 and die "convert/cfhq2xa pipeline error: status $? ($!)";
181 system $OPTIPNG, "-i0", "-q", "$other~"; 256 system $OPTIPNG, "-i0", "-q", "$other~";
182 die "$other~ has zero size, aborting." unless -s "$other~"; 257 die "$other~ has zero size, aborting." unless -s "$other~";
183 rename "$other~", $other; 258 rename "$other~", $other;
184 }; 259 };
185 } 260 }
186 261
187 push @png, [$other, !$CACHE]; 262 push @c_png, [$other, !$CACHE];
188 } 263 }
189 264
190 # possibly scale down 265 # possibly scale down
191 if (0 > aio_stat "$stem.32x32.png") { 266 if (0 > aio_stat "$stem.32x32.png") {
192 my $other = "$stem.32x32.png~"; 267 my $other = "$stem.32x32.png~";
… …
217 rename "$other~", $other; 292 rename "$other~", $other;
218 }; 293 };
219 } 294 }
220 295
221 #warn "scaled down $path to $other\n";#d# 296 #warn "scaled down $path to $other\n";#d#
222 push @png, [$other, !$CACHE]; 297 push @c_png, [$other, !$CACHE];
223 } 298 }
224 } 299 }
225 300
226 (my $face = $stem) =~ s/^.*\///; 301 (my $face = $stem) =~ s/^.*\///;
227 302
… …
288 aio_unlink $path if $delete; 363 aio_unlink $path if $delete;
289 } 364 }
290 } 365 }
291 366
292 sub process_arc { 367 sub process_arc {
293 while (@arc) { 368 while (my $job = $c_arc->get) {
294 my ($dir, $file) = @{pop @arc}; 369 my ($dir, $file) = @$job;
295 370
296 my $arc; 371 my $arc;
297 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 :/
298 373
299 my $arc = read_arch "$dir/$file"; 374 my $arc = read_arch "$dir/$file";
… …
356 for my $face ($o->{face} || (), @{$anim || []}) { 431 for my $face ($o->{face} || (), @{$anim || []}) {
357 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 432 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
358 433
359 my $info = $FACEINFO{$face} ||= {}; 434 my $info = $FACEINFO{$face} ||= {};
360 435
436 $info->{arc} = $o;
361 $info->{visibility} = $visibility if defined $visibility; 437 $info->{visibility} = $visibility if defined $visibility;
362 $info->{magicmap} = $magicmap if defined $magicmap; 438 $info->{magicmap} = $magicmap if defined $magicmap;
363 } 439 }
364 440
365 if (my $smooth = delete $o->{smoothface}) { 441 if (my $smooth = delete $o->{smoothface}) {
366 my %kv =split /\s+/, $smooth; 442 my %kv = split /\s+/, $smooth;
367 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 443 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
368 while (my ($face, $smooth) = each %kv) { 444 while (my ($face, $smooth) = each %kv) {
445 $FACEINFO{$smooth}{arc} = $o;
446
369 $FACEINFO{$face}{smooth} = $smooth; 447 $FACEINFO{$face}{smooth} = $smooth;
370 $FACEINFO{$face}{smoothlevel} = $level; 448 $FACEINFO{$face}{smoothlevel} = $level;
371 } 449 }
372 } 450 }
373 } 451 }
374 } 452 }
375 } 453 }
376 } 454 }
377 455
378 sub process_trs { 456 sub process_trs {
379 while (@trs) { 457 while (my $job = $c_trs->get) {
380 my ($dir, $file) = @{pop @trs}; 458 my ($dir, $file) = @$job;
381 my $path = "$dir/$file"; 459 my $path = "$dir/$file";
382 460
383 my $trs; 461 my $trs;
384 if (0 > aio_load $path, $trs) { 462 if (0 > aio_load $path, $trs) {
385 warn "$path: $!, skipping.\n"; 463 warn "$path: $!, skipping.\n";
… …
388 466
389 $TRS .= $trs; 467 $TRS .= $trs;
390 } 468 }
391 } 469 }
392 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
393 sub process_res { 489 sub process_res {
394 while (@res) { 490 while (my $job = $c_res->get) {
395 my ($dir, $file) = @{pop @res}; 491 my ($dir, $file, $type) = @$job;
396 492
397 my $data; 493 my $data;
398 aio_load "$dir/$file", $data; 494 aio_load "$dir/$file", $data;
399 495
400 my $copyright; 496 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
401 aio_load "$dir/copyright", $copyright; 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 }
402 515
403 $file =~ s/\.res$//; 516 $file =~ s/\.res$//;
404 $file =~ /\.([^.]+)$/ 517 $file =~ s/\.(ogg|wav|jpg|png)$//;
405 or next;
406
407 my $type = $1;
408 518
409 substr $dir, 0, 1 + length $PATH, ""; 519 substr $dir, 0, 1 + length $PATH, "";
410 520
411 $RESOURCE{"$dir/$file"} = { 521 $RESOURCE{"$dir/$file"} = {
412 type => $1, 522 type => (delete $meta->{type}) || $type,
413 copyright => $copyright,
414 data => $data, 523 data => $data,
415 chksum => Digest::MD5::md5 $data, 524 chksum => (Digest::MD5::md5 $data),
525 %$meta ? (meta => $meta) : (),
416 }; 526 };
417 } 527 }
418 } 528 }
419 529
420 sub find_files; 530 sub find_files;
… …
430 540
431 my $dir = $path; 541 my $dir = $path;
432 substr $dir, 0, 1 + length $PATH, ""; 542 substr $dir, 0, 1 + length $PATH, "";
433 543
434 for my $file (@$nondirs) { 544 for my $file (@$nondirs) {
435 if ($file =~ /\.(ogg|jpg|res)$/ || $dir =~ /^res(?:\/|$)/) { 545 if ($dir =~ /^music(?:\/|$)/) {
436 push @res, [$path, $file]; 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
437 } elsif ($file =~ /\.png$/) { 559 } elsif ($file =~ /\.png$/) {
438 push @png, ["$path/$file", 0]; 560 push @c_png, ["$path/$file", 0];
561
439 } elsif ($file =~ /\.trs$/) { 562 } elsif ($file =~ /\.trs$/) {
440 push @trs, [$path, $file]; 563 $c_trs->put ([$path, $file]);
564
441 } elsif ($file =~ /\.arc$/) { 565 } elsif ($file =~ /\.arc$/) {
442 push @arc, [$path, $file]; 566 $c_arc->put ([$path, $file]);
567
443 } else { 568 } else {
444 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 569 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
445 } 570 }
446 } 571 }
447 }; 572 };
… …
465 if (!-d "$path/treasures") { 590 if (!-d "$path/treasures") {
466 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";
467 exit 1 unless $FORCE; 592 exit 1 unless $FORCE;
468 } 593 }
469 594
595 print "scanning files...\n" if $VERBOSE;
596
470 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
471 IO::AIO::flush; 603 IO::AIO::flush;
472 604
473 $_->join for ( 605 $c_res->put (undef) for @a_res;
606 $c_arc->put (undef) for @a_arc;
607 $c_trs->put (undef) for @a_trs;
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
474 # four png crunchers work fine for my 2x smp machine 615 # four png crunchers work fine for my 2x smp machine
475 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 616 my @a_png = map +(async \&process_png), 1..4;
476 (async \&process_trs), (async \&process_trs),
477 (async \&process_arc), (async \&process_arc),
478 (async \&process_res), (async \&process_res),
479 );
480 617
618 $_->join for (@a_trs, @a_res, @a_png);
619
620 print "scanning done, processing results...\n" if $VERBOSE;
481 { 621 {
482 # remove path prefix from editor_folder 622 # remove path prefix from editor_folder
483 substr $_->{editor_folder}, 0, 1 + length $path, "" 623 substr $_->{editor_folder}, 0, 1 + length $path, ""
484 for values %ARC; 624 for values %ARC;
485 625
626 print "resolving inheritance tree...\n" if $VERBOSE;
486 # resolve inherit 627 # resolve inherit
487 while () { 628 while () {
488 my $progress; 629 my $progress;
489 my $loop; 630 my $loop;
490 631
… …
516 } 657 }
517 658
518 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 659 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
519 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 660 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
520 661
662 print "writing archetypes...\n" if $VERBOSE;
521 open my $fh, ">:utf8", "$DATADIR/archetypes~" 663 open my $fh, ">:utf8", "$DATADIR/archetypes~"
522 or die "$DATADIR/archetypes~: $!"; 664 or die "$DATADIR/archetypes~: $!";
523 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 665 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
524 } 666 }
525 667
526 { 668 {
669 print "writing treasures...\n" if $VERBOSE;
527 open my $fh, ">:utf8", "$DATADIR/treasures~" 670 open my $fh, ">:utf8", "$DATADIR/treasures~"
528 or die "$DATADIR/treasures~: $!"; 671 or die "$DATADIR/treasures~: $!";
529 print $fh $TRS; 672 print $fh $TRS;
530 } 673 }
531 674
532 { 675 {
676 print "processing facedata...\n" if $VERBOSE;
533 while (my ($k, $v) = each %FACEINFO) { 677 while (my ($k, $v) = each %FACEINFO) {
534 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";
535 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 679 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
536 680
537 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 681 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
… …
542 686
543 if (my $magicmap = $v->{magicmap}) { 687 if (my $magicmap = $v->{magicmap}) {
544 $magicmap =~ y/A-Z_\-/a-z/d; 688 $magicmap =~ y/A-Z_\-/a-z/d;
545 $v->{magicmap} = $COLOR{$magicmap}; 689 $v->{magicmap} = $COLOR{$magicmap};
546 } 690 }
547 }
548 691
692 delete $v->{arc};
693 }
694
695 print "writing facedata...\n" if $VERBOSE;
549 open my $fh, ">:perlio", "$DATADIR/facedata~" 696 open my $fh, ">:perlio", "$DATADIR/facedata~"
550 or die "$DATADIR/facedata~: $!"; 697 or die "$DATADIR/facedata~: $!";
551 698
552 print $fh freeze { 699 print $fh freeze {
553 version => 2, 700 version => 2,
554 faceinfo => \%FACEINFO, 701 faceinfo => \%FACEINFO,
555 animinfo => \%ANIMINFO, 702 animinfo => \%ANIMINFO,
556 resource => \%RESOURCE, 703 resource => \%RESOURCE,
557 }; 704 };
558 } 705 }
706
707 print "committing files...\n" if $VERBOSE;
559 708
560 for (qw(archetypes facedata treasures)) { 709 for (qw(archetypes facedata treasures)) {
561 chmod 0644, "$DATADIR/$_~"; 710 chmod 0644, "$DATADIR/$_~";
562 rename "$DATADIR/$_~", "$DATADIR/$_" 711 rename "$DATADIR/$_~", "$DATADIR/$_"
563 or die "$DATADIR/$_: $!"; 712 or die "$DATADIR/$_: $!";

Diff Legend

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