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.47 by root, Thu Jul 26 21:44:43 2007 UTC

… …
6my $exec_prefix = "@exec_prefix@"; 6my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 7my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 8my $DATADIR = "@datadir@/@PACKAGE@";
9 9
10my $CONVERT = "@CONVERT@"; 10my $CONVERT = "@CONVERT@";
11my $IDENTIFY = "@IDENTIFY@"; 11#my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 12my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@";
14 15
15use Getopt::Long; 16use Getopt::Long;
16use Coro::Event; 17use Coro::Event;
17use AnyEvent; 18use AnyEvent;
18use IO::AIO (); 19use IO::AIO ();
… …
20use Crossfire; 21use Crossfire;
21use Coro; 22use Coro;
22use Coro::AIO; 23use Coro::AIO;
23use POSIX (); 24use POSIX ();
24use Digest::MD5; 25use Digest::MD5;
26use Carp;
25use Coro::Storable; $Storable::canonical = 1; 27use Coro::Storable; $Storable::canonical = 1;
28
29$SIG{QUIT} = sub { Carp::cluck "QUIT" };
26 30
27sub usage { 31sub usage {
28 warn <<EOF; 32 warn <<EOF;
29Usage: cfutil [-v] [-q] [--force] [--cache] 33Usage: cfutil [-v] [-q] [--force] [--cache]
30 [--install-arch path] 34 [--install-arch path]
… …
42my $CACHE = 0; 46my $CACHE = 0;
43my $FORCE; 47my $FORCE;
44my $TMPDIR = "/tmp/cfutil$$~"; 48my $TMPDIR = "/tmp/cfutil$$~";
45my $TMPFILE = "aaaa0"; 49my $TMPFILE = "aaaa0";
46 50
51our %COLOR = (
52 black => 0,
53 white => 1,
54 navy => 2,
55 red => 3,
56 orange => 4,
57 blue => 5,
58 darkorange => 6,
59 green => 7,
60 lightgreen => 8,
61 grey => 9,
62 brown => 10,
63 gold => 11,
64 tan => 12,
65);
66
47END { system "rm", "-rf", $TMPDIR } 67END { system "rm", "-rf", $TMPDIR }
48 68
49Event->signal (signal => "INT", cb => sub { exit 1 }); 69Event->signal (signal => "INT", cb => sub { exit 1 });
50Event->signal (signal => "TERM", cb => sub { exit 1 }); 70Event->signal (signal => "TERM", cb => sub { exit 1 });
51 71
… …
68} 88}
69 89
70sub inst_maps($) { 90sub inst_maps($) {
71 my (undef, $path) = @_; 91 my (undef, $path) = @_;
72 92
73 print "installing '$path' to '$DATADIR/maps'\n"; 93 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
74 94
75 if (!-f "$path/regions") { 95 if (!-f "$path/regions") {
76 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 96 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
77 exit 1 unless $FORCE; 97 exit 1 unless $FORCE;
78 } 98 }
79 99
80 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 100 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
81 and die "map installation failed.\n"; 101 and die "map installation failed.\n";
82 102
83 print "maps installed successfully.\n"; 103 print "maps installed successfully.\n";
84} 104}
85 105
86{ 106{
87 our %ANIMINFO; 107 our %ANIMINFO;
88 our %FACEINFO; 108 our %FACEINFO;
109 our %RESOURCE;
110 our @ARC;
89 our %ARC; 111 our %ARC;
90 our $TRS; 112 our $TRS;
91 our $NFILE; 113 our $NFILE;
114 our $PATH;
92 115
93 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 116 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
94 117
95 our (@png, @trs, @arc); # files we are interested in 118 our (@png, @trs, @arc, @res); # files we are interested in
96 119
97 sub commit_png($$$) { 120 sub commit_png($$$) {
98 my ($name, $data, $T) = @_; 121 my ($name, $data, $T) = @_;
99 122
100 $FACEINFO{$name}{"data$T"} = $data; 123 $FACEINFO{$name}{"data$T"} = $data;
… …
153 fork_sub { 176 fork_sub {
154 system "convert png:\Q$path\E -depth 8 rgba:-" 177 system "convert png:\Q$path\E -depth 8 rgba:-"
155 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
156 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 179 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
157 and die "convert/hq2xa pipeline error: status $? ($!)"; 180 and die "convert/hq2xa pipeline error: status $? ($!)";
158 system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; 181 system $OPTIPNG, "-i0", "-q", "$other~";
159 die "$other~ has zero size, aborting." unless -s "$other~"; 182 die "$other~ has zero size, aborting." unless -s "$other~";
160 rename "$other~", $other; 183 rename "$other~", $other;
161 }; 184 };
162 } 185 }
163 186
… …
169 my $other = "$stem.32x32.png~"; 192 my $other = "$stem.32x32.png~";
170 193
171 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 194 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
172 fork_sub { 195 fork_sub {
173 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~"; 196 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
174 system $OPTIPNG, "-o5", "-i0", "-q", "$other~"; 197 system $OPTIPNG, "-i0", "-q", "$other~";
198
199 # reduce smoothfaces >10000 bytes
200 if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
201 my $ncolor = 256;
202 while () {
203 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
204 system $OPTIPNG, "-i0", "-q", "$other~~";
205 last if 10000 > -s "$other~~";
206 $ncolor = int $ncolor * 0.9;
207 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
208 }
209
210 printf "reduced %s from %d to %d bytes using %d colours.\n",
211 $other, -s "$other~", -s "$other~~", $ncolor
212 if $VERBOSE >= 2;
213 rename "$other~~", "$other~";
214 }
215
175 die "$other~ has zero size, aborting." unless -s "$other~"; 216 die "$other~ has zero size, aborting." unless -s "$other~";
176 rename "$other~", $other; 217 rename "$other~", $other;
177 }; 218 };
178 } 219 }
179 220
… …
255 my $arc; 296 my $arc;
256 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 297 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
257 298
258 my $arc = read_arch "$dir/$file"; 299 my $arc = read_arch "$dir/$file";
259 for my $o (values %$arc) { 300 for my $o (values %$arc) {
301 push @ARC, $o;
302 for (my $m = $o; $m; $m = $m->{more}) {
260 $ARC{$o->{_name}} = $o; 303 $ARC{$m->{_name}} = $m;
304 }
261 305
262 $o->{editor_folder} = $dir; 306 $o->{editor_folder} = $dir;
263 307
264 my $visibility = delete $o->{visibility}; 308 my $visibility = delete $o->{visibility};
265 my $magicmap = delete $o->{magicmap}; 309 my $magicmap = delete $o->{magicmap};
… …
278 322
279 my $ext = $x|$y ? "+$x+$y" : ""; 323 my $ext = $x|$y ? "+$x+$y" : "";
280 324
281 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face}; 325 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
282 326
283 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 327 $visibility = delete $o->{visibility} if exists $o->{visibility};
284 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 328 $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
285 329
286 my $anim = delete $o->{anim}; 330 my $anim = delete $o->{anim};
287 331
288 if ($anim) { 332 if ($anim) {
289 # possibly add $ext to the animation name to avoid 333 # possibly add $ext to the animation name to avoid
… …
344 388
345 $TRS .= $trs; 389 $TRS .= $trs;
346 } 390 }
347 } 391 }
348 392
393 my %FILECACHE;
394
395 sub load_cached($;$) {
396 unless (exists $FILECACHE{$_[0]}) {
397 my $data;
398 if (0 < aio_load $_[0], $data) {
399 $data = $_[1]->($data)
400 if $_[1];
401 }
402
403 $FILECACHE{$_[0]} = $data;
404 }
405
406 $FILECACHE{$_[0]}
407 }
408
409 sub process_res {
410 while (@res) {
411 my ($dir, $file, $type) = @{pop @res};
412
413 my $data;
414 aio_load "$dir/$file", $data;
415
416 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
417
418 $file =~ s/\.res$//;
419 $file =~ s/\.(ogg|wav|jpg|png)$//;
420
421 substr $dir, 0, 1 + length $PATH, "";
422
423 $meta = {
424 %{ $meta->{"" } || {} },
425 %{ $meta->{$file} || {} },
426 };
427
428 $RESOURCE{"$dir/$file"} = {
429 type => (delete $meta->{type}) || $type,
430 data => $data,
431 chksum => (Digest::MD5::md5 $data),
432 %$meta ? (meta => $meta) : (),
433 };
434 }
435 }
436
349 sub find_files; 437 sub find_files;
350 sub find_files { 438 sub find_files {
351 my ($path) = @_; 439 my ($path) = @_;
352 440
353 IO::AIO::aioreq_pri 4; 441 IO::AIO::aioreq_pri 4;
… …
355 my ($dirs, $nondirs) = @_; 443 my ($dirs, $nondirs) = @_;
356 444
357 find_files "$path/$_" 445 find_files "$path/$_"
358 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 446 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
359 447
448 my $dir = $path;
449 substr $dir, 0, 1 + length $PATH, "";
450
360 for my $file (@$nondirs) { 451 for my $file (@$nondirs) {
452 if ($dir =~ /^music(?:\/|$)/) {
453 push @res, [$path, $file, 3] # FT_MUSIC
454 if $file =~ /\.(ogg)$/;
455
456 } elsif ($dir =~ /^sound(?:\/|$)/) {
457 push @res, [$path, $file, 5] # FT_SOUND
458 if $file =~ /\.(wav|ogg)$/;
459
460 } elsif ($dir =~ /^res(?:\/|$)/) {
461 push @res, [$path, $file, 0] # FT_FACE
462 if $file =~ /\.(jpg|png)$/;
463 push @res, [$path, $file, 7] # FT_RSRC
464 if $file =~ /\.(res)$/;
465
361 if ($file =~ /\.png$/) { 466 } elsif ($file =~ /\.png$/) {
362 push @png, ["$path/$file", 0]; 467 push @png, ["$path/$file", 0];
468
363 } elsif ($file =~ /\.trs$/) { 469 } elsif ($file =~ /\.trs$/) {
364 push @trs, [$path, $file]; 470 push @trs, [$path, $file];
471
365 } elsif ($file =~ /\.arc$/) { 472 } elsif ($file =~ /\.arc$/) {
366 push @arc, [$path, $file]; 473 push @arc, [$path, $file];
474
367 } else { 475 } else {
368 warn "ignoring $path/$file\n" if $VERBOSE >= 2; 476 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
369 } 477 }
370 } 478 }
371 }; 479 };
372 } 480 }
373 481
374 sub inst_arch($) { 482 sub inst_arch($) {
375 my (undef, $path) = @_; 483 my (undef, $path) = @_;
376 484
485 $PATH = $path;
486
487 print "\n",
377 print "Installing '$path' to '$DATADIR'\n", 488 "Installing '$path' to '$DATADIR'\n",
378 "\n", 489 "\n",
379 "This can take a long time if you run this\n", 490 "This can take a long time if you run this\n",
380 "for the first time or do not use --cache.\n", 491 "for the first time or do not use --cache.\n",
381 "\n", 492 "\n",
382 "Unless you run verbosely, all following warning\n", 493 "Unless you run verbosely, all following warning\n",
… …
394 $_->join for ( 505 $_->join for (
395 # four png crunchers work fine for my 2x smp machine 506 # four png crunchers work fine for my 2x smp machine
396 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 507 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
397 (async \&process_trs), (async \&process_trs), 508 (async \&process_trs), (async \&process_trs),
398 (async \&process_arc), (async \&process_arc), 509 (async \&process_arc), (async \&process_arc),
510 (async \&process_res), (async \&process_res),
399 ); 511 );
400 512
401 { 513 {
402 # remove path prefix from editor_folder 514 # remove path prefix from editor_folder
403 substr $_->{editor_folder}, 0, 1 + length $path, "" 515 substr $_->{editor_folder}, 0, 1 + length $path, ""
… …
413 if (my $s = $ARC{$other}) { 525 if (my $s = $ARC{$other}) {
414 if ($s->{inherit}) { 526 if ($s->{inherit}) {
415 $loop = $s; 527 $loop = $s;
416 } else { 528 } else {
417 delete $o->{inherit}; 529 delete $o->{inherit};
530 my %s = %$s;
531 delete @s{qw(_name more name name_pl)};
418 %$o = ( %$s, %$o ); 532 %$o = ( %s, %$o );
419 ++$progress; 533 ++$progress;
420 } 534 }
421 } else { 535 } else {
422 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n"; 536 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
423 delete $ARC{$o->{_name}}; 537 delete $ARC{$o->{_name}};
… …
431 545
432 last; 546 last;
433 } 547 }
434 } 548 }
435 549
550 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
551 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
552
436 open my $fh, ">:utf8", "$DATADIR/archetypes~" 553 open my $fh, ">:utf8", "$DATADIR/archetypes~"
437 or die "$DATADIR/archetypes~: $!"; 554 or die "$DATADIR/archetypes~: $!";
438 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } values %ARC]; 555 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
439 } 556 }
440 557
441 { 558 {
442 open my $fh, ">:utf8", "$DATADIR/treasures~" 559 open my $fh, ">:utf8", "$DATADIR/treasures~"
443 or die "$DATADIR/treasures~: $!"; 560 or die "$DATADIR/treasures~: $!";
… …
452 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 569 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"; 570 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
454 571
455 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 572 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
456 $v->{chksum64} = Digest::MD5::md5 $v->{data64}; 573 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
574
575 if (my $magicmap = $v->{magicmap}) {
576 $magicmap =~ y/A-Z_\-/a-z/d;
577 $v->{magicmap} = $COLOR{$magicmap};
578 }
457 } 579 }
458 580
459 open my $fh, ">:perlio", "$DATADIR/facedata~" 581 open my $fh, ">:perlio", "$DATADIR/facedata~"
460 or die "$DATADIR/facedata~: $!"; 582 or die "$DATADIR/facedata~: $!";
461 583
462 print $fh freeze { 584 print $fh freeze {
463 version => 2, 585 version => 2,
464 faceinfo => \%FACEINFO, 586 faceinfo => \%FACEINFO,
465 animinfo => \%ANIMINFO, 587 animinfo => \%ANIMINFO,
588 resource => \%RESOURCE,
466 }; 589 };
467 } 590 }
468 591
469 for (qw(archetypes facedata treasures)) { 592 for (qw(archetypes facedata treasures)) {
470 chmod 0644, "$DATADIR/$_~"; 593 chmod 0644, "$DATADIR/$_~";

Diff Legend

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