--- deliantra/server/utils/cfutil.in 2007/03/17 19:57:02 1.18 +++ deliantra/server/utils/cfutil.in 2007/12/17 08:03:22 1.63 @@ -8,21 +8,28 @@ 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 AnyEvent; +use YAML::Syck (); +use JSON::XS (); use IO::AIO (); use File::Temp; use Crossfire; use Coro; use Coro::AIO; +use Coro::Util; use POSIX (); -use Digest::MD5; -use Storable; $Storable::canonical = 1; +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 }); @@ -70,39 +93,49 @@ sub inst_maps($) { my (undef, $path) = @_; - print "installing '$path' to '$DATADIR/maps'\n"; + print "\nInstalling '$path' to '$DATADIR/maps'\n\n"; if (!-f "$path/regions") { warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 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 %PNG32; + our %ANIMINFO; our %FACEINFO; + our %RESOURCE; our @ARC; + our %ARC; our $TRS; our $NFILE; - our %ANIM; + 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; - sub commit_png { - my ($name, $data) = @_; + our @c_png; - $PNG32{$name} = $data; - $FACEINFO{$name} ||= {}; + sub commit_png($$$) { + my ($name, $data, $T) = @_; + + $FACEINFO{$name}{"data$T"} = $data; } sub process_png { - while (@png) { - my $path = pop @png; + while (@c_png) { + my ($path, $delete) = @{pop @c_png}; my $png; aio_lstat $path; @@ -113,22 +146,26 @@ next; } + my $stem = $path; + my $T; + + if ($stem =~ s/\.32x32\.png~?$//) { + $T = 32; + } elsif ($stem =~ s/\.64x64\.png~?$//) { + $T = 64; + } else { + warn "$path: weird filename, skipping.\n"; + next; + } + # quickly extract width and height of the (necessarily PNG) image unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { - warn "$path: not a recongized png file, skipping.\n"; + warn "$path: not a recognized png file, skipping.\n"; next; } my ($w, $h) = unpack "NN", $1; - (my $face = $path) =~ s/^.*\///; - my $T = 32; - - unless ($face =~ s/\.32x32\.png$//) { - warn "$path: weird filename, skipping.\n"; - next; - } - if ($w < $T || $h < $T) { warn "$path: too small ($w $h), skipping.\n"; next; @@ -139,6 +176,134 @@ 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)) { + fork_sub { + 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 @c_png, [$other, !$CACHE]; + } + + # possibly scale down + if (0 > aio_stat "$stem.32x32.png") { + my $other = "$stem.32x32.png~"; + + 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, "-i0", "-q", "$other~"; + + # reduce smoothfaces >10000 bytes + if ($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 @c_png, [$other, !$CACHE]; + } + } + + (my $face = $stem) =~ s/^.*\///; + + # split all bigfaces, but avoid smoothfaces (*_S) if (($w > $T || $h > $T) && $face !~ /_S\./) { # split my @tile; @@ -162,7 +327,8 @@ "+clone", -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), "+repage", - -write => "png:$_->[2]~", + -quality => "00", + -write => "png32:$_->[2]~", "+delete", ")", ) @@ -176,6 +342,7 @@ # pass 2, optimise, and rename for (@todo) { system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; + die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~"; rename "$_->[2]~", $_->[2]; } }; @@ -189,18 +356,20 @@ 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; + commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; } } else { # use as-is (either small, use smooth) - commit_png $face, $png; + commit_png $face, $png, $T; } + + aio_unlink $path if $delete; } } 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 :/ @@ -208,6 +377,9 @@ my $arc = read_arch "$dir/$file"; for my $o (values %$arc) { push @ARC, $o; + for (my $m = $o; $m; $m = $m->{more}) { + $ARC{$m->{_name}} = $m; + } $o->{editor_folder} = $dir; @@ -228,42 +400,60 @@ my $ext = $x|$y ? "+$x+$y" : ""; - $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/; + $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}; if ($anim) { + # possibly add $ext to the animation name to avoid + # the need to specify archnames for all parts + # of a multipart archetype. $o->{animation} = "$o->{_name}"; + my $facings = 1; + my @frames; for (@$anim) { - $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/; + if (/^facings\s+(\d+)/) { + $facings = $1*1; + } elsif (/^blank.x11$|^empty.x11$/) { + push @frames, $_; + } else { + push @frames, "$_$ext"; + } } - $ANIM{"$o->{_name}$ext"} = - join "", map "$_\n", - "anim $o->{_name}", - @$anim, - "mina"; + $ANIMINFO{$o->{animation}} = { + facings => $facings, + frames => \@frames, + }; } - 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 ($face, $smooth) = split /\s+/, $smooth; - # skip empty_S.x11, it seems to server no purpose whatsoever - # but increases bandwidth demands and worse. - unless ($smooth eq "empty_S.x11") { - $FACEINFO{$face}{smooth} = $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; } } } @@ -272,8 +462,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; @@ -286,6 +476,78 @@ } } + 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; + } + + $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::Syck::Load $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) = @_; @@ -297,15 +559,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"; + 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, 7]) # 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; } } }; @@ -314,60 +599,135 @@ sub inst_arch($) { my (undef, $path) = @_; - print "installing '$path' to '$DATADIR'\n"; + $PATH = $path; + + print "\n", + "Installing '$path' to '$DATADIR'\n", + "\n", + "This can take a long time if you run this\n", + "for the first time or do not use --cache.\n", + "\n", + "Unless you run verbosely, all following warning\n", + "or error messages indicate serious problems.\n", + "\n"; if (!-d "$path/treasures") { warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 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 ( - (async \&process_png), (async \&process_png), - (async \&process_trs), (async \&process_trs), - (async \&process_arc), (async \&process_arc), - ); + $c_res->put (undef) for @a_res; + $c_arc->put (undef) for @a_arc; + $c_trs->put (undef) for @a_trs; - { - open my $fh, ">:utf8", "$DATADIR/animations~" - or die "$DATADIR/animations~: $!"; - print $fh join "", map $ANIM{$_}, sort keys %ANIM - } + 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; + # four png crunchers work fine for my 2x smp machine + my @a_png = map +(async \&process_png), 1..4; + + $_->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; + my $loop; + + for my $o (values %ARC) { + if (my $other = $o->{inherit}) { + if (my $s = $ARC{$other}) { + if ($s->{inherit}) { + $loop = $s; + } else { + delete $o->{inherit}; + my %s = %$s; + delete @s{qw(_name more name name_pl)}; + %$o = ( %s, %$o ); + ++$progress; + } + } else { + warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; + delete $ARC{$o->{_name}}; + } + } + } + + unless ($progress) { + die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n" + if $loop; + + last; + } + } + + # 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~: $!"; - substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; - print $fh Crossfire::archlist_to_string \@ARC; + print $fh Crossfire::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; } { - while (my ($k, $v) = each %FACEINFO) { - $v->{data32} ||= delete $PNG32{$k}; - } - + 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"; - $v->{chksum32} = Digest::MD5::md5 $v->{data32}; - } + 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"; - open my $fh, ">:perlio", "$DATADIR/faces~" - or die "$DATADIR/faces~: $!"; + if (my $magicmap = $v->{magicmap}) { + $magicmap =~ y/A-Z_\-/a-z/d; + $v->{magicmap} = $COLOR{$magicmap}; + } - $FACEINFO{""} = { version => 1}; - print $fh Storable::nfreeze \%FACEINFO; + delete $v->{arc}; + } + + print "writing facedata...\n" if $VERBOSE; + open my $fh, ">:perlio", "$DATADIR/facedata~" + or die "$DATADIR/facedata~: $!"; + + print $fh freeze { + version => 2, + faceinfo => \%FACEINFO, + animinfo => \%ANIMINFO, + resource => \%RESOURCE, + }; } - for (qw(archetypes faces animations treasures)) { + print "committing files...\n" if $VERBOSE; + + for (qw(archetypes facedata treasures)) { chmod 0644, "$DATADIR/$_~"; rename "$DATADIR/$_~", "$DATADIR/$_" or die "$DATADIR/$_: $!";