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.65 by root, Thu Dec 27 15:32:41 2007 UTC vs.
Revision 1.69 by root, Tue Jan 15 12:02:24 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 Deliantra; 23use Deliantra;
24use Coro; 24use Coro;
… …
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(&) {
… …
533 533
534 substr $dir, 0, 1 + length $PATH, ""; 534 substr $dir, 0, 1 + length $PATH, "";
535 535
536 if (my $filter = $meta->{cfutil_filter}) { 536 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") { 537 if ($filter eq "yaml2json") {
538 $data = JSON::XS::encode_json YAML::Syck::Load $data; 538 $data = JSON::XS::encode_json YAML::Load $data;
539 } elsif ($filter eq "json2json") { 539 } elsif ($filter eq "json2json") {
540 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); 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;
541 } else { 544 } else {
542 warn "$dir/$file: unknown filter $filter, skipping\n"; 545 warn "$dir/$file: unknown filter $filter, skipping\n";
543 } 546 }
544 } 547 }
545 548
… …
576 579
577 } elsif ($dir =~ /^res(?:\/|$)/) { 580 } elsif ($dir =~ /^res(?:\/|$)/) {
578 if ($file =~ /\.(jpg|png)$/) { 581 if ($file =~ /\.(jpg|png)$/) {
579 $c_res->put ([$path, $file, 0]) # FT_FACE 582 $c_res->put ([$path, $file, 0]) # FT_FACE
580 } elsif ($file =~ /\.(res)$/) { 583 } elsif ($file =~ /\.(res)$/) {
581 $c_res->put ([$path, $file, 7]) # FT_RSRC 584 $c_res->put ([$path, $file, 6]) # FT_RSRC
582 } else { 585 } else {
583 $c_res->put ([$path, $file, undef]); 586 $c_res->put ([$path, $file, undef]);
584 } 587 }
585 588
586 } elsif ($file =~ /\.png$/) { 589 } elsif ($file =~ /\.png$/) {
… …
637 640
638 $_->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
639 642
640 print "end arc, start png processing...\n" if $VERBOSE; 643 print "end arc, start png processing...\n" if $VERBOSE;
641 644
642 # four png crunchers work fine for my 2x smp machine 645 # eight png crunchers work fine for my 4x smp machine
643 my @a_png = map +(async \&process_png), 1..4; 646 my @a_png = map +(async \&process_png), 1..8;
644 647
645 $_->join for (@a_trs, @a_res, @a_png); 648 $_->join for (@a_trs, @a_res, @a_png);
646 649
647 print "scanning done, processing results...\n" if $VERBOSE; 650 print "scanning done, processing results...\n" if $VERBOSE;
648 { 651 {

Diff Legend

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