ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.37 by root, Tue Jul 10 16:24:00 2007 UTC vs.
Revision 1.93 by root, Tue Oct 5 23:59:47 2010 UTC

1#!@PERL@ 1#!@PERL@
2 2
3use strict; 3#
4# This file is part of Deliantra, the Roguelike Realtime MMORPG.
5#
6# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
7#
8# Deliantra is free software: you can redistribute it and/or modify it under
9# the terms of the Affero GNU General Public License as published by the
10# Free Software Foundation, either version 3 of the License, or (at your
11# option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU General Public License for more details.
17#
18# You should have received a copy of the Affero GNU General Public License
19# and the GNU General Public License along with this program. If not, see
20# <http://www.gnu.org/licenses/>.
21#
22# The authors can be reached via e-mail to <support@deliantra.net>
23#
24
25use common::sense;
4 26
5my $prefix = "@prefix@"; 27my $prefix = "@prefix@";
6my $exec_prefix = "@exec_prefix@"; 28my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 29my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 30my $DATADIR = "@datadir@/@PACKAGE@";
… …
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 36my $PNGNQ = "@PNGNQ@";
15 37
16use Getopt::Long; 38use Getopt::Long;
39use File::Temp;
40use POSIX ();
41use Carp;
42
17use Coro::Event; 43use Coro::EV;
18use AnyEvent; 44use AnyEvent;
45use YAML::XS ();
46use JSON::XS ();
19use IO::AIO (); 47use IO::AIO ();
20use File::Temp; 48use Digest::MD5 ();
21use Crossfire; 49
22use Coro; 50use Coro 5.12;
23use Coro::AIO; 51use Coro::AIO;
24use POSIX (); 52use Coro::Util;
25use Digest::MD5; 53use Coro::Channel;
26use Coro::Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
57
58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 59
28sub usage { 60sub usage {
29 warn <<EOF; 61 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 62Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 63 [--install-arch path]
… …
42my $VERBOSE = 1; 74my $VERBOSE = 1;
43my $CACHE = 0; 75my $CACHE = 0;
44my $FORCE; 76my $FORCE;
45my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
46my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
47 80
48our %COLOR = ( 81our %COLOR = (
49 black => 0, 82 black => 0,
50 white => 1, 83 white => 1,
51 navy => 2, 84 navy => 2,
… …
61 tan => 12, 94 tan => 12,
62); 95);
63 96
64END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
65 98
66Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
67Event->signal (signal => "TERM", cb => sub { exit 1 }); 100my $s_TERM = EV::signal TERM => sub { exit 1 };
101
102our %hash;
103
104# here we could try to avoid collisions and reduce chksum size further
105sub make_hash($\$\$;$) {
106 my ($id, $dataref, $hashref, $clen) = @_;
107
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
109
110 if (exists $hash{$hash}) {
111 # hash collision, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n";
114 exit 1;
115 } else {
116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
117 }
118 }
119 $hash{$hash} = [$id, $dataref, $hashref];
120
121 $$hashref = $hash;
122}
68 123
69mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
70 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
71 126
72sub fork_sub(&) { 127sub fork_sub(&) {
… …
92 if (!-f "$path/regions") { 147 if (!-f "$path/regions") {
93 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 148 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
94 exit 1 unless $FORCE; 149 exit 1 unless $FORCE;
95 } 150 }
96 151
97 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 152 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
153 "$path/.", "$DATADIR/maps/.",
154 "--exclude", "CVS", "--exclude", "/world-precomposed",
155 "--delete", "--delete-excluded"
98 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
99 157
100 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
159}
160
161our %WALL_SUFFIX = (
162 "_0" => "⬤",
163 "_1_3" => "╸",
164 "_1_4" => "╺",
165 "_2_1_2" => "━",
166
167 "_1_2" => "╹",
168 "_2_2_4" => "┛",
169 "_2_2_1" => "┗",
170 "_3_1" => "┻",
171
172 "_1_1" => "╻",
173 "_2_2_3" => "┓",
174 "_2_2_2" => "┏",
175 "_3_3" => "┳",
176
177 "_2_1_1" => "┃",
178 "_3_4" => "┫",
179 "_3_2" => "┣",
180 "_4" => "╋",
181);
182
183sub autoglyph {
184 my ($stem, $face) = @_;
185
186 if ($stem =~ /^wall\/|Nimwall/) {
187 if ($stem =~ /((?:_[0-4])+).x11/) {
188 return $WALL_SUFFIX{$1} if exists $WALL_SUFFIX{$1};
189 }
190
191 "+"
192
193 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
194 "."
195
196 } elsif ($stem =~ /^player\//) {
197 "\@"
198
199 } else {
200 substr $stem, 0, 1
201 }
101} 202}
102 203
103{ 204{
104 our %ANIMINFO; 205 our %ANIMINFO;
105 our %FACEINFO; 206 our %FACEINFO;
… …
110 our $NFILE; 211 our $NFILE;
111 our $PATH; 212 our $PATH;
112 213
113 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 214 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
114 215
115 our (@png, @trs, @arc, @res); # files we are interested in 216 our $c_arc = new Coro::Channel;
217 our $c_trs = new Coro::Channel;
218 our $c_res = new Coro::Channel;
116 219
220 our @c_png;
221
117 sub commit_png($$$) { 222 sub commit_png($$$$) {
118 my ($name, $data, $T) = @_; 223 my ($stem, $name, $data, $T) = @_;
119 224
225 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
120 $FACEINFO{$name}{"data$T"} = $data; 226 $FACEINFO{$name}{"data$T"} = $data;
121 } 227 }
122 228
123 sub process_png { 229 sub process_png {
124 while (@png) { 230 while (@c_png) {
125 my ($path, $delete) = @{pop @png}; 231 my ($path, $delete) = @{pop @c_png};
126 232
127 my $png; 233 my $png;
128 aio_lstat $path; 234 aio_lstat $path;
129 my ($size, $mtime) = (stat _)[7,9]; 235 my ($size, $mtime) = (stat _)[7,9];
130 236
… …
161 if ($w % $T || $h % $T) { 267 if ($w % $T || $h % $T) {
162 warn "$path: weird png size ($w $h), skipping.\n"; 268 warn "$path: weird png size ($w $h), skipping.\n";
163 next; 269 next;
164 } 270 }
165 271
272 (my $base = $stem) =~ s/^.*\///;
273
274 my $fi = $FACEINFO{$base};
275 unless ($fi) {
276 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
277 #next;
278 }
279
280 my $arc = $fi->{arc} || { };
281
166 unless ($path =~ /~$/) { 282 unless ($path =~ /~$/) {
167 # possibly enlarge 283 # possibly enlarge
168 if (0 > aio_stat "$stem.64x64.png") { 284 if (0 > aio_stat "$stem.64x64.png") {
169 my $other = "$stem.64x64.png~"; 285 my $other = "$stem.64x64.png~";
170 286
171 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 287 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
172 my $wrap = 0; # for the time being
173 fork_sub { 288 fork_sub {
289 my $CROP;
290 my $SRC = "png:\Q$path\E";
291
292 my $is_floor = $arc->{is_floor};
293 my $is_wall = 0;
294
295 my ($wall_pfx, $wall_dir, $wall_sfx);
296
297 if (
298 !$is_floor
299 && !$arc->{alive}
300 && $arc->{move_block} eq "all"
301 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
302 ) {
303 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
304
305 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
306 $is_wall = 1;
307 }
308 }
309
310 if ($is_wall || $is_floor) {
311 # add a 4px border and add other images around it
312 $CROP = "-shave 8x8 +repage";
313
314 $w += 8;
315 $h += 8;
316
317 $SRC = "-size ${w}x${h} xc:transparent";
318 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
319
320 # 8 surrounding images
321 for (
322 # x y b r0 r1
323 [-1, -1, 0, 6],
324 [ 0, -1, 1, 10, 14],
325 [+1, -1, 0, 12],
326
327 [-1, 0, 8, 5, 7],
328 #
329 [+1, 0, 2, 5, 13],
330
331 [-1, +1, 0, 3],
332 [ 0, +1, 4, 10, 11],
333 [+1, +1, 0, 9],
334 ) {
335 my ($x, $y, $d, $r0, $r1) = @$_;
336
337 my $tile = $is_floor ? $path
338 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
339 : die;
340
341 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
342 "\Q$tile",
343 $x * ($w - 8) + 4,
344 $y * ($h - 8) + 4;
345 }
346 }
347
174 system "convert png:\Q$path\E -depth 8 rgba:-" 348 system "convert -depth 8 $SRC rgba:-"
175 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 349 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
176 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 350 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
177 and die "convert/hq2xa pipeline error: status $? ($!)"; 351 and die "convert/cfhq2xa pipeline error: status $? ($!)";
178 system $OPTIPNG, "-i0", "-q", "$other~"; 352 system $OPTIPNG, "-i0", "-q", "$other~";
179 die "$other~ has zero size, aborting." unless -s "$other~"; 353 die "$other~ has zero size, aborting." unless -s "$other~";
180 rename "$other~", $other; 354 rename "$other~", $other;
181 }; 355 };
182 } 356 }
183 357
184 push @png, [$other, !$CACHE]; 358 push @c_png, [$other, !$CACHE];
185 } 359 }
186 360
187 # possibly scale down 361 # possibly scale down
188 if (0 > aio_stat "$stem.32x32.png") { 362 if (0 > aio_stat "$stem.32x32.png") {
189 my $other = "$stem.32x32.png~"; 363 my $other = "$stem.32x32.png~";
… …
192 fork_sub { 366 fork_sub {
193 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 367 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
194 system $OPTIPNG, "-i0", "-q", "$other~"; 368 system $OPTIPNG, "-i0", "-q", "$other~";
195 369
196 # reduce smoothfaces >10000 bytes 370 # reduce smoothfaces >10000 bytes
371 # obsolete, no longer required
197 if ($stem =~ /_S\./ && (-s "$other~") > 10000) { 372 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
198 my $ncolor = 256; 373 my $ncolor = 256;
199 while () { 374 while () {
200 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E"; 375 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
201 system $OPTIPNG, "-i0", "-q", "$other~~"; 376 system $OPTIPNG, "-i0", "-q", "$other~~";
202 last if 10000 > -s "$other~~"; 377 last if 10000 > -s "$other~~";
… …
214 rename "$other~", $other; 389 rename "$other~", $other;
215 }; 390 };
216 } 391 }
217 392
218 #warn "scaled down $path to $other\n";#d# 393 #warn "scaled down $path to $other\n";#d#
219 push @png, [$other, !$CACHE]; 394 push @c_png, [$other, !$CACHE];
220 } 395 }
221 } 396 }
222 397
223 (my $face = $stem) =~ s/^.*\///; 398 (my $face = $stem) =~ s/^.*\///;
224 399
… …
273 448
274 if (0 > aio_load $file, $tile) { 449 if (0 > aio_load $file, $tile) {
275 die "$path: unable to read tile +$x+$y, aborting.\n"; 450 die "$path: unable to read tile +$x+$y, aborting.\n";
276 } 451 }
277 IO::AIO::aio_unlink $file unless $CACHE; 452 IO::AIO::aio_unlink $file unless $CACHE;
278 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 453 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
279 } 454 }
280 } else { 455 } else {
281 # use as-is (either small, use smooth) 456 # use as-is (either small, use smooth)
282 commit_png $face, $png, $T; 457 commit_png $stem, $face, $png, $T;
283 } 458 }
284 459
285 aio_unlink $path if $delete; 460 aio_unlink $path if $delete;
286 } 461 }
287 } 462 }
288 463
289 sub process_arc { 464 sub process_arc {
290 while (@arc) { 465 while (my $job = $c_arc->get) {
291 my ($dir, $file) = @{pop @arc}; 466 my ($dir, $file) = @$job;
292 467
293 my $arc; 468 my $arc;
294 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 469 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
295 470
296 my $arc = read_arch "$dir/$file"; 471 my $arc = read_arch "$dir/$file";
… …
298 push @ARC, $o; 473 push @ARC, $o;
299 for (my $m = $o; $m; $m = $m->{more}) { 474 for (my $m = $o; $m; $m = $m->{more}) {
300 $ARC{$m->{_name}} = $m; 475 $ARC{$m->{_name}} = $m;
301 } 476 }
302 477
303 $o->{editor_folder} = $dir; 478 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
304 479
305 my $visibility = delete $o->{visibility}; 480 my $visibility = delete $o->{visibility};
306 my $magicmap = delete $o->{magicmap}; 481 my $magicmap = delete $o->{magicmap};
482 my $glyph = delete $o->{glyph};
307 483
308 # find upper left corner :/ 484 # find upper left corner :/
309 # omg, this is sooo broken 485 # omg, this is sooo broken
310 my ($dx, $dy); 486 my ($dx, $dy);
311 for (my $o = $o; $o; $o = $o->{more}) { 487 for (my $o = $o; $o; $o = $o->{more}) {
… …
321 497
322 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 498 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
323 499
324 $visibility = delete $o->{visibility} if exists $o->{visibility}; 500 $visibility = delete $o->{visibility} if exists $o->{visibility};
325 $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 501 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
502 $glyph = delete $o->{glyph} if exists $o->{glyph};
326 503
327 my $anim = delete $o->{anim}; 504 my $anim = delete $o->{anim};
328 505
329 if ($anim) { 506 if ($anim) {
330 # possibly add $ext to the animation name to avoid 507 # possibly add $ext to the animation name to avoid
… …
348 facings => $facings, 525 facings => $facings,
349 frames => \@frames, 526 frames => \@frames,
350 }; 527 };
351 } 528 }
352 529
353 for my $face ($o->{face} || (), @{$anim || []}) { 530 for ($o->{face} || (), @{$anim || []}) {
354 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 531 next if /^facings\s/;
355 532
533 my $face = $_;
534 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
535
356 my $info = $FACEINFO{$face} ||= {}; 536 my $info = $FACEINFO{$face} ||= { };
537 $info->{arc} = $o;
538
539 next if $face =~ /^blank.x11$|^empty.x11$/;
357 540
358 $info->{visibility} = $visibility if defined $visibility; 541 $info->{visibility} = $visibility if defined $visibility;
359 $info->{magicmap} = $magicmap if defined $magicmap; 542 $info->{magicmap} = $magicmap if defined $magicmap;
543 $info->{glyph} = $glyph if defined $glyph;
360 } 544 }
361 545
362 if (my $smooth = delete $o->{smoothface}) { 546 if (my $smooth = delete $o->{smoothface}) {
363 my %kv =split /\s+/, $smooth; 547 my %kv = split /\s+/, $smooth;
364 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 548 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
365 while (my ($face, $smooth) = each %kv) { 549 while (my ($face, $smooth) = each %kv) {
550 $FACEINFO{$smooth}{arc} = $o;
551
366 $FACEINFO{$face}{smooth} = $smooth; 552 $FACEINFO{$face}{smooth} = $smooth;
367 $FACEINFO{$face}{smoothlevel} = $level; 553 $FACEINFO{$face}{smoothlevel} = $level;
368 } 554 }
369 } 555 }
370 } 556 }
371 } 557 }
372 } 558 }
373 } 559 }
374 560
375 sub process_trs { 561 sub process_trs {
376 while (@trs) { 562 while (my $job = $c_trs->get) {
377 my ($dir, $file) = @{pop @trs}; 563 my ($dir, $file) = @$job;
378 my $path = "$dir/$file"; 564 my $path = "$dir/$file";
379 565
380 my $trs; 566 my $trs;
381 if (0 > aio_load $path, $trs) { 567 if (0 > aio_load $path, $trs) {
382 warn "$path: $!, skipping.\n"; 568 warn "$path: $!, skipping.\n";
… …
385 571
386 $TRS .= $trs; 572 $TRS .= $trs;
387 } 573 }
388 } 574 }
389 575
576 my %FILECACHE;
577
578 sub load_cached($;$) {
579 unless (exists $FILECACHE{$_[0]}) {
580 my $data;
581 if (0 < aio_load $_[0], $data) {
582 if ($_[1]) {
583 $data = eval { $_[1]->($data) };
584 warn "$_[0]: $@" if $@;
585 }
586 }
587
588 $FILECACHE{$_[0]} = $data;
589 }
590
591 $FILECACHE{$_[0]}
592 }
593
390 sub process_res { 594 sub process_res {
391 while (@res) { 595 while (my $job = $c_res->get) {
392 my ($dir, $file) = @{pop @res}; 596 my ($dir, $file, $type) = @$job;
393 597
394 my $data; 598 my $data;
395 aio_load "$dir/$file", $data; 599 aio_load "$dir/$file", $data;
396 600
601 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
602
603 utf8::decode $dir;
604 utf8::decode $file;
605
606 # a meta file for resources is now mandatory
607 unless (exists $meta->{$file}) {
608 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
609 next;
610 }
611
612 $meta = {
613 %{ $meta->{"" } || {} },
614 %{ $meta->{$file} || {} },
615 };
616
617 if ($meta->{license} =~ s/^#//) {
618 $meta->{license} = ({
619 "pd" => "Public Domain",
620 "gpl" => "GNU General Public License, version 3.0 or any later",
621 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
622 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
623 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
624 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
625 })->{$meta->{license}}
626 || warn "$dir/$file: license tag '$meta->{license}' not found.";
627 }
628
629 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
630 ($meta->{author} = $1) =~ s/_/ /g;
631 }
632
397 $file =~ s/\.res$//; 633 $file =~ s/\.res$//;
398 $file =~ /\.([^.]+)$/ 634 $file =~ s/\.(ogg|wav|jpg|png)$//;
399 or next;
400
401 my $type = $1;
402 635
403 substr $dir, 0, 1 + length $PATH, ""; 636 substr $dir, 0, 1 + length $PATH, "";
404 637
638 if (my $filter = $meta->{cfutil_filter}) {
639 if ($filter eq "yaml2json") {
640 $data = JSON::XS::encode_json YAML::XS::Load $data;
641 } elsif ($filter eq "json2json") {
642 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
643 } elsif ($filter eq "perl2json") {
644 $data = eval $data; die if $@;
645 $data = JSON::XS::encode_json $data;
646 } else {
647 warn "$dir/$file: unknown filter $filter, skipping\n";
648 }
649 }
650
405 $RESOURCE{"$dir/$file"} = { 651 $RESOURCE{"$dir/$file"} = {
406 type => $1, 652 type => (exists $meta->{type} ? delete $meta->{type} : $type),
407 copyright => "", # TODO
408 data => $data, 653 data => $data,
409 chksum => Digest::MD5::md5 $data, 654 %$meta ? (meta => $meta) : (),
410 }; 655 };
411 } 656 }
412 } 657 }
413 658
414 sub find_files; 659 sub find_files;
… …
418 IO::AIO::aioreq_pri 4; 663 IO::AIO::aioreq_pri 4;
419 IO::AIO::aio_scandir $path, 4, sub { 664 IO::AIO::aio_scandir $path, 4, sub {
420 my ($dirs, $nondirs) = @_; 665 my ($dirs, $nondirs) = @_;
421 666
422 find_files "$path/$_" 667 find_files "$path/$_"
423 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 668 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
669
670 my $dir = $path;
671 substr $dir, 0, 1 + length $PATH, "";
424 672
425 for my $file (@$nondirs) { 673 for my $file (@$nondirs) {
674 if ($dir =~ /^music(?:\/|$)/) {
675 $c_res->put ([$path, $file, 3]) # FT_MUSIC
676 if $file =~ /\.(ogg)$/;
677
678 } elsif ($dir =~ /^sound(?:\/|$)/) {
679 $c_res->put ([$path, $file, 5]) # FT_SOUND
680 if $file =~ /\.(wav|ogg)$/;
681
682 } elsif ($dir =~ /^res(?:\/|$)/) {
683 if ($file =~ /\.(jpg|png)$/) {
684 $c_res->put ([$path, $file, 0]) # FT_FACE
685 } elsif ($file =~ /\.(res)$/) {
686 $c_res->put ([$path, $file, 6]) # FT_RSRC
687 } else {
688 $c_res->put ([$path, $file, undef]);
689 }
690
426 if ($file =~ /\.png$/) { 691 } elsif ($file =~ /\.png$/) {
427 push @png, ["$path/$file", 0]; 692 push @c_png, ["$path/$file", 0];
693
428 } elsif ($file =~ /\.trs$/) { 694 } elsif ($file =~ /\.trs$/) {
429 push @trs, [$path, $file]; 695 $c_trs->put ([$path, $file]);
696
430 } elsif ($file =~ /\.arc$/) { 697 } elsif ($file =~ /\.arc$/) {
431 push @arc, [$path, $file]; 698 $c_arc->put ([$path, $file]);
432 } elsif ($file =~ /\.(ogg|res)$/) { 699
433 push @res, [$path, $file];
434 } else { 700 } else {
435 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 701 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
436 } 702 }
437 } 703 }
438 }; 704 };
705 }
706
707 sub generate_plurals {
708# use Lingua::EN::Inflect ();
709# Lingua::EN::Inflect::classical;
710# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
711# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
712#
713# for my $a (@ARC) {
714# my $name = $a->{name} || $a->{_name};
715#
716# next unless $a->{name_pl};
717# next if $a->{invisible};
718# next if $a->{is_floor};
719# next if $a->{no_pick};
720#
721# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
722# my $pl = $test =~ /^(?:eq|p:.)$/
723# ? $name
724# : Lingua::EN::Inflect::PL $name;
725#
726# if ($pl ne $a->{name_pl}) {
727# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
728# }
729# }
439 } 730 }
440 731
441 sub inst_arch($) { 732 sub inst_arch($) {
442 my (undef, $path) = @_; 733 my (undef, $path) = @_;
443 734
… …
456 if (!-d "$path/treasures") { 747 if (!-d "$path/treasures") {
457 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 748 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
458 exit 1 unless $FORCE; 749 exit 1 unless $FORCE;
459 } 750 }
460 751
752 print "scanning files...\n" if $VERBOSE;
753
461 find_files $path; 754 find_files $path;
755
756 my @a_arc = map +(async \&process_arc), 1..2;
757 my @a_res = map +(async \&process_res), 1..2;
758 my @a_trs = map +(async \&process_trs), 1..2;
759
462 IO::AIO::flush; 760 IO::AIO::flush;
463 761
464 $_->join for ( 762 $c_res->shutdown;
763 $c_arc->shutdown;
764 $c_trs->shutdown;
765
766 print "start file scan, arc, res processing...\n" if $VERBOSE;
767
768 $_->join for @a_arc; # need to parse all archetypes before png processing
769
770 print "end arc, start png processing...\n" if $VERBOSE;
771
465 # four png crunchers work fine for my 2x smp machine 772 # eight png crunchers work fine for my 4x smp machine
466 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 773 my @a_png = map +(async \&process_png), 1..8;
467 (async \&process_trs), (async \&process_trs),
468 (async \&process_arc), (async \&process_arc),
469 (async \&process_res), (async \&process_res),
470 );
471 774
775 $_->join for (@a_trs, @a_res, @a_png);
776
777 print "scanning done, processing results...\n" if $VERBOSE;
472 { 778 {
473 # remove path prefix from editor_folder 779 # remove path prefix from editor_folder
780 $_->{editor_folder} =~ /^\x00/
474 substr $_->{editor_folder}, 0, 1 + length $path, "" 781 and substr $_->{editor_folder}, 0, 2 + length $path, ""
475 for values %ARC; 782 for values %ARC;
476 783
784 print "resolving inheritance tree...\n" if $VERBOSE;
477 # resolve inherit 785 # resolve inherit
478 while () { 786 while () {
479 my $progress; 787 my $progress;
480 my $loop; 788 my $loop;
481 789
482 for my $o (values %ARC) { 790 for my $o (values %ARC) {
483 if (my $other = $o->{inherit}) { 791 for my $other (split /,/, $o->{inherit}) {
484 if (my $s = $ARC{$other}) { 792 if (my $s = $ARC{$other}) {
485 if ($s->{inherit}) { 793 if ($s->{inherit}) {
486 $loop = $s; 794 $loop = $s;
487 } else { 795 } else {
488 delete $o->{inherit}; 796 delete $o->{inherit};
… …
507 } 815 }
508 816
509 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 817 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
510 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 818 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
511 819
820 print "generating plurals...\n" if $VERBOSE;
821 generate_plurals;
822
823 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
512 open my $fh, ">:utf8", "$DATADIR/archetypes~" 824 open my $fh, ">:utf8", "$DATADIR/archetypes~"
513 or die "$DATADIR/archetypes~: $!"; 825 or die "$DATADIR/archetypes~: $!";
514 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 826 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
515 } 827 }
516 828
517 { 829 {
830 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
518 open my $fh, ">:utf8", "$DATADIR/treasures~" 831 open my $fh, ">:utf8", "$DATADIR/treasures~"
519 or die "$DATADIR/treasures~: $!"; 832 or die "$DATADIR/treasures~: $!";
520 print $fh $TRS; 833 print $fh $TRS;
521 } 834 }
522 835
523 { 836 {
837 print "processing facedata...\n" if $VERBOSE;
524 while (my ($k, $v) = each %FACEINFO) { 838 while (my ($k, $v) = each %FACEINFO) {
525 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 839 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
526 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 840 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
527 841
842 make_hash $k, $v->{data32}, $v->{hash32};
843 make_hash $k, $v->{data64}, $v->{hash64};
844
528 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 845 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
529 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 846 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
530
531 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
532 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
533 847
534 if (my $magicmap = $v->{magicmap}) { 848 if (my $magicmap = $v->{magicmap}) {
535 $magicmap =~ y/A-Z_\-/a-z/d; 849 $magicmap =~ y/A-Z_\-/a-z/d;
536 $v->{magicmap} = $COLOR{$magicmap}; 850 $v->{magicmap} = $COLOR{$magicmap};
537 } 851 }
852
853 my $stem = delete $v->{stem};
854 $v->{glyph} //= autoglyph $stem, $v;
855 utf8::encode $v->{glyph};
856 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
857
858 delete $v->{arc};
859 }
860
861 print "processing resources...\n" if $VERBOSE;
862 my $enc = JSON::XS->new->utf8->canonical->relaxed;
863 while (my ($k, $v) = each %RESOURCE) {
864
865 if ($v->{meta} && $v->{meta}{datadir}) {
866 delete $RESOURCE{$k};
867
868 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
869
870 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
871 open my $fh, ">:raw", "$DATADIR/$k~"
872 or die "$DATADIR/$k~: $!";
873 syswrite $fh, $v->{data};
874 push @COMMIT, $k;
875
876 } else {
877 if ($v->{type} & 1) {
878 # prepend meta info
879
880 my $meta = $enc->encode ({
881 name => $k,
882 %{ $v->{meta} || {} },
883 });
884
885 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
886 }
887
888 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
538 } 889 }
890 }
891
892 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
893 scalar keys %FACEINFO,
894 scalar keys %ANIMINFO,
895 scalar keys %RESOURCE
896 if $VERBOSE;
539 897
540 open my $fh, ">:perlio", "$DATADIR/facedata~" 898 open my $fh, ">:perlio", "$DATADIR/facedata~"
541 or die "$DATADIR/facedata~: $!"; 899 or die "$DATADIR/facedata~: $!";
542 900
543 print $fh freeze { 901 print $fh nfreeze {
544 version => 2, 902 version => 2,
545 faceinfo => \%FACEINFO, 903 faceinfo => \%FACEINFO,
546 animinfo => \%ANIMINFO, 904 animinfo => \%ANIMINFO,
547 resource => \%RESOURCE, 905 resource => \%RESOURCE,
548 }; 906 };
549 }
550 907
908 }
909
910 print "committing files...\n" if $VERBOSE;
911
551 for (qw(archetypes facedata treasures)) { 912 for (qw(archetypes facedata treasures), @COMMIT) {
552 chmod 0644, "$DATADIR/$_~"; 913 chmod 0644, "$DATADIR/$_~";
553 rename "$DATADIR/$_~", "$DATADIR/$_" 914 rename "$DATADIR/$_~", "$DATADIR/$_"
554 or die "$DATADIR/$_: $!"; 915 or die "$DATADIR/$_: $!";
555 } 916 }
556 917

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines