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.57 by root, Mon Aug 20 22:09:04 2007 UTC vs.
Revision 1.76 by root, Tue Nov 3 14:49:39 2009 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 File::Temp;
18use POSIX ();
19use Carp;
20
17use Coro::Event; 21use Coro::EV;
18use AnyEvent; 22use AnyEvent;
23use YAML::XS ();
24use JSON::XS ();
19use IO::AIO (); 25use IO::AIO ();
20use File::Temp; 26
21use Crossfire;
22use Coro; 27use Coro 5.12;
23use Coro::AIO; 28use Coro::AIO;
24use Coro::Util; 29use Coro::Util;
25use POSIX ();
26use Carp;
27use Coro::Channel; 30use Coro::Channel;
28use Coro::Storable; $Storable::canonical = 1; 31use Coro::Storable; $Storable::canonical = 1;
32
33use Deliantra;
29 34
30$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 35$SIG{QUIT} = sub { Carp::cluck "QUIT" };
31 36
32sub usage { 37sub usage {
33 warn <<EOF; 38 warn <<EOF;
… …
65 tan => 12, 70 tan => 12,
66); 71);
67 72
68END { system "rm", "-rf", $TMPDIR } 73END { system "rm", "-rf", $TMPDIR }
69 74
70Event->signal (signal => "INT", cb => sub { exit 1 }); 75my $s_INT = EV::signal INT => sub { exit 1 };
71Event->signal (signal => "TERM", cb => sub { exit 1 }); 76my $s_TERM = EV::signal TERM => sub { exit 1 };
72 77
73mkdir $TMPDIR, 0700 78mkdir $TMPDIR, 0700
74 or die "$TMPDIR: $!"; 79 or die "$TMPDIR: $!";
75 80
76sub fork_sub(&) { 81sub fork_sub(&) {
… …
96 if (!-f "$path/regions") { 101 if (!-f "$path/regions") {
97 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 102 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
98 exit 1 unless $FORCE; 103 exit 1 unless $FORCE;
99 } 104 }
100 105
101 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 106 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
107 "$path/.", "$DATADIR/maps/.",
108 "--exclude", "CVS", "--exclude", "/world-precomposed",
109 "--delete", "--delete-excluded"
102 and die "map installation failed.\n"; 110 and die "map installation failed.\n";
103 111
104 print "maps installed successfully.\n"; 112 print "maps installed successfully.\n";
105} 113}
106 114
… …
173 181
174 (my $base = $stem) =~ s/^.*\///; 182 (my $base = $stem) =~ s/^.*\///;
175 183
176 my $fi = $FACEINFO{$base}; 184 my $fi = $FACEINFO{$base};
177 unless ($fi) { 185 unless ($fi) {
178 warn "$path: <$base> not referenced by any archetype, skipping.\n"; 186 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
179 next; 187 #next;
180 } 188 }
181 189
182 my $arc = $FACEINFO{$base}{arc} 190 my $arc = $fi->{arc} || { };
183 or die "FATAL: internal error <$base>, cannot continue";
184 191
185 unless ($path =~ /~$/) { 192 unless ($path =~ /~$/) {
186 # possibly enlarge 193 # possibly enlarge
187 if (0 > aio_stat "$stem.64x64.png") { 194 if (0 > aio_stat "$stem.64x64.png") {
188 my $other = "$stem.64x64.png~"; 195 my $other = "$stem.64x64.png~";
… …
269 fork_sub { 276 fork_sub {
270 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 277 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
271 system $OPTIPNG, "-i0", "-q", "$other~"; 278 system $OPTIPNG, "-i0", "-q", "$other~";
272 279
273 # reduce smoothfaces >10000 bytes 280 # reduce smoothfaces >10000 bytes
281 # obsolete, no longer required
274 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 282 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
275 my $ncolor = 256; 283 my $ncolor = 256;
276 while () { 284 while () {
277 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 285 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
278 system $OPTIPNG, "-i0", "-q", "$other~~"; 286 system $OPTIPNG, "-i0", "-q", "$other~~";
279 last if 10000 > -s "$other~~"; 287 last if 10000 > -s "$other~~";
… …
375 push @ARC, $o; 383 push @ARC, $o;
376 for (my $m = $o; $m; $m = $m->{more}) { 384 for (my $m = $o; $m; $m = $m->{more}) {
377 $ARC{$m->{_name}} = $m; 385 $ARC{$m->{_name}} = $m;
378 } 386 }
379 387
380 $o->{editor_folder} = $dir; 388 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
381 389
382 my $visibility = delete $o->{visibility}; 390 my $visibility = delete $o->{visibility};
383 my $magicmap = delete $o->{magicmap}; 391 my $magicmap = delete $o->{magicmap};
384 392
385 # find upper left corner :/ 393 # find upper left corner :/
… …
425 facings => $facings, 433 facings => $facings,
426 frames => \@frames, 434 frames => \@frames,
427 }; 435 };
428 } 436 }
429 437
430 for my $face ($o->{face} || (), @{$anim || []}) { 438 for ($o->{face} || (), @{$anim || []}) {
431 next if $face =~ /^facings\s/; 439 next if /^facings\s/;
440
441 my $face = $_;
442 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
432 443
433 my $info = $FACEINFO{$face} ||= { }; 444 my $info = $FACEINFO{$face} ||= { };
434 $info->{arc} = $o; 445 $info->{arc} = $o;
435 446
436 next if $face =~ /^blank.x11$|^empty.x11$/; 447 next if $face =~ /^blank.x11$|^empty.x11$/;
… …
492 my ($dir, $file, $type) = @$job; 503 my ($dir, $file, $type) = @$job;
493 504
494 my $data; 505 my $data;
495 aio_load "$dir/$file", $data; 506 aio_load "$dir/$file", $data;
496 507
497 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 508 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
498 509
499 next if $meta && !exists $meta->{$file}; 510 utf8::decode $dir;
511 utf8::decode $file;
512
513 # a meta file for resources is now mandatory
514 unless (exists $meta->{$file}) {
515 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
516 next;
517 }
500 518
501 $meta = { 519 $meta = {
502 %{ $meta->{"" } || {} }, 520 %{ $meta->{"" } || {} },
503 %{ $meta->{$file} || {} }, 521 %{ $meta->{$file} || {} },
504 }; 522 };
… …
517 $file =~ s/\.res$//; 535 $file =~ s/\.res$//;
518 $file =~ s/\.(ogg|wav|jpg|png)$//; 536 $file =~ s/\.(ogg|wav|jpg|png)$//;
519 537
520 substr $dir, 0, 1 + length $PATH, ""; 538 substr $dir, 0, 1 + length $PATH, "";
521 539
540 if (my $filter = $meta->{cfutil_filter}) {
541 if ($filter eq "yaml2json") {
542 $data = JSON::XS::encode_json YAML::XS::Load $data;
543 } elsif ($filter eq "json2json") {
544 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
545 } elsif ($filter eq "perl2json") {
546 $data = eval $data; die if $@;
547 $data = JSON::XS::encode_json $data;
548 } else {
549 warn "$dir/$file: unknown filter $filter, skipping\n";
550 }
551 }
552
522 $RESOURCE{"$dir/$file"} = { 553 $RESOURCE{"$dir/$file"} = {
523 type => (delete $meta->{type}) || $type, 554 type => (exists $meta->{type} ? delete $meta->{type} : $type),
524 data => $data, 555 data => $data,
525 %$meta ? (meta => $meta) : (), 556 %$meta ? (meta => $meta) : (),
526 }; 557 };
527 } 558 }
528 } 559 }
… …
549 } elsif ($dir =~ /^sound(?:\/|$)/) { 580 } elsif ($dir =~ /^sound(?:\/|$)/) {
550 $c_res->put ([$path, $file, 5]) # FT_SOUND 581 $c_res->put ([$path, $file, 5]) # FT_SOUND
551 if $file =~ /\.(wav|ogg)$/; 582 if $file =~ /\.(wav|ogg)$/;
552 583
553 } elsif ($dir =~ /^res(?:\/|$)/) { 584 } elsif ($dir =~ /^res(?:\/|$)/) {
585 if ($file =~ /\.(jpg|png)$/) {
554 $c_res->put ([$path, $file, 0]) # FT_FACE 586 $c_res->put ([$path, $file, 0]) # FT_FACE
555 if $file =~ /\.(jpg|png)$/; 587 } elsif ($file =~ /\.(res)$/) {
556 $c_res->put ([$path, $file, 7]) # FT_RSRC 588 $c_res->put ([$path, $file, 6]) # FT_RSRC
557 if $file =~ /\.(res)$/; 589 } else {
590 $c_res->put ([$path, $file, undef]);
591 }
558 592
559 } elsif ($file =~ /\.png$/) { 593 } elsif ($file =~ /\.png$/) {
560 push @c_png, ["$path/$file", 0]; 594 push @c_png, ["$path/$file", 0];
561 595
562 } elsif ($file =~ /\.trs$/) { 596 } elsif ($file =~ /\.trs$/) {
… …
568 } else { 602 } else {
569 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 603 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
570 } 604 }
571 } 605 }
572 }; 606 };
607 }
608
609 sub generate_plurals {
610# use Lingua::EN::Inflect ();
611# Lingua::EN::Inflect::classical;
612# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
613# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
614#
615# for my $a (@ARC) {
616# my $name = $a->{name} || $a->{_name};
617#
618# next unless $a->{name_pl};
619# next if $a->{invisible};
620# next if $a->{is_floor};
621# next if $a->{no_pick};
622#
623# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
624# my $pl = $test =~ /^(?:eq|p:.)$/
625# ? $name
626# : Lingua::EN::Inflect::PL $name;
627#
628# if ($pl ne $a->{name_pl}) {
629# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
630# }
631# }
573 } 632 }
574 633
575 sub inst_arch($) { 634 sub inst_arch($) {
576 my (undef, $path) = @_; 635 my (undef, $path) = @_;
577 636
… …
600 my @a_res = map +(async \&process_res), 1..2; 659 my @a_res = map +(async \&process_res), 1..2;
601 my @a_trs = map +(async \&process_trs), 1..2; 660 my @a_trs = map +(async \&process_trs), 1..2;
602 661
603 IO::AIO::flush; 662 IO::AIO::flush;
604 663
605 $c_res->put (undef) for @a_res; 664 $c_res->shutdown;
606 $c_arc->put (undef) for @a_arc; 665 $c_arc->shutdown;
607 $c_trs->put (undef) for @a_trs; 666 $c_trs->shutdown;
608 667
609 print "start file scan, arc, res processing...\n" if $VERBOSE; 668 print "start file scan, arc, res processing...\n" if $VERBOSE;
610 669
611 $_->join for @a_arc; # need to parse all archetypes before png processing 670 $_->join for @a_arc; # need to parse all archetypes before png processing
612 671
613 print "end arc, start png processing...\n" if $VERBOSE; 672 print "end arc, start png processing...\n" if $VERBOSE;
614 673
615 # four png crunchers work fine for my 2x smp machine 674 # eight png crunchers work fine for my 4x smp machine
616 my @a_png = map +(async \&process_png), 1..4; 675 my @a_png = map +(async \&process_png), 1..8;
617 676
618 $_->join for (@a_trs, @a_res, @a_png); 677 $_->join for (@a_trs, @a_res, @a_png);
619 678
620 print "scanning done, processing results...\n" if $VERBOSE; 679 print "scanning done, processing results...\n" if $VERBOSE;
621 { 680 {
622 # remove path prefix from editor_folder 681 # remove path prefix from editor_folder
682 $_->{editor_folder} =~ /^\x00/
623 substr $_->{editor_folder}, 0, 1 + length $path, "" 683 and substr $_->{editor_folder}, 0, 2 + length $path, ""
624 for values %ARC; 684 for values %ARC;
625 685
626 print "resolving inheritance tree...\n" if $VERBOSE; 686 print "resolving inheritance tree...\n" if $VERBOSE;
627 # resolve inherit 687 # resolve inherit
628 while () { 688 while () {
629 my $progress; 689 my $progress;
… …
657 } 717 }
658 718
659 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 719 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
660 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 720 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
661 721
722 print "generating plurals...\n" if $VERBOSE;
723 generate_plurals;
724
662 print "writing archetypes...\n" if $VERBOSE; 725 print "writing archetypes...\n" if $VERBOSE;
663 open my $fh, ">:utf8", "$DATADIR/archetypes~" 726 open my $fh, ">:utf8", "$DATADIR/archetypes~"
664 or die "$DATADIR/archetypes~: $!"; 727 or die "$DATADIR/archetypes~: $!";
665 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 728 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
666 } 729 }
667 730
668 { 731 {
669 print "writing treasures...\n" if $VERBOSE; 732 print "writing treasures...\n" if $VERBOSE;
670 open my $fh, ">:utf8", "$DATADIR/treasures~" 733 open my $fh, ">:utf8", "$DATADIR/treasures~"
… …
676 print "processing facedata...\n" if $VERBOSE; 739 print "processing facedata...\n" if $VERBOSE;
677 while (my ($k, $v) = each %FACEINFO) { 740 while (my ($k, $v) = each %FACEINFO) {
678 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 741 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"; 742 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
680 743
681 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 744 #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"; 745 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
683 746
684 if (my $magicmap = $v->{magicmap}) { 747 if (my $magicmap = $v->{magicmap}) {
685 $magicmap =~ y/A-Z_\-/a-z/d; 748 $magicmap =~ y/A-Z_\-/a-z/d;
686 $v->{magicmap} = $COLOR{$magicmap}; 749 $v->{magicmap} = $COLOR{$magicmap};

Diff Legend

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