--- deliantra/server/utils/cfutil.in 2009/11/15 18:04:00 1.79 +++ deliantra/server/utils/cfutil.in 2010/10/20 06:21:48 1.106 @@ -22,7 +22,7 @@ # The authors can be reached via e-mail to # -use strict; +use common::sense; my $prefix = "@prefix@"; my $exec_prefix = "@exec_prefix@"; @@ -76,21 +76,32 @@ my $FORCE; my $TMPDIR = "/tmp/cfutil$$~"; my $TMPFILE = "aaaa0"; +my @COMMIT; our %COLOR = ( + # original cf colours black => 0, white => 1, - navy => 2, + navy => 2, # "dark blue" red => 3, orange => 4, - blue => 5, + blue => 5, # "light blue" darkorange => 6, green => 7, lightgreen => 8, grey => 9, - brown => 10, - gold => 11, - tan => 12, + brown => 10, # "yellow" + gold => 11, # "light yellow" + tan => 12, # yellowish gray + + # new for deliantra + none => 13, + + # compatibility to existing archetypes + lightblue => 5, + gray => 9, + yellow => 11, + khaki => 12, ); END { system "rm", "-rf", $TMPDIR } @@ -107,7 +118,7 @@ my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; if (exists $hash{$hash}) { - # hahs collinion, but some files are simply identical + # 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; @@ -170,14 +181,14 @@ our $QUANTIZE = "+dither -colorspace RGB -colors 256"; our $c_arc = new Coro::Channel; - our $c_trs = new Coro::Channel; - our $c_res = new Coro::Channel; + our $c_any = 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; } @@ -405,21 +416,58 @@ 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; } } - sub process_arc { - while (my $job = $c_arc->get) { - my ($dir, $file) = @$job; + sub process_faceinfo { + my ($dir, $file) = @_; + my $path = "$dir/$file"; + + my $data; + if (0 > aio_load $path, $data) { + warn "$path: $!, skipping.\n"; + return; + } + for (split /\n/, $data) { + chomp; + my ($face, $visibility, $fg, $bg, $glyph) = split /\s+/; + # bg not used except for text clients + + utf8::decode $glyph; + $glyph =~ s/^\?(?=.)//; # remove "autoglyph" flag + + $fg = "white" if $fg eq "none"; # lots of faces have no fg colour yet + + (my $fgi = $COLOR{$fg}) + // warn "WARNING: $path: $face specifies unknown foreground colour '$fg'.\n"; + (my $bgi = $COLOR{$bg}) + // warn "WARNING: $path: $face specifies unknown background colour '$bg'.\n"; + + my $fi = $FACEINFO{$face} ||= { }; + $fi->{visibility} = $visibility * 1; + $fi->{magicmap} = $fgi; # foreground colour becomes magicmap + + $glyph .= " " if 2 > length $glyph; # TODO kanji + + $fi->{glyph} = ""; + for (split //, $glyph, -1) { + utf8::encode $_; + $fi->{glyph} .= (chr $fgi) . (chr $bgi) . $_; + } + } + } + + sub process_arc { + while (my ($dir, $file) = @{ $c_arc->get }) { my $arc; aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ @@ -432,9 +480,6 @@ $o->{editor_folder} ||= "\x00$dir"; # horrible kludge - my $visibility = delete $o->{visibility}; - my $magicmap = delete $o->{magicmap}; - # find upper left corner :/ # omg, this is sooo broken my ($dx, $dy); @@ -451,9 +496,6 @@ $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; - $visibility = delete $o->{visibility} if exists $o->{visibility}; - $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; - my $anim = delete $o->{anim}; if ($anim) { @@ -490,9 +532,6 @@ $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}) { @@ -511,18 +550,16 @@ } sub process_trs { - while (my $job = $c_trs->get) { - my ($dir, $file) = @$job; - my $path = "$dir/$file"; - - my $trs; - if (0 > aio_load $path, $trs) { - warn "$path: $!, skipping.\n"; - next; - } + my ($dir, $file) = @_; + my $path = "$dir/$file"; - $TRS .= $trs; + my $trs; + if (0 > aio_load $path, $trs) { + warn "$path: $!, skipping.\n"; + return; } + + $TRS .= $trs; } my %FILECACHE; @@ -544,62 +581,71 @@ } sub process_res { - while (my $job = $c_res->get) { - my ($dir, $file, $type) = @$job; + my ($dir, $file, $type) = @_; - my $data; - aio_load "$dir/$file", $data; + my $data; + aio_load "$dir/$file", $data; - my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; + my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) }; - utf8::decode $dir; - utf8::decode $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; - } + # a meta file for resources is now mandatory + unless (exists $meta->{$file}) { + warn "skipping $dir/$file\n" if $VERBOSE >= 3; + return; + } - $meta = { - %{ $meta->{"" } || {} }, - %{ $meta->{$file} || {} }, - }; + $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::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"; - } + 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) : (), - }; + $RESOURCE{"$dir/$file"} = { + type => (exists $meta->{type} ? delete $meta->{type} : $type), + data => $data, + %$meta ? (meta => $meta) : (), + }; + } + + sub process_any { + while (my ($func, @args) = @{ $c_any->get }) { + $func->(@args); } } @@ -607,48 +653,60 @@ sub find_files { my ($path) = @_; - IO::AIO::aioreq_pri 4; - IO::AIO::aio_scandir $path, 4, sub { - my ($dirs, $nondirs) = @_; - - find_files "$path/$_" - for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; - - my $dir = $path; - substr $dir, 0, 1 + length $PATH, ""; - - for my $file (@$nondirs) { - 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]); - } + my $grp = IO::AIO::aio_group; - } elsif ($file =~ /\.png$/) { - push @c_png, ["$path/$file", 0]; + my $scandir; $scandir = sub { + my ($path) = @_; - } elsif ($file =~ /\.trs$/) { - $c_trs->put ([$path, $file]); + IO::AIO::aioreq_pri 4; + add $grp IO::AIO::aio_scandir $path, 4, sub { + my ($dirs, $nondirs) = @_; + + $scandir->("$path/$_") + for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs; + + my $dir = $path; + substr $dir, 0, 1 + length $PATH, ""; + + for my $file (@$nondirs) { + if ($dir =~ /^music(?:\/|$)/) { + $c_any->put ([\&process_res, $path, $file, 3]) # FT_MUSIC + if $file =~ /\.(ogg)$/; + + } elsif ($dir =~ /^sound(?:\/|$)/) { + $c_any->put ([\&process_res, $path, $file, 5]) # FT_SOUND + if $file =~ /\.(wav|ogg)$/; + + } elsif ($dir =~ /^res(?:\/|$)/) { + if ($file =~ /\.(jpg|png)$/) { + $c_any->put ([\&process_res, $path, $file, 0]) # FT_FACE + } elsif ($file =~ /\.(res)$/) { + $c_any->put ([\&process_res, $path, $file, 6]) # FT_RSRC + } else { + $c_any->put ([\&process_res, $path, $file, undef]); + } - } elsif ($file =~ /\.arc$/) { - $c_arc->put ([$path, $file]); + } elsif ($file =~ /\.png$/) { + push @c_png, ["$path/$file", 0]; - } else { - warn "ignoring $path/$file\n" if $VERBOSE >= 3; + } elsif ($file =~ /\.faceinfo$/) { + $c_any->put ([\&process_faceinfo, $path, $file]); + + } elsif ($file =~ /\.trs$/) { + $c_any->put ([\&process_trs, $path, $file]); + + } elsif ($file =~ /\.arc$/) { + $c_arc->put ([$path, $file]); + + } else { + warn "ignoring $path/$file\n" if $VERBOSE >= 3; + } } - } + }; }; + + $scandir->($path); + aio_wait $grp; } sub generate_plurals { @@ -696,21 +754,15 @@ exit 1 unless $FORCE; } - print "scanning files...\n" if $VERBOSE; - - find_files $path; + print "start file scan, arc, any processing...\n" if $VERBOSE; 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; + my @a_any = map +(async \&process_any), 1..4; - IO::AIO::flush; + find_files $path; - $c_res->shutdown; $c_arc->shutdown; - $c_trs->shutdown; - - print "start file scan, arc, res processing...\n" if $VERBOSE; + $c_any->shutdown; $_->join for @a_arc; # need to parse all archetypes before png processing @@ -719,7 +771,11 @@ # 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 "end any processing...\n" if $VERBOSE; + $_->join for @a_any; + + print "end png processing...\n" if $VERBOSE; + $_->join for @a_png; print "scanning done, processing results...\n" if $VERBOSE; { @@ -735,7 +791,7 @@ 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; @@ -747,7 +803,7 @@ ++$progress; } } else { - warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; + warn "WARNING: archetype '$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; delete $ARC{$o->{_name}}; } } @@ -764,8 +820,19 @@ # 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; + # fix up archetypes without names, where the archanme doesn't work at all + for (@ARC) { + if (!exists $_->{name} and $_->{_name} =~ /_/) { + for ($_->{name} = $_->{_name}) { + s/(?:_\d+)+$//; + s/_[nesw]+$//; + y/_/ /; + } + } + } + + #print "generating plurals...\n" if $VERBOSE; + #generate_plurals; printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE; open my $fh, ">:utf8", "$DATADIR/archetypes~" @@ -783,39 +850,51 @@ { 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} or warn "WARNING: face '$k' has no png32. this will not work (shoddy gcfclient will crash of course).\n"; + length $v->{data64} or warn "WARNING: face '$k' has no png64. this will not work very well.\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"; + #length $v->{data32} <= 10000 or warn "WARNING: face '$k' has face32 larger than 10000 bytes, will not work with crossfire client.\n"; + #length $v->{data64} <= 10000 or warn "WARNING: face '$k' has face64 larger than 10000 bytes.\n"; - if (my $magicmap = $v->{magicmap}) { - $magicmap =~ y/A-Z_\-/a-z/d; - $v->{magicmap} = $COLOR{$magicmap}; - } + $v->{glyph} // warn "WARNING: face '$k' has glyph."; + $v->{visibility} // warn "WARNING: face '$k' has no visibility info, missing faceinfo entry?\n"; + $v->{magicmap} // warn "WARNING: face '$k' has foreground colour."; - delete $v->{arc}; + delete @$v{qw(arc stem)}; # not used by the server } print "processing resources...\n" if $VERBOSE; my $enc = JSON::XS->new->utf8->canonical->relaxed; while (my ($k, $v) = each %RESOURCE) { - if ($v->{type} & 1) { - # prepend meta info + if ($v->{meta} && $v->{meta}{datadir}) { + delete $RESOURCE{$k}; - my $meta = $enc->encode ({ - name => $k, - %{ $v->{meta} || {} }, - }); + $k =~ s/^res\/// or die "$k: datadir files must be in res/"; - $v->{data} = pack "(w/a*)*", $meta, $v->{data}; - } + 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 - make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients + 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", @@ -827,7 +906,7 @@ open my $fh, ">:perlio", "$DATADIR/facedata~" or die "$DATADIR/facedata~: $!"; - print $fh freeze { + print $fh nfreeze { version => 2, faceinfo => \%FACEINFO, animinfo => \%ANIMINFO, @@ -838,7 +917,7 @@ print "committing files...\n" if $VERBOSE; - for (qw(archetypes facedata treasures)) { + for (qw(archetypes facedata treasures), @COMMIT) { chmod 0644, "$DATADIR/$_~"; rename "$DATADIR/$_~", "$DATADIR/$_" or die "$DATADIR/$_: $!";