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.55 by root, Sun Aug 19 13:45:43 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 Digest::MD5;
27use Carp; 28use Carp;
28use Coro::Channel; 29use Coro::Channel;
29use Coro::Storable; $Storable::canonical = 1; 30use Coro::Storable; $Storable::canonical = 1;
30 31
31$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 32$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
97 if (!-f "$path/regions") { 98 if (!-f "$path/regions") {
98 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";
99 exit 1 unless $FORCE; 100 exit 1 unless $FORCE;
100 } 101 }
101 102
102 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"
103 and die "map installation failed.\n"; 107 and die "map installation failed.\n";
104 108
105 print "maps installed successfully.\n"; 109 print "maps installed successfully.\n";
106} 110}
107 111
… …
174 178
175 (my $base = $stem) =~ s/^.*\///; 179 (my $base = $stem) =~ s/^.*\///;
176 180
177 my $fi = $FACEINFO{$base}; 181 my $fi = $FACEINFO{$base};
178 unless ($fi) { 182 unless ($fi) {
179 warn "$path: <$base> not referenced by any archetype, skipping.\n"; 183 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
180 next; 184 #next;
181 } 185 }
182 186
183 my $arc = $FACEINFO{$base}{arc} 187 my $arc = $fi->{arc} || { };
184 or die "FATAL: internal error, cannot continue";
185 188
186 unless ($path =~ /~$/) { 189 unless ($path =~ /~$/) {
187 # possibly enlarge 190 # possibly enlarge
188 if (0 > aio_stat "$stem.64x64.png") { 191 if (0 > aio_stat "$stem.64x64.png") {
189 my $other = "$stem.64x64.png~"; 192 my $other = "$stem.64x64.png~";
… …
426 facings => $facings, 429 facings => $facings,
427 frames => \@frames, 430 frames => \@frames,
428 }; 431 };
429 } 432 }
430 433
431 for my $face ($o->{face} || (), @{$anim || []}) { 434 for ($o->{face} || (), @{$anim || []}) {
432 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 435 next if /^facings\s/;
433 436
437 my $face = $_;
438 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
439
434 my $info = $FACEINFO{$face} ||= {}; 440 my $info = $FACEINFO{$face} ||= { };
435
436 $info->{arc} = $o; 441 $info->{arc} = $o;
442
443 next if $face =~ /^blank.x11$|^empty.x11$/;
444
437 $info->{visibility} = $visibility if defined $visibility; 445 $info->{visibility} = $visibility if defined $visibility;
438 $info->{magicmap} = $magicmap if defined $magicmap; 446 $info->{magicmap} = $magicmap if defined $magicmap;
439 } 447 }
440 448
441 if (my $smooth = delete $o->{smoothface}) { 449 if (my $smooth = delete $o->{smoothface}) {
… …
491 my ($dir, $file, $type) = @$job; 499 my ($dir, $file, $type) = @$job;
492 500
493 my $data; 501 my $data;
494 aio_load "$dir/$file", $data; 502 aio_load "$dir/$file", $data;
495 503
496 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 504 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
497 505
498 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 }
499 514
500 $meta = { 515 $meta = {
501 %{ $meta->{"" } || {} }, 516 %{ $meta->{"" } || {} },
502 %{ $meta->{$file} || {} }, 517 %{ $meta->{$file} || {} },
503 }; 518 };
… …
516 $file =~ s/\.res$//; 531 $file =~ s/\.res$//;
517 $file =~ s/\.(ogg|wav|jpg|png)$//; 532 $file =~ s/\.(ogg|wav|jpg|png)$//;
518 533
519 substr $dir, 0, 1 + length $PATH, ""; 534 substr $dir, 0, 1 + length $PATH, "";
520 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
521 $RESOURCE{"$dir/$file"} = { 549 $RESOURCE{"$dir/$file"} = {
522 type => (delete $meta->{type}) || $type, 550 type => (exists $meta->{type} ? delete $meta->{type} : $type),
523 data => $data, 551 data => $data,
524 chksum => (Digest::MD5::md5 $data),
525 %$meta ? (meta => $meta) : (), 552 %$meta ? (meta => $meta) : (),
526 }; 553 };
527 } 554 }
528 } 555 }
529 556
… …
549 } elsif ($dir =~ /^sound(?:\/|$)/) { 576 } elsif ($dir =~ /^sound(?:\/|$)/) {
550 $c_res->put ([$path, $file, 5]) # FT_SOUND 577 $c_res->put ([$path, $file, 5]) # FT_SOUND
551 if $file =~ /\.(wav|ogg)$/; 578 if $file =~ /\.(wav|ogg)$/;
552 579
553 } elsif ($dir =~ /^res(?:\/|$)/) { 580 } elsif ($dir =~ /^res(?:\/|$)/) {
581 if ($file =~ /\.(jpg|png)$/) {
554 $c_res->put ([$path, $file, 0]) # FT_FACE 582 $c_res->put ([$path, $file, 0]) # FT_FACE
555 if $file =~ /\.(jpg|png)$/; 583 } elsif ($file =~ /\.(res)$/) {
556 $c_res->put ([$path, $file, 7]) # FT_RSRC 584 $c_res->put ([$path, $file, 7]) # FT_RSRC
557 if $file =~ /\.(res)$/; 585 } else {
586 $c_res->put ([$path, $file, undef]);
587 }
558 588
559 } elsif ($file =~ /\.png$/) { 589 } elsif ($file =~ /\.png$/) {
560 push @c_png, ["$path/$file", 0]; 590 push @c_png, ["$path/$file", 0];
561 591
562 } elsif ($file =~ /\.trs$/) { 592 } elsif ($file =~ /\.trs$/) {
… …
660 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 690 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
661 691
662 print "writing archetypes...\n" if $VERBOSE; 692 print "writing archetypes...\n" if $VERBOSE;
663 open my $fh, ">:utf8", "$DATADIR/archetypes~" 693 open my $fh, ">:utf8", "$DATADIR/archetypes~"
664 or die "$DATADIR/archetypes~: $!"; 694 or die "$DATADIR/archetypes~: $!";
665 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];
666 } 696 }
667 697
668 { 698 {
669 print "writing treasures...\n" if $VERBOSE; 699 print "writing treasures...\n" if $VERBOSE;
670 open my $fh, ">:utf8", "$DATADIR/treasures~" 700 open my $fh, ">:utf8", "$DATADIR/treasures~"
… …
678 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 708 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
679 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 709 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
680 710
681 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 711 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
682 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 712 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
683
684 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
685 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
686 713
687 if (my $magicmap = $v->{magicmap}) { 714 if (my $magicmap = $v->{magicmap}) {
688 $magicmap =~ y/A-Z_\-/a-z/d; 715 $magicmap =~ y/A-Z_\-/a-z/d;
689 $v->{magicmap} = $COLOR{$magicmap}; 716 $v->{magicmap} = $COLOR{$magicmap};
690 } 717 }

Diff Legend

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