--- deliantra/server/utils/cfutil.in 2007/08/19 10:28:52 1.54 +++ deliantra/server/utils/cfutil.in 2009/02/07 21:40:54 1.71 @@ -14,16 +14,17 @@ my $PNGNQ = "@PNGNQ@"; use Getopt::Long; -use Coro::Event; +use Coro::EV; use AnyEvent; +use YAML (); +use JSON::XS (); use IO::AIO (); use File::Temp; -use Crossfire; -use Coro; +use Deliantra; +use Coro 5.12; use Coro::AIO; use Coro::Util; use POSIX (); -use Digest::MD5; use Carp; use Coro::Channel; use Coro::Storable; $Storable::canonical = 1; @@ -68,8 +69,8 @@ END { system "rm", "-rf", $TMPDIR } -Event->signal (signal => "INT", cb => sub { exit 1 }); -Event->signal (signal => "TERM", cb => sub { exit 1 }); +my $s_INT = EV::signal INT => sub { exit 1 }; +my $s_TERM = EV::signal TERM => sub { exit 1 }; mkdir $TMPDIR, 0700 or die "$TMPDIR: $!"; @@ -99,7 +100,10 @@ exit 1 unless $FORCE; } - system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" + system $RSYNC, "-av", "--chmod=u=rwX,go=rX", + "$path/.", "$DATADIR/maps/.", + "--exclude", "CVS", "--exclude", "/world-precomposed", + "--delete", "--delete-excluded" and die "map installation failed.\n"; print "maps installed successfully.\n"; @@ -176,12 +180,11 @@ my $fi = $FACEINFO{$base}; unless ($fi) { - warn "$path: <$base> not referenced by any archetype, skipping.\n"; - next; + #warn "$path: <$base> not referenced by any archetype, skipping.\n"; + #next; } - my $arc = $FACEINFO{$base}{arc} - or die "FATAL: internal error, cannot continue"; + my $arc = $fi->{arc} || { }; unless ($path =~ /~$/) { # possibly enlarge @@ -201,7 +204,7 @@ if ( !$is_floor && !$arc->{alive} - && $arc->{no_pass} + && $arc->{move_block} eq "all" && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ ) { ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); @@ -272,7 +275,8 @@ system $OPTIPNG, "-i0", "-q", "$other~"; # reduce smoothfaces >10000 bytes - if ($stem =~ /_S\./ && (-s "$other~") > 10000) { + # obsolete, no longer required + if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) { my $ncolor = 256; while () { system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; @@ -428,12 +432,17 @@ }; } - for my $face ($o->{face} || (), @{$anim || []}) { - next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; + for ($o->{face} || (), @{$anim || []}) { + next if /^facings\s/; + + my $face = $_; + $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates + + my $info = $FACEINFO{$face} ||= { }; + $info->{arc} = $o; - my $info = $FACEINFO{$face} ||= {}; + next if $face =~ /^blank.x11$|^empty.x11$/; - $info->{arc} = $o; $info->{visibility} = $visibility if defined $visibility; $info->{magicmap} = $magicmap if defined $magicmap; } @@ -493,9 +502,16 @@ my $data; aio_load "$dir/$file", $data; - my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; + my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; - next if $meta && !exists $meta->{$file}; + utf8::decode $dir; + utf8::decode $file; + + # a meta file for resources is now mandatory + unless (exists $meta->{$file}) { + warn "skipping $dir/$file\n" if $VERBOSE >= 3; + next; + } $meta = { %{ $meta->{"" } || {} }, @@ -518,10 +534,22 @@ substr $dir, 0, 1 + length $PATH, ""; + if (my $filter = $meta->{cfutil_filter}) { + if ($filter eq "yaml2json") { + $data = JSON::XS::encode_json YAML::Load $data; + } elsif ($filter eq "json2json") { + $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); + } elsif ($filter eq "perl2json") { + $data = eval $data; die if $@; + $data = JSON::XS::encode_json $data; + } else { + warn "$dir/$file: unknown filter $filter, skipping\n"; + } + } + $RESOURCE{"$dir/$file"} = { - type => (delete $meta->{type}) || $type, + type => (exists $meta->{type} ? delete $meta->{type} : $type), data => $data, - chksum => (Digest::MD5::md5 $data), %$meta ? (meta => $meta) : (), }; } @@ -551,10 +579,13 @@ if $file =~ /\.(wav|ogg)$/; } elsif ($dir =~ /^res(?:\/|$)/) { - $c_res->put ([$path, $file, 0]) # FT_FACE - if $file =~ /\.(jpg|png)$/; - $c_res->put ([$path, $file, 7]) # FT_RSRC - if $file =~ /\.(res)$/; + if ($file =~ /\.(jpg|png)$/) { + $c_res->put ([$path, $file, 0]) # FT_FACE + } elsif ($file =~ /\.(res)$/) { + $c_res->put ([$path, $file, 6]) # FT_RSRC + } else { + $c_res->put ([$path, $file, undef]); + } } elsif ($file =~ /\.png$/) { push @c_png, ["$path/$file", 0]; @@ -602,9 +633,9 @@ IO::AIO::flush; - $c_res->put (undef) for @a_res; - $c_arc->put (undef) for @a_arc; - $c_trs->put (undef) for @a_trs; + $c_res->shutdown; + $c_arc->shutdown; + $c_trs->shutdown; print "start file scan, arc, res processing...\n" if $VERBOSE; @@ -612,8 +643,8 @@ print "end arc, start png processing...\n" if $VERBOSE; - # four png crunchers work fine for my 2x smp machine - my @a_png = map +(async \&process_png), 1..4; + # eight png crunchers work fine for my 4x smp machine + my @a_png = map +(async \&process_png), 1..8; $_->join for (@a_trs, @a_res, @a_png); @@ -662,7 +693,7 @@ print "writing archetypes...\n" if $VERBOSE; open my $fh, ">:utf8", "$DATADIR/archetypes~" or die "$DATADIR/archetypes~: $!"; - print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; + print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; } { @@ -678,12 +709,9 @@ length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; - length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; + #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; - $v->{chksum32} = Digest::MD5::md5 $v->{data32}; - $v->{chksum64} = Digest::MD5::md5 $v->{data64}; - if (my $magicmap = $v->{magicmap}) { $magicmap =~ y/A-Z_\-/a-z/d; $v->{magicmap} = $COLOR{$magicmap};