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.61 by root, Thu Aug 30 07:13:17 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 ();
20use JSON::XS ();
19use IO::AIO (); 21use IO::AIO ();
20use File::Temp; 22use File::Temp;
21use Crossfire; 23use Deliantra;
22use Coro; 24use Coro 5.12;
23use Coro::AIO; 25use Coro::AIO;
24use Coro::Util; 26use Coro::Util;
25use POSIX (); 27use POSIX ();
26use Carp; 28use Carp;
27use Coro::Channel; 29use Coro::Channel;
… …
65 tan => 12, 67 tan => 12,
66); 68);
67 69
68END { system "rm", "-rf", $TMPDIR } 70END { system "rm", "-rf", $TMPDIR }
69 71
70Event->signal (signal => "INT", cb => sub { exit 1 }); 72my $s_INT = EV::signal INT => sub { exit 1 };
71Event->signal (signal => "TERM", cb => sub { exit 1 }); 73my $s_TERM = EV::signal TERM => sub { exit 1 };
72 74
73mkdir $TMPDIR, 0700 75mkdir $TMPDIR, 0700
74 or die "$TMPDIR: $!"; 76 or die "$TMPDIR: $!";
75 77
76sub fork_sub(&) { 78sub fork_sub(&) {
… …
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
… …
494 my ($dir, $file, $type) = @$job; 499 my ($dir, $file, $type) = @$job;
495 500
496 my $data; 501 my $data;
497 aio_load "$dir/$file", $data; 502 aio_load "$dir/$file", $data;
498 503
499
500 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) };
501 505
502 utf8::decode $dir; 506 utf8::decode $dir;
503 utf8::decode $file; 507 utf8::decode $file;
504 508
… …
527 $file =~ s/\.res$//; 531 $file =~ s/\.res$//;
528 $file =~ s/\.(ogg|wav|jpg|png)$//; 532 $file =~ s/\.(ogg|wav|jpg|png)$//;
529 533
530 substr $dir, 0, 1 + length $PATH, ""; 534 substr $dir, 0, 1 + length $PATH, "";
531 535
536 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") {
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;
544 } else {
545 warn "$dir/$file: unknown filter $filter, skipping\n";
546 }
547 }
548
532 $RESOURCE{"$dir/$file"} = { 549 $RESOURCE{"$dir/$file"} = {
533 type => (delete $meta->{type}) || $type, 550 type => (exists $meta->{type} ? delete $meta->{type} : $type),
534 data => $data, 551 data => $data,
535 %$meta ? (meta => $meta) : (), 552 %$meta ? (meta => $meta) : (),
536 }; 553 };
537 } 554 }
538 } 555 }
… …
559 } elsif ($dir =~ /^sound(?:\/|$)/) { 576 } elsif ($dir =~ /^sound(?:\/|$)/) {
560 $c_res->put ([$path, $file, 5]) # FT_SOUND 577 $c_res->put ([$path, $file, 5]) # FT_SOUND
561 if $file =~ /\.(wav|ogg)$/; 578 if $file =~ /\.(wav|ogg)$/;
562 579
563 } elsif ($dir =~ /^res(?:\/|$)/) { 580 } elsif ($dir =~ /^res(?:\/|$)/) {
581 if ($file =~ /\.(jpg|png)$/) {
564 $c_res->put ([$path, $file, 0]) # FT_FACE 582 $c_res->put ([$path, $file, 0]) # FT_FACE
565 if $file =~ /\.(jpg|png)$/; 583 } elsif ($file =~ /\.(res)$/) {
566 $c_res->put ([$path, $file, 7]) # FT_RSRC 584 $c_res->put ([$path, $file, 6]) # FT_RSRC
567 if $file =~ /\.(res)$/; 585 } else {
586 $c_res->put ([$path, $file, undef]);
587 }
568 588
569 } elsif ($file =~ /\.png$/) { 589 } elsif ($file =~ /\.png$/) {
570 push @c_png, ["$path/$file", 0]; 590 push @c_png, ["$path/$file", 0];
571 591
572 } elsif ($file =~ /\.trs$/) { 592 } elsif ($file =~ /\.trs$/) {
… …
610 my @a_res = map +(async \&process_res), 1..2; 630 my @a_res = map +(async \&process_res), 1..2;
611 my @a_trs = map +(async \&process_trs), 1..2; 631 my @a_trs = map +(async \&process_trs), 1..2;
612 632
613 IO::AIO::flush; 633 IO::AIO::flush;
614 634
615 $c_res->put (undef) for @a_res; 635 $c_res->shutdown;
616 $c_arc->put (undef) for @a_arc; 636 $c_arc->shutdown;
617 $c_trs->put (undef) for @a_trs; 637 $c_trs->shutdown;
618 638
619 print "start file scan, arc, res processing...\n" if $VERBOSE; 639 print "start file scan, arc, res processing...\n" if $VERBOSE;
620 640
621 $_->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
622 642
623 print "end arc, start png processing...\n" if $VERBOSE; 643 print "end arc, start png processing...\n" if $VERBOSE;
624 644
625 # four png crunchers work fine for my 2x smp machine 645 # eight png crunchers work fine for my 4x smp machine
626 my @a_png = map +(async \&process_png), 1..4; 646 my @a_png = map +(async \&process_png), 1..8;
627 647
628 $_->join for (@a_trs, @a_res, @a_png); 648 $_->join for (@a_trs, @a_res, @a_png);
629 649
630 print "scanning done, processing results...\n" if $VERBOSE; 650 print "scanning done, processing results...\n" if $VERBOSE;
631 { 651 {
… …
670 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 690 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
671 691
672 print "writing archetypes...\n" if $VERBOSE; 692 print "writing archetypes...\n" if $VERBOSE;
673 open my $fh, ">:utf8", "$DATADIR/archetypes~" 693 open my $fh, ">:utf8", "$DATADIR/archetypes~"
674 or die "$DATADIR/archetypes~: $!"; 694 or die "$DATADIR/archetypes~: $!";
675 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];
676 } 696 }
677 697
678 { 698 {
679 print "writing treasures...\n" if $VERBOSE; 699 print "writing treasures...\n" if $VERBOSE;
680 open my $fh, ">:utf8", "$DATADIR/treasures~" 700 open my $fh, ">:utf8", "$DATADIR/treasures~"

Diff Legend

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