--- deliantra/server/utils/cfutil.in 2007/05/07 06:01:48 1.34 +++ deliantra/server/utils/cfutil.in 2010/10/05 23:59:10 1.92 @@ -1,6 +1,28 @@ #!@PERL@ -use strict; +# +# This file is part of Deliantra, the Roguelike Realtime MMORPG. +# +# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team +# +# Deliantra is free software: you can redistribute it and/or modify it under +# the terms of the Affero GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the Affero GNU General Public License +# and the GNU General Public License along with this program. If not, see +# . +# +# The authors can be reached via e-mail to +# + +use common::sense; my $prefix = "@prefix@"; my $exec_prefix = "@exec_prefix@"; @@ -8,23 +30,33 @@ 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 File::Temp; +use POSIX (); +use Carp; + +use Coro::EV; use AnyEvent; +use YAML::XS (); +use JSON::XS (); use IO::AIO (); -use File::Temp; -use Crossfire; -use Coro; +use Digest::MD5 (); + +use Coro 5.12; use Coro::AIO; -use POSIX (); -use Digest::MD5; +use Coro::Util; +use Coro::Channel; use Coro::Storable; $Storable::canonical = 1; +use Deliantra; + +$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 }; + +our %hash; + +# here we could try to avoid collisions and reduce chksum size further +sub make_hash($\$\$;$) { + my ($id, $dataref, $hashref, $clen) = @_; + + my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; + + if (exists $hash{$hash}) { + # hash collision, but some files are simply identical + if (${$hash{$hash}[1]} ne $$dataref) { + warn "hash collision $hash{$hash}[0] vs. $id\n"; + exit 1; + } else { + print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; + } + } + $hash{$hash} = [$id, $dataref, $hashref]; + + $$hashref = $hash; +} mkdir $TMPDIR, 0700 or die "$TMPDIR: $!"; @@ -78,33 +149,86 @@ 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"; } +our %WALL_SUFFIX = ( + "_0" => "⬤", + "_1_3" => "╸", + "_1_4" => "╺", + "_2_1_2" => "━", + + "_1_2" => "╹", + "_2_2_4" => "┛", + "_2_2_1" => "┗", + "_3_1" => "┻", + + "_1_1" => "╻", + "_2_2_3" => "┓", + "_2_2_2" => "┏", + "_3_3" => "┳", + + "_2_1_1" => "┃", + "_3_4" => "┫", + "_3_2" => "┣", + "_4" => "╋", +); + +sub autoglyph { + my ($stem, $face) = @_; + + if ($stem =~ /^wall\/|Nimwall/) { + if ($stem =~ /((?:_[0-4])+).x11/) { + return $WALL_SUFFIX{$1} if exists $WALL_SUFFIX{$1}; + } + + "+" + + } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { + "." + + } elsif ($stem =~ /^player\//) { + "\@" + + } else { + substr $stem, 0, 1 + } +} + { 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) = @_; + sub commit_png($$$$) { + my ($stem, $name, $data, $T) = @_; + $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH; $FACEINFO{$name}{"data$T"} = $data; } sub process_png { - while (@png) { - my ($path, $delete) = @{pop @png}; + while (@c_png) { + my ($path, $delete) = @{pop @c_png}; my $png; aio_lstat $path; @@ -145,25 +269,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 $? ($!)"; + 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 @@ -176,7 +368,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"; @@ -198,7 +391,7 @@ } #warn "scaled down $path to $other\n";#d# - push @png, [$other, !$CACHE]; + push @c_png, [$other, !$CACHE]; } } @@ -257,11 +450,11 @@ die "$path: unable to read tile +$x+$y, aborting.\n"; } IO::AIO::aio_unlink $file unless $CACHE; - commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; + commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T; } } else { # use as-is (either small, use smooth) - commit_png $face, $png, $T; + commit_png $stem, $face, $png, $T; } aio_unlink $path if $delete; @@ -269,8 +462,8 @@ } 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 :/ @@ -282,10 +475,11 @@ $ARC{$m->{_name}} = $m; } - $o->{editor_folder} = $dir; + $o->{editor_folder} ||= "\x00$dir"; # horrible kludge my $visibility = delete $o->{visibility}; my $magicmap = delete $o->{magicmap}; + my $glyph = delete $o->{glyph}; # find upper left corner :/ # omg, this is sooo broken @@ -303,8 +497,9 @@ $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}; + $glyph = delete $o->{glyph} if exists $o->{glyph}; my $anim = delete $o->{anim}; @@ -332,19 +527,28 @@ }; } - for my $face ($o->{face} || (), @{$anim || []}) { - next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; + for ($o->{face} || (), @{$anim || []}) { + next if /^facings\s/; - my $info = $FACEINFO{$face} ||= {}; + my $face = $_; + $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates + + 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; + $info->{glyph} = $glyph if defined $glyph; } 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; } @@ -355,8 +559,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; @@ -369,6 +573,89 @@ } } + 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.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", + "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."; + } + + if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) { + ($meta->{author} = $1) =~ s/_/ /g; + } + + $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::XS::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) = @_; @@ -378,15 +665,38 @@ my ($dirs, $nondirs) = @_; find_files "$path/$_" - for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; + 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 >= 3; } @@ -394,9 +704,36 @@ }; } + sub generate_plurals { +# use Lingua::EN::Inflect (); +# Lingua::EN::Inflect::classical; +# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy +# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack +# +# for my $a (@ARC) { +# my $name = $a->{name} || $a->{_name}; +# +# next unless $a->{name_pl}; +# next if $a->{invisible}; +# next if $a->{is_floor}; +# next if $a->{no_pick}; +# +# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name; +# my $pl = $test =~ /^(?:eq|p:.)$/ +# ? $name +# : Lingua::EN::Inflect::PL $name; +# +# if ($pl ne $a->{name_pl}) { +# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n"; +# } +# } + } + sub inst_arch($) { my (undef, $path) = @_; + $PATH = $path; + print "\n", "Installing '$path' to '$DATADIR'\n", "\n", @@ -412,28 +749,46 @@ 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; + $_->{editor_folder} =~ /^\x00/ + and substr $_->{editor_folder}, 0, 2 + length $path, "" + for values %ARC; + print "resolving inheritance tree...\n" if $VERBOSE; # resolve inherit while () { my $progress; my $loop; for my $o (values %ARC) { - if (my $other = $o->{inherit}) { + for my $other (split /,/, $o->{inherit}) { if (my $s = $ARC{$other}) { if ($s->{inherit}) { $loop = $s; @@ -462,40 +817,98 @@ # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; + print "generating plurals...\n" if $VERBOSE; + generate_plurals; + + printf "writing %d archetypes...\n", scalar @ARC 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]; } { + printf "writing treasures (%d octets)...\n", length $TRS 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"; + make_hash $k, $v->{data32}, $v->{hash32}; + make_hash $k, $v->{data64}, $v->{hash64}; + + #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}; + } + + my $stem = delete $v->{stem}; + $v->{glyph} //= autoglyph $stem, $v; + $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph}; + + delete $v->{arc}; + } + + print "processing resources...\n" if $VERBOSE; + my $enc = JSON::XS->new->utf8->canonical->relaxed; + while (my ($k, $v) = each %RESOURCE) { + + if ($v->{meta} && $v->{meta}{datadir}) { + delete $RESOURCE{$k}; + + $k =~ s/^res\/// or die "$k: datadir files must be in res/"; + + printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE; + open my $fh, ">:raw", "$DATADIR/$k~" + or die "$DATADIR/$k~: $!"; + syswrite $fh, $v->{data}; + push @COMMIT, $k; + + } else { + if ($v->{type} & 1) { + # prepend meta info + + my $meta = $enc->encode ({ + name => $k, + %{ $v->{meta} || {} }, + }); + + $v->{data} = pack "(w/a*)*", $meta, $v->{data}; + } + + make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients + } } + printf "writing facedata (%d faces, %d anims, %d resources)...\n", + scalar keys %FACEINFO, + scalar keys %ANIMINFO, + scalar keys %RESOURCE + if $VERBOSE; + open my $fh, ">:perlio", "$DATADIR/facedata~" or die "$DATADIR/facedata~: $!"; - print $fh freeze { + print $fh nfreeze { version => 2, faceinfo => \%FACEINFO, animinfo => \%ANIMINFO, + resource => \%RESOURCE, }; + } - for (qw(archetypes facedata treasures)) { + print "committing files...\n" if $VERBOSE; + + for (qw(archetypes facedata treasures), @COMMIT) { chmod 0644, "$DATADIR/$_~"; rename "$DATADIR/$_~", "$DATADIR/$_" or die "$DATADIR/$_: $!";