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

Diff Legend

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