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.66 by root, Thu Dec 27 15:43:11 2007 UTC vs.
Revision 1.68 by root, Mon Jan 14 10:12:13 2008 UTC

14my $PNGNQ = "@PNGNQ@"; 14my $PNGNQ = "@PNGNQ@";
15 15
16use Getopt::Long; 16use Getopt::Long;
17use Coro::Event; 17use Coro::Event;
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;
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") { 541 } elsif ($filter eq "perl2json") {
542 $data = eval $data; die if $@; 542 $data = eval $data; die if $@;
543 $data = JSON::XS::encode_json $data; 543 $data = JSON::XS::encode_json $data;
579 579
580 } elsif ($dir =~ /^res(?:\/|$)/) { 580 } elsif ($dir =~ /^res(?:\/|$)/) {
581 if ($file =~ /\.(jpg|png)$/) { 581 if ($file =~ /\.(jpg|png)$/) {
582 $c_res->put ([$path, $file, 0]) # FT_FACE 582 $c_res->put ([$path, $file, 0]) # FT_FACE
583 } elsif ($file =~ /\.(res)$/) { 583 } elsif ($file =~ /\.(res)$/) {
584 $c_res->put ([$path, $file, 7]) # FT_RSRC 584 $c_res->put ([$path, $file, 6]) # FT_RSRC
585 } else { 585 } else {
586 $c_res->put ([$path, $file, undef]); 586 $c_res->put ([$path, $file, undef]);
587 } 587 }
588 588
589 } elsif ($file =~ /\.png$/) { 589 } elsif ($file =~ /\.png$/) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines