--- deliantra/server/utils/cfutil.in 2007/04/18 09:38:58 1.29 +++ deliantra/server/utils/cfutil.in 2009/02/07 21:40:54 1.71 @@ -8,22 +8,29 @@ my $DATADIR = "@datadir@/@PACKAGE@"; my $CONVERT = "@CONVERT@"; -my $IDENTIFY = "@IDENTIFY@"; +#my $IDENTIFY = "@IDENTIFY@"; my $OPTIPNG = "@OPTIPNG@"; my $RSYNC = "@RSYNC@"; +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; +$SIG{QUIT} = sub { Carp::cluck "QUIT" }; + sub usage { warn < 0, + white => 1, + navy => 2, + red => 3, + orange => 4, + blue => 5, + darkorange => 6, + green => 7, + lightgreen => 8, + grey => 9, + brown => 10, + gold => 11, + tan => 12, +); + 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: $!"; @@ -77,7 +100,10 @@ exit 1 unless $FORCE; } - system $RSYNC, "-av", "$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"; @@ -86,13 +112,20 @@ { our %ANIMINFO; our %FACEINFO; + our %RESOURCE; + our @ARC; our %ARC; our $TRS; our $NFILE; + our $PATH; our $QUANTIZE = "+dither -colorspace RGB -colors 256"; - our (@png, @trs, @arc); # files we are interested in + our $c_arc = new Coro::Channel; + our $c_trs = new Coro::Channel; + our $c_res = new Coro::Channel; + + our @c_png; sub commit_png($$$) { my ($name, $data, $T) = @_; @@ -101,8 +134,8 @@ } sub process_png { - while (@png) { - my ($path, $delete) = @{pop @png}; + while (@c_png) { + my ($path, $delete) = @{pop @c_png}; my $png; aio_lstat $path; @@ -143,25 +176,93 @@ next; } + (my $base = $stem) =~ s/^.*\///; + + my $fi = $FACEINFO{$base}; + unless ($fi) { + #warn "$path: <$base> not referenced by any archetype, skipping.\n"; + #next; + } + + my $arc = $fi->{arc} || { }; + unless ($path =~ /~$/) { # possibly enlarge if (0 > aio_stat "$stem.64x64.png") { my $other = "$stem.64x64.png~"; if (0 > aio_lstat $other or (-M _) > (-M $path)) { - my $wrap = 0; # for the time being fork_sub { - system "convert png:\Q$path\E -depth 8 rgba:-" - . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" - . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" - and die "convert/hq2xa pipeline error: status $? ($!)"; - system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; + my $CROP; + my $SRC = "png:\Q$path\E"; + + my $is_floor = $arc->{is_floor}; + my $is_wall = 0; + + my ($wall_pfx, $wall_dir, $wall_sfx); + + if ( + !$is_floor + && !$arc->{alive} + && $arc->{move_block} eq "all" + && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ + ) { + ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); + + unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { + $is_wall = 1; + } + } + + if ($is_wall || $is_floor) { + # add a 4px border and add other images around it + $CROP = "-shave 8x8 +repage"; + + $w += 8; + $h += 8; + + $SRC = "-size ${w}x${h} xc:transparent"; + $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; + + # 8 surrounding images + for ( + # x y b r0 r1 + [-1, -1, 0, 6], + [ 0, -1, 1, 10, 14], + [+1, -1, 0, 12], + + [-1, 0, 8, 5, 7], + # + [+1, 0, 2, 5, 13], + + [-1, +1, 0, 3], + [ 0, +1, 4, 10, 11], + [+1, +1, 0, 9], + ) { + my ($x, $y, $d, $r0, $r1) = @$_; + + my $tile = $is_floor ? $path + : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx + : die; + + $SRC .= sprintf " png:%s -geometry %+d%+d -composite", + "\Q$tile", + $x * ($w - 8) + 4, + $y * ($h - 8) + 4; + } + } + + system "convert -depth 8 $SRC rgba:-" + . "| $exec_prefix/bin/cfhq2xa $w $h 0" + . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~" + and die "convert/cfhq2xa pipeline error: status $? ($!)"; + system $OPTIPNG, "-i0", "-q", "$other~"; die "$other~ has zero size, aborting." unless -s "$other~"; rename "$other~", $other; }; } - push @png, [$other, !$CACHE]; + push @c_png, [$other, !$CACHE]; } # possibly scale down @@ -171,14 +272,33 @@ if (0 > aio_lstat $other or (-M _) > (-M $path)) { fork_sub { system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; - system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; + system $OPTIPNG, "-i0", "-q", "$other~"; + + # reduce smoothfaces >10000 bytes + # 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"; + system $OPTIPNG, "-i0", "-q", "$other~~"; + last if 10000 > -s "$other~~"; + $ncolor = int $ncolor * 0.9; + $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes"; + } + + printf "reduced %s from %d to %d bytes using %d colours.\n", + $other, -s "$other~", -s "$other~~", $ncolor + if $VERBOSE >= 2; + rename "$other~~", "$other~"; + } + die "$other~ has zero size, aborting." unless -s "$other~"; rename "$other~", $other; }; } #warn "scaled down $path to $other\n";#d# - push @png, [$other, !$CACHE]; + push @c_png, [$other, !$CACHE]; } } @@ -249,15 +369,18 @@ } sub process_arc { - while (@arc) { - my ($dir, $file) = @{pop @arc}; + while (my $job = $c_arc->get) { + my ($dir, $file) = @$job; my $arc; aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ my $arc = read_arch "$dir/$file"; for my $o (values %$arc) { - $ARC{$o->{_name}} = $o; + push @ARC, $o; + for (my $m = $o; $m; $m = $m->{more}) { + $ARC{$m->{_name}} = $m; + } $o->{editor_folder} = $dir; @@ -280,8 +403,8 @@ $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; - my $visibility = delete $o->{visibility} if exists $o->{visibility}; - my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; + $visibility = delete $o->{visibility} if exists $o->{visibility}; + $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; my $anim = delete $o->{anim}; @@ -309,19 +432,27 @@ }; } - 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} ||= {}; + my $info = $FACEINFO{$face} ||= { }; + $info->{arc} = $o; + + next if $face =~ /^blank.x11$|^empty.x11$/; $info->{visibility} = $visibility if defined $visibility; $info->{magicmap} = $magicmap if defined $magicmap; } if (my $smooth = delete $o->{smoothface}) { - my %kv =split /\s+/, $smooth; + my %kv = split /\s+/, $smooth; my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support while (my ($face, $smooth) = each %kv) { + $FACEINFO{$smooth}{arc} = $o; + $FACEINFO{$face}{smooth} = $smooth; $FACEINFO{$face}{smoothlevel} = $level; } @@ -332,8 +463,8 @@ } sub process_trs { - while (@trs) { - my ($dir, $file) = @{pop @trs}; + while (my $job = $c_trs->get) { + my ($dir, $file) = @$job; my $path = "$dir/$file"; my $trs; @@ -346,6 +477,84 @@ } } + my %FILECACHE; + + sub load_cached($;$) { + unless (exists $FILECACHE{$_[0]}) { + my $data; + if (0 < aio_load $_[0], $data) { + if ($_[1]) { + $data = eval { $_[1]->($data) }; + warn "$_[0]: $@" if $@; + } + } + + $FILECACHE{$_[0]} = $data; + } + + $FILECACHE{$_[0]} + } + + sub process_res { + while (my $job = $c_res->get) { + my ($dir, $file, $type) = @$job; + + my $data; + aio_load "$dir/$file", $data; + + my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; + + 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->{"" } || {} }, + %{ $meta->{$file} || {} }, + }; + + if ($meta->{license} =~ s/^#//) { + $meta->{license} = ({ + "pd" => "Public Domain", + "gpl" => "GNU General Public License, version 3.0 or any later", + "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", + "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/", + "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/", + })->{$meta->{license}} + || warn "$dir/$file: license tag '$meta->{license}' not found."; + } + + $file =~ s/\.res$//; + $file =~ s/\.(ogg|wav|jpg|png)$//; + + 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 => (exists $meta->{type} ? delete $meta->{type} : $type), + data => $data, + %$meta ? (meta => $meta) : (), + }; + } + } + sub find_files; sub find_files { my ($path) = @_; @@ -357,15 +566,38 @@ find_files "$path/$_" for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; + my $dir = $path; + substr $dir, 0, 1 + length $PATH, ""; + for my $file (@$nondirs) { - if ($file =~ /\.png$/) { - push @png, ["$path/$file", 0]; + if ($dir =~ /^music(?:\/|$)/) { + $c_res->put ([$path, $file, 3]) # FT_MUSIC + if $file =~ /\.(ogg)$/; + + } elsif ($dir =~ /^sound(?:\/|$)/) { + $c_res->put ([$path, $file, 5]) # FT_SOUND + if $file =~ /\.(wav|ogg)$/; + + } elsif ($dir =~ /^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]; + } elsif ($file =~ /\.trs$/) { - push @trs, [$path, $file]; + $c_trs->put ([$path, $file]); + } elsif ($file =~ /\.arc$/) { - push @arc, [$path, $file]; + $c_arc->put ([$path, $file]); + } else { - warn "ignoring $path/$file\n" if $VERBOSE >= 2; + warn "ignoring $path/$file\n" if $VERBOSE >= 3; } } }; @@ -374,6 +606,8 @@ sub inst_arch($) { my (undef, $path) = @_; + $PATH = $path; + print "\n", "Installing '$path' to '$DATADIR'\n", "\n", @@ -389,21 +623,38 @@ exit 1 unless $FORCE; } + print "scanning files...\n" if $VERBOSE; + find_files $path; + + my @a_arc = map +(async \&process_arc), 1..2; + my @a_res = map +(async \&process_res), 1..2; + my @a_trs = map +(async \&process_trs), 1..2; + IO::AIO::flush; - $_->join for ( - # four png crunchers work fine for my 2x smp machine - (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), - (async \&process_trs), (async \&process_trs), - (async \&process_arc), (async \&process_arc), - ); + $c_res->shutdown; + $c_arc->shutdown; + $c_trs->shutdown; + + print "start file scan, arc, res processing...\n" if $VERBOSE; + $_->join for @a_arc; # need to parse all archetypes before png processing + + print "end arc, start png processing...\n" if $VERBOSE; + + # 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); + + print "scanning done, processing results...\n" if $VERBOSE; { # remove path prefix from editor_folder substr $_->{editor_folder}, 0, 1 + length $path, "" for values %ARC; + print "resolving inheritance tree...\n" if $VERBOSE; # resolve inherit while () { my $progress; @@ -416,7 +667,9 @@ $loop = $s; } else { delete $o->{inherit}; - %$o = ( %$s, %$o ); + my %s = %$s; + delete @s{qw(_name more name name_pl)}; + %$o = ( %s, %$o ); ++$progress; } } else { @@ -434,29 +687,40 @@ } } + # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit + @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; + + 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} } values %ARC]; + print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; } { + print "writing treasures...\n" if $VERBOSE; open my $fh, ">:utf8", "$DATADIR/treasures~" or die "$DATADIR/treasures~: $!"; print $fh $TRS; } { + print "processing facedata...\n" if $VERBOSE; while (my ($k, $v) = each %FACEINFO) { 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}; + } + + delete $v->{arc}; } + print "writing facedata...\n" if $VERBOSE; open my $fh, ">:perlio", "$DATADIR/facedata~" or die "$DATADIR/facedata~: $!"; @@ -464,9 +728,12 @@ version => 2, faceinfo => \%FACEINFO, animinfo => \%ANIMINFO, + resource => \%RESOURCE, }; } + print "committing files...\n" if $VERBOSE; + for (qw(archetypes facedata treasures)) { chmod 0644, "$DATADIR/$_~"; rename "$DATADIR/$_~", "$DATADIR/$_"