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.60 by root, Mon Aug 27 02:43:38 2007 UTC vs.
Revision 1.66 by root, Thu Dec 27 15:43:11 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;
… …
96 if (!-f "$path/regions") { 98 if (!-f "$path/regions") {
97 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 99 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
98 exit 1 unless $FORCE; 100 exit 1 unless $FORCE;
99 } 101 }
100 102
101 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 103 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
104 "$path/.", "$DATADIR/maps/.",
105 "--exclude", "CVS", "--exclude", "/world-precomposed",
106 "--delete", "--delete-excluded"
102 and die "map installation failed.\n"; 107 and die "map installation failed.\n";
103 108
104 print "maps installed successfully.\n"; 109 print "maps installed successfully.\n";
105} 110}
106 111
… …
496 my $data; 501 my $data;
497 aio_load "$dir/$file", $data; 502 aio_load "$dir/$file", $data;
498 503
499 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) };
500 505
501 next if $meta && !exists $meta->{$file}; 506 utf8::decode $dir;
507 utf8::decode $file;
508
509 # a meta file for resources is now mandatory
510 unless (exists $meta->{$file}) {
511 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
512 next;
513 }
502 514
503 $meta = { 515 $meta = {
504 %{ $meta->{"" } || {} }, 516 %{ $meta->{"" } || {} },
505 %{ $meta->{$file} || {} }, 517 %{ $meta->{$file} || {} },
506 }; 518 };
… …
519 $file =~ s/\.res$//; 531 $file =~ s/\.res$//;
520 $file =~ s/\.(ogg|wav|jpg|png)$//; 532 $file =~ s/\.(ogg|wav|jpg|png)$//;
521 533
522 substr $dir, 0, 1 + length $PATH, ""; 534 substr $dir, 0, 1 + length $PATH, "";
523 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 } elsif ($filter eq "perl2json") {
542 $data = eval $data; die if $@;
543 $data = JSON::XS::encode_json $data;
544 } else {
545 warn "$dir/$file: unknown filter $filter, skipping\n";
546 }
547 }
548
524 $RESOURCE{"$dir/$file"} = { 549 $RESOURCE{"$dir/$file"} = {
525 type => (delete $meta->{type}) || $type, 550 type => (exists $meta->{type} ? delete $meta->{type} : $type),
526 data => $data, 551 data => $data,
527 %$meta ? (meta => $meta) : (), 552 %$meta ? (meta => $meta) : (),
528 }; 553 };
529 } 554 }
530 } 555 }
… …
551 } elsif ($dir =~ /^sound(?:\/|$)/) { 576 } elsif ($dir =~ /^sound(?:\/|$)/) {
552 $c_res->put ([$path, $file, 5]) # FT_SOUND 577 $c_res->put ([$path, $file, 5]) # FT_SOUND
553 if $file =~ /\.(wav|ogg)$/; 578 if $file =~ /\.(wav|ogg)$/;
554 579
555 } elsif ($dir =~ /^res(?:\/|$)/) { 580 } elsif ($dir =~ /^res(?:\/|$)/) {
581 if ($file =~ /\.(jpg|png)$/) {
556 $c_res->put ([$path, $file, 0]) # FT_FACE 582 $c_res->put ([$path, $file, 0]) # FT_FACE
557 if $file =~ /\.(jpg|png)$/; 583 } elsif ($file =~ /\.(res)$/) {
558 $c_res->put ([$path, $file, 7]) # FT_RSRC 584 $c_res->put ([$path, $file, 7]) # FT_RSRC
559 if $file =~ /\.(res)$/; 585 } else {
586 $c_res->put ([$path, $file, undef]);
587 }
560 588
561 } elsif ($file =~ /\.png$/) { 589 } elsif ($file =~ /\.png$/) {
562 push @c_png, ["$path/$file", 0]; 590 push @c_png, ["$path/$file", 0];
563 591
564 } elsif ($file =~ /\.trs$/) { 592 } elsif ($file =~ /\.trs$/) {
… …
662 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 690 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
663 691
664 print "writing archetypes...\n" if $VERBOSE; 692 print "writing archetypes...\n" if $VERBOSE;
665 open my $fh, ">:utf8", "$DATADIR/archetypes~" 693 open my $fh, ">:utf8", "$DATADIR/archetypes~"
666 or die "$DATADIR/archetypes~: $!"; 694 or die "$DATADIR/archetypes~: $!";
667 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];
668 } 696 }
669 697
670 { 698 {
671 print "writing treasures...\n" if $VERBOSE; 699 print "writing treasures...\n" if $VERBOSE;
672 open my $fh, ">:utf8", "$DATADIR/treasures~" 700 open my $fh, ">:utf8", "$DATADIR/treasures~"

Diff Legend

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