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.62 by root, Mon Sep 10 18:30:30 2007 UTC vs.
Revision 1.65 by root, Thu Dec 27 15:32:41 2007 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 ();
20use JSON::XS ();
19use IO::AIO (); 21use IO::AIO ();
20use File::Temp; 22use File::Temp;
21use Crossfire; 23use Deliantra;
22use Coro; 24use Coro;
23use Coro::AIO; 25use Coro::AIO;
24use Coro::Util; 26use Coro::Util;
25use POSIX (); 27use POSIX ();
26use Carp; 28use Carp;
… …
497 my ($dir, $file, $type) = @$job; 499 my ($dir, $file, $type) = @$job;
498 500
499 my $data; 501 my $data;
500 aio_load "$dir/$file", $data; 502 aio_load "$dir/$file", $data;
501 503
502
503 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; 504 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
504 505
505 utf8::decode $dir; 506 utf8::decode $dir;
506 utf8::decode $file; 507 utf8::decode $file;
507 508
… …
530 $file =~ s/\.res$//; 531 $file =~ s/\.res$//;
531 $file =~ s/\.(ogg|wav|jpg|png)$//; 532 $file =~ s/\.(ogg|wav|jpg|png)$//;
532 533
533 substr $dir, 0, 1 + length $PATH, ""; 534 substr $dir, 0, 1 + length $PATH, "";
534 535
536 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") {
538 $data = JSON::XS::encode_json YAML::Syck::Load $data;
539 } elsif ($filter eq "json2json") {
540 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
541 } else {
542 warn "$dir/$file: unknown filter $filter, skipping\n";
543 }
544 }
545
535 $RESOURCE{"$dir/$file"} = { 546 $RESOURCE{"$dir/$file"} = {
536 type => (delete $meta->{type}) || $type, 547 type => (exists $meta->{type} ? delete $meta->{type} : $type),
537 data => $data, 548 data => $data,
538 %$meta ? (meta => $meta) : (), 549 %$meta ? (meta => $meta) : (),
539 }; 550 };
540 } 551 }
541 } 552 }
… …
562 } elsif ($dir =~ /^sound(?:\/|$)/) { 573 } elsif ($dir =~ /^sound(?:\/|$)/) {
563 $c_res->put ([$path, $file, 5]) # FT_SOUND 574 $c_res->put ([$path, $file, 5]) # FT_SOUND
564 if $file =~ /\.(wav|ogg)$/; 575 if $file =~ /\.(wav|ogg)$/;
565 576
566 } elsif ($dir =~ /^res(?:\/|$)/) { 577 } elsif ($dir =~ /^res(?:\/|$)/) {
578 if ($file =~ /\.(jpg|png)$/) {
567 $c_res->put ([$path, $file, 0]) # FT_FACE 579 $c_res->put ([$path, $file, 0]) # FT_FACE
568 if $file =~ /\.(jpg|png)$/; 580 } elsif ($file =~ /\.(res)$/) {
569 $c_res->put ([$path, $file, 7]) # FT_RSRC 581 $c_res->put ([$path, $file, 7]) # FT_RSRC
570 if $file =~ /\.(res)$/; 582 } else {
583 $c_res->put ([$path, $file, undef]);
584 }
571 585
572 } elsif ($file =~ /\.png$/) { 586 } elsif ($file =~ /\.png$/) {
573 push @c_png, ["$path/$file", 0]; 587 push @c_png, ["$path/$file", 0];
574 588
575 } elsif ($file =~ /\.trs$/) { 589 } elsif ($file =~ /\.trs$/) {
… …
673 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 687 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
674 688
675 print "writing archetypes...\n" if $VERBOSE; 689 print "writing archetypes...\n" if $VERBOSE;
676 open my $fh, ">:utf8", "$DATADIR/archetypes~" 690 open my $fh, ">:utf8", "$DATADIR/archetypes~"
677 or die "$DATADIR/archetypes~: $!"; 691 or die "$DATADIR/archetypes~: $!";
678 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 692 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
679 } 693 }
680 694
681 { 695 {
682 print "writing treasures...\n" if $VERBOSE; 696 print "writing treasures...\n" if $VERBOSE;
683 open my $fh, ">:utf8", "$DATADIR/treasures~" 697 open my $fh, ">:utf8", "$DATADIR/treasures~"

Diff Legend

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