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.20 by root, Mon Apr 2 18:04:47 2007 UTC vs.
Revision 1.95 by root, Wed Oct 6 00:19:32 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@";
9 31
10my $CONVERT = "@CONVERT@"; 32my $CONVERT = "@CONVERT@";
11my $IDENTIFY = "@IDENTIFY@"; 33#my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 34my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 35my $RSYNC = "@RSYNC@";
36my $PNGNQ = "@PNGNQ@";
14 37
15use Getopt::Long; 38use Getopt::Long;
39use File::Temp;
40use POSIX ();
41use Carp;
42
16use Coro::Event; 43use Coro::EV;
17use AnyEvent; 44use AnyEvent;
45use YAML::XS ();
46use JSON::XS ();
18use IO::AIO (); 47use IO::AIO ();
19use File::Temp; 48use Digest::MD5 ();
20use Crossfire; 49
21use Coro; 50use Coro 5.12;
22use Coro::AIO; 51use Coro::AIO;
23use POSIX (); 52use Coro::Util;
24use Digest::MD5; 53use Coro::Channel;
25use Storable; $Storable::canonical = 1; 54use Coro::Storable; $Storable::canonical = 1;
55
56use Deliantra;
57
58$SIG{QUIT} = sub { Carp::cluck "QUIT" };
26 59
27sub usage { 60sub usage {
28 warn <<EOF; 61 warn <<EOF;
29Usage: cfutil [-v] [-q] [--force] [--cache] 62Usage: cfutil [-v] [-q] [--force] [--cache]
30 [--install-arch path] 63 [--install-arch path]
41my $VERBOSE = 1; 74my $VERBOSE = 1;
42my $CACHE = 0; 75my $CACHE = 0;
43my $FORCE; 76my $FORCE;
44my $TMPDIR = "/tmp/cfutil$$~"; 77my $TMPDIR = "/tmp/cfutil$$~";
45my $TMPFILE = "aaaa0"; 78my $TMPFILE = "aaaa0";
79my @COMMIT;
80
81our %COLOR = (
82 black => 0,
83 white => 1,
84 navy => 2,
85 red => 3,
86 orange => 4,
87 blue => 5,
88 darkorange => 6,
89 green => 7,
90 lightgreen => 8,
91 grey => 9,
92 brown => 10,
93 gold => 11,
94 tan => 12,
95);
46 96
47END { system "rm", "-rf", $TMPDIR } 97END { system "rm", "-rf", $TMPDIR }
48 98
49Event->signal (signal => "INT", cb => sub { exit 1 }); 99my $s_INT = EV::signal INT => sub { exit 1 };
50Event->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}
51 123
52mkdir $TMPDIR, 0700 124mkdir $TMPDIR, 0700
53 or die "$TMPDIR: $!"; 125 or die "$TMPDIR: $!";
54 126
55sub fork_sub(&) { 127sub fork_sub(&) {
68} 140}
69 141
70sub inst_maps($) { 142sub inst_maps($) {
71 my (undef, $path) = @_; 143 my (undef, $path) = @_;
72 144
73 print "installing '$path' to '$DATADIR/maps'\n"; 145 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
74 146
75 if (!-f "$path/regions") { 147 if (!-f "$path/regions") {
76 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";
77 exit 1 unless $FORCE; 149 exit 1 unless $FORCE;
78 } 150 }
79 151
80 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"
81 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
82 157
83 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
84} 159}
85 160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
163sub autoglyph {
164 my ($stem, $face) = @_;
165
166 if ($stem =~ /^wall\/|Nimwall/) {
167 return $WALL_SUFFIX[hex $1]
168 if $stem =~ /(_[0-9A-F]).x11/;
169
170 "+"
171
172 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
173 "."
174
175 } elsif ($stem =~ /^player\//) {
176 "\@"
177
178 } else {
179 substr $stem, 0, 1
180 }
181}
182
86{ 183{
184 our %ANIMINFO;
87 our %FACEINFO; 185 our %FACEINFO;
186 our %RESOURCE;
88 our @ARC; 187 our @ARC;
188 our %ARC;
89 our $TRS; 189 our $TRS;
90 our $NFILE; 190 our $NFILE;
91 our %ANIM; 191 our $PATH;
92 192
93 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 193 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
94 194
95 our (@png, @trs, @arc); # files we are interested in 195 our $c_arc = new Coro::Channel;
196 our $c_trs = new Coro::Channel;
197 our $c_res = new Coro::Channel;
96 198
199 our @c_png;
200
97 sub commit_png($$$) { 201 sub commit_png($$$$) {
98 my ($name, $data, $T) = @_; 202 my ($stem, $name, $data, $T) = @_;
99 203
204 $FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
100 $FACEINFO{$name}{"data$T"} = $data; 205 $FACEINFO{$name}{"data$T"} = $data;
101 } 206 }
102 207
103 sub process_png { 208 sub process_png {
104 while (@png) { 209 while (@c_png) {
105 my ($path, $delete) = @{pop @png}; 210 my ($path, $delete) = @{pop @c_png};
106 211
107 my $png; 212 my $png;
108 aio_lstat $path; 213 aio_lstat $path;
109 my ($size, $mtime) = (stat _)[7,9]; 214 my ($size, $mtime) = (stat _)[7,9];
110 215
141 if ($w % $T || $h % $T) { 246 if ($w % $T || $h % $T) {
142 warn "$path: weird png size ($w $h), skipping.\n"; 247 warn "$path: weird png size ($w $h), skipping.\n";
143 next; 248 next;
144 } 249 }
145 250
251 (my $base = $stem) =~ s/^.*\///;
252
253 my $fi = $FACEINFO{$base};
254 unless ($fi) {
255 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
256 #next;
257 }
258
259 my $arc = $fi->{arc} || { };
260
146 unless ($path =~ /~$/) { 261 unless ($path =~ /~$/) {
147 # possibly enlarge 262 # possibly enlarge
148 if (0 > aio_stat "$stem.64x64.png") { 263 if (0 > aio_stat "$stem.64x64.png") {
149 my $other = "$stem.64x64.png~"; 264 my $other = "$stem.64x64.png~";
150 265
151 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 266 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
152 warn "rescale $other\n";#d#
153 my $wrap = 0; # for the time being
154 fork_sub { 267 fork_sub {
268 my $CROP;
269 my $SRC = "png:\Q$path\E";
270
271 my $is_floor = $arc->{is_floor};
272 my $is_wall = 0;
273
274 my ($wall_pfx, $wall_dir, $wall_sfx);
275
276 if (
277 !$is_floor
278 && !$arc->{alive}
279 && $arc->{move_block} eq "all"
280 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
281 ) {
282 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
283
284 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
285 $is_wall = 1;
286 }
287 }
288
289 if ($is_wall || $is_floor) {
290 # add a 4px border and add other images around it
291 $CROP = "-shave 8x8 +repage";
292
293 $w += 8;
294 $h += 8;
295
296 $SRC = "-size ${w}x${h} xc:transparent";
297 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
298
299 # 8 surrounding images
300 for (
301 # x y b r0 r1
302 [-1, -1, 0, 6],
303 [ 0, -1, 1, 10, 14],
304 [+1, -1, 0, 12],
305
306 [-1, 0, 8, 5, 7],
307 #
308 [+1, 0, 2, 5, 13],
309
310 [-1, +1, 0, 3],
311 [ 0, +1, 4, 10, 11],
312 [+1, +1, 0, 9],
313 ) {
314 my ($x, $y, $d, $r0, $r1) = @$_;
315
316 my $tile = $is_floor ? $path
317 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
318 : die;
319
320 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
321 "\Q$tile",
322 $x * ($w - 8) + 4,
323 $y * ($h - 8) + 4;
324 }
325 }
326
155 system "convert png:\Q$path\E -depth 8 rgba:-" 327 system "convert -depth 8 $SRC rgba:-"
156 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 328 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
157 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 329 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
158 and die "convert/hq2xa pipeline error: status $? ($!)"; 330 and die "convert/cfhq2xa pipeline error: status $? ($!)";
159 system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; 331 system $OPTIPNG, "-i0", "-q", "$other~";
160 die "$other~ has zero size, aborting." unless -s "$other~"; 332 die "$other~ has zero size, aborting." unless -s "$other~";
161 rename "$other~", $other; 333 rename "$other~", $other;
162 }; 334 };
163 } 335 }
164 336
165 push @png, [$other, !$CACHE]; 337 push @c_png, [$other, !$CACHE];
166 } 338 }
167 339
168 # possibly scale down 340 # possibly scale down
169 if (0 > aio_stat "$stem.32x32.png") { 341 if (0 > aio_stat "$stem.32x32.png") {
170 my $other = "$stem.32x32.png~"; 342 my $other = "$stem.32x32.png~";
171 343
172 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 344 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
173 fork_sub { 345 fork_sub {
174 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 346 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
175 system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; 347 system $OPTIPNG, "-i0", "-q", "$other~";
348
349 # reduce smoothfaces >10000 bytes
350 # obsolete, no longer required
351 if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
352 my $ncolor = 256;
353 while () {
354 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
355 system $OPTIPNG, "-i0", "-q", "$other~~";
356 last if 10000 > -s "$other~~";
357 $ncolor = int $ncolor * 0.9;
358 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
359 }
360
361 printf "reduced %s from %d to %d bytes using %d colours.\n",
362 $other, -s "$other~", -s "$other~~", $ncolor
363 if $VERBOSE >= 2;
364 rename "$other~~", "$other~";
365 }
366
176 die "$other~ has zero size, aborting." unless -s "$other~"; 367 die "$other~ has zero size, aborting." unless -s "$other~";
177 rename "$other~", $other; 368 rename "$other~", $other;
178 }; 369 };
179 } 370 }
180 371
181 warn "scaled down $path to $other\n";#d# 372 #warn "scaled down $path to $other\n";#d#
182
183 push @png, [$other, !$CACHE]; 373 push @c_png, [$other, !$CACHE];
184 } 374 }
185 } 375 }
186 376
187 (my $face = $stem) =~ s/^.*\///; 377 (my $face = $stem) =~ s/^.*\///;
188 378
379 # split all bigfaces, but avoid smoothfaces (*_S)
189 if (($w > $T || $h > $T) && $face !~ /_S\./) { 380 if (($w > $T || $h > $T) && $face !~ /_S\./) {
190 # split 381 # split
191 my @tile; 382 my @tile;
192 for my $x (0 .. (int $w / $T) - 1) { 383 for my $x (0 .. (int $w / $T) - 1) {
193 for my $y (0 .. (int $h / $T) - 1) { 384 for my $y (0 .. (int $h / $T) - 1) {
236 427
237 if (0 > aio_load $file, $tile) { 428 if (0 > aio_load $file, $tile) {
238 die "$path: unable to read tile +$x+$y, aborting.\n"; 429 die "$path: unable to read tile +$x+$y, aborting.\n";
239 } 430 }
240 IO::AIO::aio_unlink $file unless $CACHE; 431 IO::AIO::aio_unlink $file unless $CACHE;
241 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T; 432 commit_png $stem, $x|$y ? "$face+$x+$y" : $face, $tile, $T;
242 } 433 }
243 } else { 434 } else {
244 # use as-is (either small, use smooth) 435 # use as-is (either small, use smooth)
245 commit_png $face, $png, $T; 436 commit_png $stem, $face, $png, $T;
246 } 437 }
247 438
248 aio_unlink $path if $delete; 439 aio_unlink $path if $delete;
249 } 440 }
250 } 441 }
251 442
252 sub process_arc { 443 sub process_arc {
253 while (@arc) { 444 while (my $job = $c_arc->get) {
254 my ($dir, $file) = @{pop @arc}; 445 my ($dir, $file) = @$job;
255 446
256 my $arc; 447 my $arc;
257 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 448 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
258 449
259 my $arc = read_arch "$dir/$file"; 450 my $arc = read_arch "$dir/$file";
260 for my $o (values %$arc) { 451 for my $o (values %$arc) {
261 push @ARC, $o; 452 push @ARC, $o;
453 for (my $m = $o; $m; $m = $m->{more}) {
454 $ARC{$m->{_name}} = $m;
455 }
262 456
263 $o->{editor_folder} = $dir; 457 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
264 458
265 my $visibility = delete $o->{visibility}; 459 my $visibility = delete $o->{visibility};
266 my $magicmap = delete $o->{magicmap}; 460 my $magicmap = delete $o->{magicmap};
461 my $glyph = delete $o->{glyph};
267 462
268 # find upper left corner :/ 463 # find upper left corner :/
269 # omg, this is sooo broken 464 # omg, this is sooo broken
270 my ($dx, $dy); 465 my ($dx, $dy);
271 for (my $o = $o; $o; $o = $o->{more}) { 466 for (my $o = $o; $o; $o = $o->{more}) {
277 my $x = $o->{x} - $dx; 472 my $x = $o->{x} - $dx;
278 my $y = $o->{y} - $dy; 473 my $y = $o->{y} - $dy;
279 474
280 my $ext = $x|$y ? "+$x+$y" : ""; 475 my $ext = $x|$y ? "+$x+$y" : "";
281 476
282 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/; 477 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
283 478
284 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 479 $visibility = delete $o->{visibility} if exists $o->{visibility};
285 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 480 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
481 $glyph = delete $o->{glyph} if exists $o->{glyph};
286 482
287 my $anim = delete $o->{anim}; 483 my $anim = delete $o->{anim};
288 484
289 if ($anim) { 485 if ($anim) {
486 # possibly add $ext to the animation name to avoid
487 # the need to specify archnames for all parts
488 # of a multipart archetype.
290 $o->{animation} = "$o->{_name}"; 489 $o->{animation} = "$o->{_name}";
490 my $facings = 1;
491 my @frames;
291 492
292 for (@$anim) { 493 for (@$anim) {
293 $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/; 494 if (/^facings\s+(\d+)/) {
495 $facings = $1*1;
496 } elsif (/^blank.x11$|^empty.x11$/) {
497 push @frames, $_;
498 } else {
499 push @frames, "$_$ext";
500 }
294 } 501 }
295 502
296 $ANIM{"$o->{_name}$ext"} = 503 $ANIMINFO{$o->{animation}} = {
297 join "", map "$_\n", 504 facings => $facings,
298 "anim $o->{_name}", 505 frames => \@frames,
299 @$anim, 506 };
300 "mina";
301 } 507 }
302 508
303 for my $face ($o->{face} || (), @{$anim || []}) { 509 for ($o->{face} || (), @{$anim || []}) {
304 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 510 next if /^facings\s/;
305 511
512 my $face = $_;
513 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
514
306 my $info = $FACEINFO{$face} ||= {}; 515 my $info = $FACEINFO{$face} ||= { };
516 $info->{arc} = $o;
517
518 next if $face =~ /^blank.x11$|^empty.x11$/;
307 519
308 $info->{visibility} = $visibility if defined $visibility; 520 $info->{visibility} = $visibility if defined $visibility;
309 $info->{magicmap} = $magicmap if defined $magicmap; 521 $info->{magicmap} = $magicmap if defined $magicmap;
522 $info->{glyph} = $glyph if defined $glyph;
310 } 523 }
311 524
312 if (my $smooth = delete $o->{smoothface}) { 525 if (my $smooth = delete $o->{smoothface}) {
313 my ($face, $smooth) = split /\s+/, $smooth; 526 my %kv = split /\s+/, $smooth;
314 # skip empty_S.x11, it seems to server no purpose whatsoever 527 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
315 # but increases bandwidth demands and worse. 528 while (my ($face, $smooth) = each %kv) {
316 unless ($smooth eq "empty_S.x11") { 529 $FACEINFO{$smooth}{arc} = $o;
530
317 $FACEINFO{$face}{smooth} = $smooth; 531 $FACEINFO{$face}{smooth} = $smooth;
532 $FACEINFO{$face}{smoothlevel} = $level;
318 } 533 }
319 } 534 }
320 } 535 }
321 } 536 }
322 } 537 }
323 } 538 }
324 539
325 sub process_trs { 540 sub process_trs {
326 while (@trs) { 541 while (my $job = $c_trs->get) {
327 my ($dir, $file) = @{pop @trs}; 542 my ($dir, $file) = @$job;
328 my $path = "$dir/$file"; 543 my $path = "$dir/$file";
329 544
330 my $trs; 545 my $trs;
331 if (0 > aio_load $path, $trs) { 546 if (0 > aio_load $path, $trs) {
332 warn "$path: $!, skipping.\n"; 547 warn "$path: $!, skipping.\n";
335 550
336 $TRS .= $trs; 551 $TRS .= $trs;
337 } 552 }
338 } 553 }
339 554
555 my %FILECACHE;
556
557 sub load_cached($;$) {
558 unless (exists $FILECACHE{$_[0]}) {
559 my $data;
560 if (0 < aio_load $_[0], $data) {
561 if ($_[1]) {
562 $data = eval { $_[1]->($data) };
563 warn "$_[0]: $@" if $@;
564 }
565 }
566
567 $FILECACHE{$_[0]} = $data;
568 }
569
570 $FILECACHE{$_[0]}
571 }
572
573 sub process_res {
574 while (my $job = $c_res->get) {
575 my ($dir, $file, $type) = @$job;
576
577 my $data;
578 aio_load "$dir/$file", $data;
579
580 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
581
582 utf8::decode $dir;
583 utf8::decode $file;
584
585 # a meta file for resources is now mandatory
586 unless (exists $meta->{$file}) {
587 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
588 next;
589 }
590
591 $meta = {
592 %{ $meta->{"" } || {} },
593 %{ $meta->{$file} || {} },
594 };
595
596 if ($meta->{license} =~ s/^#//) {
597 $meta->{license} = ({
598 "pd" => "Public Domain",
599 "gpl" => "GNU General Public License, version 3.0 or any later",
600 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
601 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
602 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
603 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
604 })->{$meta->{license}}
605 || warn "$dir/$file: license tag '$meta->{license}' not found.";
606 }
607
608 if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
609 ($meta->{author} = $1) =~ s/_/ /g;
610 }
611
612 $file =~ s/\.res$//;
613 $file =~ s/\.(ogg|wav|jpg|png)$//;
614
615 substr $dir, 0, 1 + length $PATH, "";
616
617 if (my $filter = $meta->{cfutil_filter}) {
618 if ($filter eq "yaml2json") {
619 $data = JSON::XS::encode_json YAML::XS::Load $data;
620 } elsif ($filter eq "json2json") {
621 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
622 } elsif ($filter eq "perl2json") {
623 $data = eval $data; die if $@;
624 $data = JSON::XS::encode_json $data;
625 } else {
626 warn "$dir/$file: unknown filter $filter, skipping\n";
627 }
628 }
629
630 $RESOURCE{"$dir/$file"} = {
631 type => (exists $meta->{type} ? delete $meta->{type} : $type),
632 data => $data,
633 %$meta ? (meta => $meta) : (),
634 };
635 }
636 }
637
340 sub find_files; 638 sub find_files;
341 sub find_files { 639 sub find_files {
342 my ($path) = @_; 640 my ($path) = @_;
343 641
344 IO::AIO::aioreq_pri 4; 642 IO::AIO::aioreq_pri 4;
345 IO::AIO::aio_scandir $path, 4, sub { 643 IO::AIO::aio_scandir $path, 4, sub {
346 my ($dirs, $nondirs) = @_; 644 my ($dirs, $nondirs) = @_;
347 645
348 find_files "$path/$_" 646 find_files "$path/$_"
349 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 647 for grep $_ !~ /^(?:CVS|dev|\..*)$/, @$dirs;
648
649 my $dir = $path;
650 substr $dir, 0, 1 + length $PATH, "";
350 651
351 for my $file (@$nondirs) { 652 for my $file (@$nondirs) {
653 if ($dir =~ /^music(?:\/|$)/) {
654 $c_res->put ([$path, $file, 3]) # FT_MUSIC
655 if $file =~ /\.(ogg)$/;
656
657 } elsif ($dir =~ /^sound(?:\/|$)/) {
658 $c_res->put ([$path, $file, 5]) # FT_SOUND
659 if $file =~ /\.(wav|ogg)$/;
660
661 } elsif ($dir =~ /^res(?:\/|$)/) {
662 if ($file =~ /\.(jpg|png)$/) {
663 $c_res->put ([$path, $file, 0]) # FT_FACE
664 } elsif ($file =~ /\.(res)$/) {
665 $c_res->put ([$path, $file, 6]) # FT_RSRC
666 } else {
667 $c_res->put ([$path, $file, undef]);
668 }
669
352 if ($file =~ /\.png$/) { 670 } elsif ($file =~ /\.png$/) {
353 push @png, ["$path/$file", 0]; 671 push @c_png, ["$path/$file", 0];
672
354 } elsif ($file =~ /\.trs$/) { 673 } elsif ($file =~ /\.trs$/) {
355 push @trs, [$path, $file]; 674 $c_trs->put ([$path, $file]);
675
356 } elsif ($file =~ /\.arc$/) { 676 } elsif ($file =~ /\.arc$/) {
357 push @arc, [$path, $file]; 677 $c_arc->put ([$path, $file]);
678
358 } else { 679 } else {
359 warn "ignoring $path/$file\n" if $VERBOSE >= 2; 680 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
360 } 681 }
361 } 682 }
362 }; 683 };
684 }
685
686 sub generate_plurals {
687# use Lingua::EN::Inflect ();
688# Lingua::EN::Inflect::classical;
689# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
690# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
691#
692# for my $a (@ARC) {
693# my $name = $a->{name} || $a->{_name};
694#
695# next unless $a->{name_pl};
696# next if $a->{invisible};
697# next if $a->{is_floor};
698# next if $a->{no_pick};
699#
700# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
701# my $pl = $test =~ /^(?:eq|p:.)$/
702# ? $name
703# : Lingua::EN::Inflect::PL $name;
704#
705# if ($pl ne $a->{name_pl}) {
706# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
707# }
708# }
363 } 709 }
364 710
365 sub inst_arch($) { 711 sub inst_arch($) {
366 my (undef, $path) = @_; 712 my (undef, $path) = @_;
367 713
714 $PATH = $path;
715
716 print "\n",
368 print "installing '$path' to '$DATADIR'\n", 717 "Installing '$path' to '$DATADIR'\n",
718 "\n",
369 "(this can take a long time if you run this\n", 719 "This can take a long time if you run this\n",
370 "for the first time or do not use --cache).\n"; 720 "for the first time or do not use --cache.\n",
721 "\n",
722 "Unless you run verbosely, all following warning\n",
723 "or error messages indicate serious problems.\n",
724 "\n";
371 725
372 if (!-d "$path/treasures") { 726 if (!-d "$path/treasures") {
373 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 727 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
374 exit 1 unless $FORCE; 728 exit 1 unless $FORCE;
375 } 729 }
376 730
731 print "scanning files...\n" if $VERBOSE;
732
377 find_files $path; 733 find_files $path;
734
735 my @a_arc = map +(async \&process_arc), 1..2;
736 my @a_res = map +(async \&process_res), 1..2;
737 my @a_trs = map +(async \&process_trs), 1..2;
738
378 IO::AIO::flush; 739 IO::AIO::flush;
379 740
380 $_->join for ( 741 $c_res->shutdown;
742 $c_arc->shutdown;
743 $c_trs->shutdown;
744
745 print "start file scan, arc, res processing...\n" if $VERBOSE;
746
747 $_->join for @a_arc; # need to parse all archetypes before png processing
748
749 print "end arc, start png processing...\n" if $VERBOSE;
750
381 # four png crunchers work fine for my 2x smp machine 751 # eight png crunchers work fine for my 4x smp machine
382 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 752 my @a_png = map +(async \&process_png), 1..8;
383 (async \&process_trs), (async \&process_trs),
384 (async \&process_arc), (async \&process_arc),
385 );
386 753
754 $_->join for (@a_trs, @a_res, @a_png);
755
756 print "scanning done, processing results...\n" if $VERBOSE;
387 { 757 {
388 open my $fh, ">:utf8", "$DATADIR/animations~" 758 # remove path prefix from editor_folder
389 or die "$DATADIR/animations~: $!"; 759 $_->{editor_folder} =~ /^\x00/
390 print $fh join "", map $ANIM{$_}, sort keys %ANIM 760 and substr $_->{editor_folder}, 0, 2 + length $path, ""
761 for values %ARC;
762
763 print "resolving inheritance tree...\n" if $VERBOSE;
764 # resolve inherit
765 while () {
766 my $progress;
767 my $loop;
768
769 for my $o (values %ARC) {
770 for my $other (split /,/, $o->{inherit}) {
771 if (my $s = $ARC{$other}) {
772 if ($s->{inherit}) {
773 $loop = $s;
774 } else {
775 delete $o->{inherit};
776 my %s = %$s;
777 delete @s{qw(_name more name name_pl)};
778 %$o = ( %s, %$o );
779 ++$progress;
780 }
781 } else {
782 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
783 delete $ARC{$o->{_name}};
784 }
785 }
786 }
787
788 unless ($progress) {
789 die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
790 if $loop;
791
792 last;
793 }
391 } 794 }
392 795
393 { 796 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
797 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
798
799 print "generating plurals...\n" if $VERBOSE;
800 generate_plurals;
801
802 printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
394 open my $fh, ">:utf8", "$DATADIR/archetypes~" 803 open my $fh, ">:utf8", "$DATADIR/archetypes~"
395 or die "$DATADIR/archetypes~: $!"; 804 or die "$DATADIR/archetypes~: $!";
396 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; 805 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
397 print $fh Crossfire::archlist_to_string \@ARC;
398 } 806 }
399 807
400 { 808 {
809 printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
401 open my $fh, ">:utf8", "$DATADIR/treasures~" 810 open my $fh, ">:utf8", "$DATADIR/treasures~"
402 or die "$DATADIR/treasures~: $!"; 811 or die "$DATADIR/treasures~: $!";
403 print $fh $TRS; 812 print $fh $TRS;
404 } 813 }
405 814
406 { 815 {
816 print "processing facedata...\n" if $VERBOSE;
407 while (my ($k, $v) = each %FACEINFO) { 817 while (my ($k, $v) = each %FACEINFO) {
408 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 818 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
409 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 819 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
410 820
821 make_hash $k, $v->{data32}, $v->{hash32};
822 make_hash $k, $v->{data64}, $v->{hash64};
823
411 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 824 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
412 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 825 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
413 826
414 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 827 if (my $magicmap = $v->{magicmap}) {
415 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 828 $magicmap =~ y/A-Z_\-/a-z/d;
829 $v->{magicmap} = $COLOR{$magicmap};
416 } 830 }
831
832 my $stem = delete $v->{stem};
833 $v->{glyph} //= autoglyph $stem, $v;
834 utf8::encode $v->{glyph};
835 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
836
837 delete $v->{arc};
838 }
839
840 print "processing resources...\n" if $VERBOSE;
841 my $enc = JSON::XS->new->utf8->canonical->relaxed;
842 while (my ($k, $v) = each %RESOURCE) {
843
844 if ($v->{meta} && $v->{meta}{datadir}) {
845 delete $RESOURCE{$k};
846
847 $k =~ s/^res\/// or die "$k: datadir files must be in res/";
848
849 printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
850 open my $fh, ">:raw", "$DATADIR/$k~"
851 or die "$DATADIR/$k~: $!";
852 syswrite $fh, $v->{data};
853 push @COMMIT, $k;
854
855 } else {
856 if ($v->{type} & 1) {
857 # prepend meta info
858
859 my $meta = $enc->encode ({
860 name => $k,
861 %{ $v->{meta} || {} },
862 });
863
864 $v->{data} = pack "(w/a*)*", $meta, $v->{data};
865 }
866
867 make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
868 }
869 }
870
871 printf "writing facedata (%d faces, %d anims, %d resources)...\n",
872 scalar keys %FACEINFO,
873 scalar keys %ANIMINFO,
874 scalar keys %RESOURCE
875 if $VERBOSE;
417 876
418 open my $fh, ">:perlio", "$DATADIR/facedata~" 877 open my $fh, ">:perlio", "$DATADIR/facedata~"
419 or die "$DATADIR/facedata~: $!"; 878 or die "$DATADIR/facedata~: $!";
420 879
421 $FACEINFO{""} = { version => 1}; 880 print $fh nfreeze {
422 print $fh Storable::nfreeze \%FACEINFO; 881 version => 2,
882 faceinfo => \%FACEINFO,
883 animinfo => \%ANIMINFO,
884 resource => \%RESOURCE,
423 } 885 };
424 886
887 }
888
889 print "committing files...\n" if $VERBOSE;
890
425 for (qw(archetypes facedata animations treasures)) { 891 for (qw(archetypes facedata treasures), @COMMIT) {
426 chmod 0644, "$DATADIR/$_~"; 892 chmod 0644, "$DATADIR/$_~";
427 rename "$DATADIR/$_~", "$DATADIR/$_" 893 rename "$DATADIR/$_~", "$DATADIR/$_"
428 or die "$DATADIR/$_: $!"; 894 or die "$DATADIR/$_: $!";
429 } 895 }
430 896

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines