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.49 by root, Thu Aug 9 22:46:08 2007 UTC vs.
Revision 1.53 by root, Sun Aug 19 09:27:08 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
… …
170 # possibly enlarge 176 # possibly enlarge
171 if (0 > aio_stat "$stem.64x64.png") { 177 if (0 > aio_stat "$stem.64x64.png") {
172 my $other = "$stem.64x64.png~"; 178 my $other = "$stem.64x64.png~";
173 179
174 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 180 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175 my $wrap = 0; # for the time being
176 fork_sub { 181 fork_sub {
182 my $CROP;
183 my $SRC = "png:\Q$path\E";
184
185 # check if this is a wall. ultra-ugly. ultra-ultra-ugly.
186 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) {
187 my ($pfx, $dir, $sfx) = ($1, hex $2, $3);
188 #check for 0..F images to be sure(?) this is a wall
189 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) {
190 # add a 4px border and add other images around it
191 $CROP = "-shave 8x8 +repage";
192
193 $w += 8;
194 $h += 8;
195
196 $SRC = "-size ${w}x${h} xc:transparent";
197 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
198
199 # 8 surrounding images
200 for (
201 # x y b r0 r1
202 [-1, -1, 0, 6],
203 [ 0, -1, 1, 10, 14],
204 [+1, -1, 0, 12],
205
206 [-1, 0, 8, 5, 7],
207 #
208 [+1, 0, 2, 5, 13],
209
210 [-1, +1, 0, 3],
211 [ 0, +1, 4, 10, 11],
212 [+1, +1, 0, 9],
213 ) {
214 my ($x, $y, $d, $r0, $r1) = @$_;
215 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite",
216 "\Q$pfx",
217 ($dir & $d) ? $r1 : $r0,
218 "\Q$sfx",
219 $x * ($w - 8) + 4,
220 $y * ($h - 8) + 4;
221 }
222 }
223 }
224
177 system "convert png:\Q$path\E -depth 8 rgba:-" 225 system "convert -depth 8 $SRC rgba:-"
178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 226 . "| $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~" 227 . "| 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 $? ($!)"; 228 and die "convert/cfhq2xa pipeline error: status $? ($!)";
181 system $OPTIPNG, "-i0", "-q", "$other~"; 229 system $OPTIPNG, "-i0", "-q", "$other~";
182 die "$other~ has zero size, aborting." unless -s "$other~"; 230 die "$other~ has zero size, aborting." unless -s "$other~";
183 rename "$other~", $other; 231 rename "$other~", $other;
184 }; 232 };
185 } 233 }
186 234
187 push @png, [$other, !$CACHE]; 235 push @c_png, [$other, !$CACHE];
188 } 236 }
189 237
190 # possibly scale down 238 # possibly scale down
191 if (0 > aio_stat "$stem.32x32.png") { 239 if (0 > aio_stat "$stem.32x32.png") {
192 my $other = "$stem.32x32.png~"; 240 my $other = "$stem.32x32.png~";
… …
217 rename "$other~", $other; 265 rename "$other~", $other;
218 }; 266 };
219 } 267 }
220 268
221 #warn "scaled down $path to $other\n";#d# 269 #warn "scaled down $path to $other\n";#d#
222 push @png, [$other, !$CACHE]; 270 push @c_png, [$other, !$CACHE];
223 } 271 }
224 } 272 }
225 273
226 (my $face = $stem) =~ s/^.*\///; 274 (my $face = $stem) =~ s/^.*\///;
227 275
… …
288 aio_unlink $path if $delete; 336 aio_unlink $path if $delete;
289 } 337 }
290 } 338 }
291 339
292 sub process_arc { 340 sub process_arc {
293 while (@arc) { 341 while (my $job = $c_arc->get) {
294 my ($dir, $file) = @{pop @arc}; 342 my ($dir, $file) = @$job;
295 343
296 my $arc; 344 my $arc;
297 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 345 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
298 346
299 my $arc = read_arch "$dir/$file"; 347 my $arc = read_arch "$dir/$file";
… …
356 for my $face ($o->{face} || (), @{$anim || []}) { 404 for my $face ($o->{face} || (), @{$anim || []}) {
357 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 405 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
358 406
359 my $info = $FACEINFO{$face} ||= {}; 407 my $info = $FACEINFO{$face} ||= {};
360 408
409 $info->{arc} = $o;
361 $info->{visibility} = $visibility if defined $visibility; 410 $info->{visibility} = $visibility if defined $visibility;
362 $info->{magicmap} = $magicmap if defined $magicmap; 411 $info->{magicmap} = $magicmap if defined $magicmap;
363 } 412 }
364 413
365 if (my $smooth = delete $o->{smoothface}) { 414 if (my $smooth = delete $o->{smoothface}) {
… …
374 } 423 }
375 } 424 }
376 } 425 }
377 426
378 sub process_trs { 427 sub process_trs {
379 while (@trs) { 428 while (my $job = $c_trs->get) {
380 my ($dir, $file) = @{pop @trs}; 429 my ($dir, $file) = @$job;
381 my $path = "$dir/$file"; 430 my $path = "$dir/$file";
382 431
383 my $trs; 432 my $trs;
384 if (0 > aio_load $path, $trs) { 433 if (0 > aio_load $path, $trs) {
385 warn "$path: $!, skipping.\n"; 434 warn "$path: $!, skipping.\n";
… …
407 456
408 $FILECACHE{$_[0]} 457 $FILECACHE{$_[0]}
409 } 458 }
410 459
411 sub process_res { 460 sub process_res {
412 while (@res) { 461 while (my $job = $c_res->get) {
413 my ($dir, $file, $type) = @{pop @res}; 462 my ($dir, $file, $type) = @$job;
414 463
415 my $data; 464 my $data;
416 aio_load "$dir/$file", $data; 465 aio_load "$dir/$file", $data;
417 466
418 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 467 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
419 468
420 return if $meta && !exists $meta->{$file}; 469 next if $meta && !exists $meta->{$file};
421 470
422 $meta = { 471 $meta = {
423 %{ $meta->{"" } || {} }, 472 %{ $meta->{"" } || {} },
424 %{ $meta->{$file} || {} }, 473 %{ $meta->{$file} || {} },
425 }; 474 };
… …
427 if ($meta->{license} =~ s/^#//) { 476 if ($meta->{license} =~ s/^#//) {
428 $meta->{license} = ({ 477 $meta->{license} = ({
429 "pd" => "Public Domain", 478 "pd" => "Public Domain",
430 "gpl" => "GNU General Public License, version 3.0 or any later", 479 "gpl" => "GNU General Public License, version 3.0 or any later",
431 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 480 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
432 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.5/", 481 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
433 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", 482 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
434 })->{$meta->{license}} 483 })->{$meta->{license}}
435 || warn "$dir/$file: license tag '$meta->{license}' not found."; 484 || warn "$dir/$file: license tag '$meta->{license}' not found.";
436 } 485 }
437 486
… …
463 my $dir = $path; 512 my $dir = $path;
464 substr $dir, 0, 1 + length $PATH, ""; 513 substr $dir, 0, 1 + length $PATH, "";
465 514
466 for my $file (@$nondirs) { 515 for my $file (@$nondirs) {
467 if ($dir =~ /^music(?:\/|$)/) { 516 if ($dir =~ /^music(?:\/|$)/) {
468 push @res, [$path, $file, 3] # FT_MUSIC 517 $c_res->put ([$path, $file, 3]) # FT_MUSIC
469 if $file =~ /\.(ogg)$/; 518 if $file =~ /\.(ogg)$/;
470 519
471 } elsif ($dir =~ /^sound(?:\/|$)/) { 520 } elsif ($dir =~ /^sound(?:\/|$)/) {
472 push @res, [$path, $file, 5] # FT_SOUND 521 $c_res->put ([$path, $file, 5]) # FT_SOUND
473 if $file =~ /\.(wav|ogg)$/; 522 if $file =~ /\.(wav|ogg)$/;
474 523
475 } elsif ($dir =~ /^res(?:\/|$)/) { 524 } elsif ($dir =~ /^res(?:\/|$)/) {
476 push @res, [$path, $file, 0] # FT_FACE 525 $c_res->put ([$path, $file, 0]) # FT_FACE
477 if $file =~ /\.(jpg|png)$/; 526 if $file =~ /\.(jpg|png)$/;
478 push @res, [$path, $file, 7] # FT_RSRC 527 $c_res->put ([$path, $file, 7]) # FT_RSRC
479 if $file =~ /\.(res)$/; 528 if $file =~ /\.(res)$/;
480 529
481 } elsif ($file =~ /\.png$/) { 530 } elsif ($file =~ /\.png$/) {
482 push @png, ["$path/$file", 0]; 531 push @c_png, ["$path/$file", 0];
483 532
484 } elsif ($file =~ /\.trs$/) { 533 } elsif ($file =~ /\.trs$/) {
485 push @trs, [$path, $file]; 534 $c_trs->put ([$path, $file]);
486 535
487 } elsif ($file =~ /\.arc$/) { 536 } elsif ($file =~ /\.arc$/) {
488 push @arc, [$path, $file]; 537 $c_arc->put ([$path, $file]);
489 538
490 } else { 539 } else {
491 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 540 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
492 } 541 }
493 } 542 }
… …
512 if (!-d "$path/treasures") { 561 if (!-d "$path/treasures") {
513 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 562 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
514 exit 1 unless $FORCE; 563 exit 1 unless $FORCE;
515 } 564 }
516 565
566 print "scanning files...\n" if $VERBOSE;
567
517 find_files $path; 568 find_files $path;
569
570 my @a_arc = map +(async \&process_arc), 1..2;
571 my @a_res = map +(async \&process_res), 1..2;
572 my @a_trs = map +(async \&process_trs), 1..2;
573
518 IO::AIO::flush; 574 IO::AIO::flush;
519 575
520 $_->join for ( 576 $c_res->put (undef) for @a_res;
577 $c_arc->put (undef) for @a_arc;
578 $c_trs->put (undef) for @a_trs;
579
580 print "start file scan, arc, res processing...\n" if $VERBOSE;
581
582 $_->join for @a_arc; # need to parse all archetypes before png processing
583
584 print "end arc, start png processing...\n" if $VERBOSE;
585
521 # four png crunchers work fine for my 2x smp machine 586 # four png crunchers work fine for my 2x smp machine
522 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 587 my @a_png = map +(async \&process_png), 1..4;
523 (async \&process_trs), (async \&process_trs),
524 (async \&process_arc), (async \&process_arc),
525 (async \&process_res), (async \&process_res),
526 );
527 588
589 $_->join for (@a_trs, @a_res, @a_png);
590
591 print "scanning done, processing results...\n" if $VERBOSE;
528 { 592 {
529 # remove path prefix from editor_folder 593 # remove path prefix from editor_folder
530 substr $_->{editor_folder}, 0, 1 + length $path, "" 594 substr $_->{editor_folder}, 0, 1 + length $path, ""
531 for values %ARC; 595 for values %ARC;
532 596
597 print "resolving inheritance tree...\n" if $VERBOSE;
533 # resolve inherit 598 # resolve inherit
534 while () { 599 while () {
535 my $progress; 600 my $progress;
536 my $loop; 601 my $loop;
537 602
… …
563 } 628 }
564 629
565 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 630 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
566 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 631 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
567 632
633 print "writing archetypes...\n" if $VERBOSE;
568 open my $fh, ">:utf8", "$DATADIR/archetypes~" 634 open my $fh, ">:utf8", "$DATADIR/archetypes~"
569 or die "$DATADIR/archetypes~: $!"; 635 or die "$DATADIR/archetypes~: $!";
570 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 636 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
571 } 637 }
572 638
573 { 639 {
640 print "writing treasures...\n" if $VERBOSE;
574 open my $fh, ">:utf8", "$DATADIR/treasures~" 641 open my $fh, ">:utf8", "$DATADIR/treasures~"
575 or die "$DATADIR/treasures~: $!"; 642 or die "$DATADIR/treasures~: $!";
576 print $fh $TRS; 643 print $fh $TRS;
577 } 644 }
578 645
579 { 646 {
647 print "processing facedata...\n" if $VERBOSE;
580 while (my ($k, $v) = each %FACEINFO) { 648 while (my ($k, $v) = each %FACEINFO) {
581 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 649 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
582 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 650 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
583 651
584 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 652 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
… …
589 657
590 if (my $magicmap = $v->{magicmap}) { 658 if (my $magicmap = $v->{magicmap}) {
591 $magicmap =~ y/A-Z_\-/a-z/d; 659 $magicmap =~ y/A-Z_\-/a-z/d;
592 $v->{magicmap} = $COLOR{$magicmap}; 660 $v->{magicmap} = $COLOR{$magicmap};
593 } 661 }
594 }
595 662
663 delete $v->{arc};
664 }
665
666 print "writing facedata...\n" if $VERBOSE;
596 open my $fh, ">:perlio", "$DATADIR/facedata~" 667 open my $fh, ">:perlio", "$DATADIR/facedata~"
597 or die "$DATADIR/facedata~: $!"; 668 or die "$DATADIR/facedata~: $!";
598 669
599 print $fh freeze { 670 print $fh freeze {
600 version => 2, 671 version => 2,
601 faceinfo => \%FACEINFO, 672 faceinfo => \%FACEINFO,
602 animinfo => \%ANIMINFO, 673 animinfo => \%ANIMINFO,
603 resource => \%RESOURCE, 674 resource => \%RESOURCE,
604 }; 675 };
605 } 676 }
677
678 print "committing files...\n" if $VERBOSE;
606 679
607 for (qw(archetypes facedata treasures)) { 680 for (qw(archetypes facedata treasures)) {
608 chmod 0644, "$DATADIR/$_~"; 681 chmod 0644, "$DATADIR/$_~";
609 rename "$DATADIR/$_~", "$DATADIR/$_" 682 rename "$DATADIR/$_~", "$DATADIR/$_"
610 or die "$DATADIR/$_: $!"; 683 or die "$DATADIR/$_: $!";

Diff Legend

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