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.63 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.70 by root, Fri Dec 5 00:52:44 2008 UTC

… …
12my $OPTIPNG = "@OPTIPNG@"; 12my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 14my $PNGNQ = "@PNGNQ@";
15 15
16use Getopt::Long; 16use Getopt::Long;
17use Coro::Event; 17use Coro::EV;
18use AnyEvent; 18use AnyEvent;
19use YAML::Syck (); 19use YAML ();
20use JSON::XS (); 20use JSON::XS ();
21use IO::AIO (); 21use IO::AIO ();
22use File::Temp; 22use File::Temp;
23use Crossfire; 23use Deliantra;
24use Coro; 24use Coro 5.12;
25use Coro::AIO; 25use Coro::AIO;
26use Coro::Util; 26use Coro::Util;
27use POSIX (); 27use POSIX ();
28use Carp; 28use Carp;
29use Coro::Channel; 29use Coro::Channel;
… …
67 tan => 12, 67 tan => 12,
68); 68);
69 69
70END { system "rm", "-rf", $TMPDIR } 70END { system "rm", "-rf", $TMPDIR }
71 71
72Event->signal (signal => "INT", cb => sub { exit 1 }); 72my $s_INT = EV::signal INT => sub { exit 1 };
73Event->signal (signal => "TERM", cb => sub { exit 1 }); 73my $s_TERM = EV::signal TERM => sub { exit 1 };
74 74
75mkdir $TMPDIR, 0700 75mkdir $TMPDIR, 0700
76 or die "$TMPDIR: $!"; 76 or die "$TMPDIR: $!";
77 77
78sub fork_sub(&) { 78sub fork_sub(&) {
… …
507 utf8::decode $file; 507 utf8::decode $file;
508 508
509 # a meta file for resources is now mandatory 509 # a meta file for resources is now mandatory
510 unless (exists $meta->{$file}) { 510 unless (exists $meta->{$file}) {
511 warn "skipping $dir/$file\n" if $VERBOSE >= 3; 511 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
512 next;
512 } 513 }
513 514
514 $meta = { 515 $meta = {
515 %{ $meta->{"" } || {} }, 516 %{ $meta->{"" } || {} },
516 %{ $meta->{$file} || {} }, 517 %{ $meta->{$file} || {} },
… …
532 533
533 substr $dir, 0, 1 + length $PATH, ""; 534 substr $dir, 0, 1 + length $PATH, "";
534 535
535 if (my $filter = $meta->{cfutil_filter}) { 536 if (my $filter = $meta->{cfutil_filter}) {
536 if ($filter eq "yaml2json") { 537 if ($filter eq "yaml2json") {
537 $data = JSON::XS::encode_json YAML::Syck::Load $data; 538 $data = JSON::XS::encode_json YAML::Load $data;
539 } elsif ($filter eq "json2json") {
540 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
541 } elsif ($filter eq "perl2json") {
542 $data = eval $data; die if $@;
543 $data = JSON::XS::encode_json $data;
538 } else { 544 } else {
539 warn "$dir/$file: unknown filter $filter, skipping\n"; 545 warn "$dir/$file: unknown filter $filter, skipping\n";
540 } 546 }
541 } 547 }
542 548
… …
573 579
574 } elsif ($dir =~ /^res(?:\/|$)/) { 580 } elsif ($dir =~ /^res(?:\/|$)/) {
575 if ($file =~ /\.(jpg|png)$/) { 581 if ($file =~ /\.(jpg|png)$/) {
576 $c_res->put ([$path, $file, 0]) # FT_FACE 582 $c_res->put ([$path, $file, 0]) # FT_FACE
577 } elsif ($file =~ /\.(res)$/) { 583 } elsif ($file =~ /\.(res)$/) {
578 $c_res->put ([$path, $file, 7]) # FT_RSRC 584 $c_res->put ([$path, $file, 6]) # FT_RSRC
579 } else { 585 } else {
580 $c_res->put ([$path, $file, undef]); 586 $c_res->put ([$path, $file, undef]);
581 } 587 }
582 588
583 } elsif ($file =~ /\.png$/) { 589 } elsif ($file =~ /\.png$/) {
… …
624 my @a_res = map +(async \&process_res), 1..2; 630 my @a_res = map +(async \&process_res), 1..2;
625 my @a_trs = map +(async \&process_trs), 1..2; 631 my @a_trs = map +(async \&process_trs), 1..2;
626 632
627 IO::AIO::flush; 633 IO::AIO::flush;
628 634
629 $c_res->put (undef) for @a_res; 635 $c_res->shutdown;
630 $c_arc->put (undef) for @a_arc; 636 $c_arc->shutdown;
631 $c_trs->put (undef) for @a_trs; 637 $c_trs->shutdown;
632 638
633 print "start file scan, arc, res processing...\n" if $VERBOSE; 639 print "start file scan, arc, res processing...\n" if $VERBOSE;
634 640
635 $_->join for @a_arc; # need to parse all archetypes before png processing 641 $_->join for @a_arc; # need to parse all archetypes before png processing
636 642
637 print "end arc, start png processing...\n" if $VERBOSE; 643 print "end arc, start png processing...\n" if $VERBOSE;
638 644
639 # four png crunchers work fine for my 2x smp machine 645 # eight png crunchers work fine for my 4x smp machine
640 my @a_png = map +(async \&process_png), 1..4; 646 my @a_png = map +(async \&process_png), 1..8;
641 647
642 $_->join for (@a_trs, @a_res, @a_png); 648 $_->join for (@a_trs, @a_res, @a_png);
643 649
644 print "scanning done, processing results...\n" if $VERBOSE; 650 print "scanning done, processing results...\n" if $VERBOSE;
645 { 651 {
… …
684 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 690 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
685 691
686 print "writing archetypes...\n" if $VERBOSE; 692 print "writing archetypes...\n" if $VERBOSE;
687 open my $fh, ">:utf8", "$DATADIR/archetypes~" 693 open my $fh, ">:utf8", "$DATADIR/archetypes~"
688 or die "$DATADIR/archetypes~: $!"; 694 or die "$DATADIR/archetypes~: $!";
689 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 695 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
690 } 696 }
691 697
692 { 698 {
693 print "writing treasures...\n" if $VERBOSE; 699 print "writing treasures...\n" if $VERBOSE;
694 open my $fh, ">:utf8", "$DATADIR/treasures~" 700 open my $fh, ">:utf8", "$DATADIR/treasures~"

Diff Legend

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