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.36 by root, Sun Jun 10 02:51:46 2007 UTC vs.
Revision 1.54 by root, Sun Aug 19 10:28:52 2007 UTC

… …
19use IO::AIO (); 19use IO::AIO ();
20use File::Temp; 20use File::Temp;
21use Crossfire; 21use Crossfire;
22use Coro; 22use Coro;
23use Coro::AIO; 23use Coro::AIO;
24use Coro::Util;
24use POSIX (); 25use POSIX ();
25use Digest::MD5; 26use Digest::MD5;
27use Carp;
28use Coro::Channel;
26use Coro::Storable; $Storable::canonical = 1; 29use Coro::Storable; $Storable::canonical = 1;
30
31$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 32
28sub usage { 33sub usage {
29 warn <<EOF; 34 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 35Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 36 [--install-arch path]
… …
92 if (!-f "$path/regions") { 97 if (!-f "$path/regions") {
93 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 98 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
94 exit 1 unless $FORCE; 99 exit 1 unless $FORCE;
95 } 100 }
96 101
97 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
98 and die "map installation failed.\n"; 103 and die "map installation failed.\n";
99 104
100 print "maps installed successfully.\n"; 105 print "maps installed successfully.\n";
101} 106}
102 107
103{ 108{
104 our %ANIMINFO; 109 our %ANIMINFO;
105 our %FACEINFO; 110 our %FACEINFO;
111 our %RESOURCE;
106 our @ARC; 112 our @ARC;
107 our %ARC; 113 our %ARC;
108 our $TRS; 114 our $TRS;
109 our $NFILE; 115 our $NFILE;
116 our $PATH;
110 117
111 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 118 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
112 119
113 our (@png, @trs, @arc); # files we are interested in 120 our $c_arc = new Coro::Channel;
121 our $c_trs = new Coro::Channel;
122 our $c_res = new Coro::Channel;
123
124 our @c_png;
114 125
115 sub commit_png($$$) { 126 sub commit_png($$$) {
116 my ($name, $data, $T) = @_; 127 my ($name, $data, $T) = @_;
117 128
118 $FACEINFO{$name}{"data$T"} = $data; 129 $FACEINFO{$name}{"data$T"} = $data;
119 } 130 }
120 131
121 sub process_png { 132 sub process_png {
122 while (@png) { 133 while (@c_png) {
123 my ($path, $delete) = @{pop @png}; 134 my ($path, $delete) = @{pop @c_png};
124 135
125 my $png; 136 my $png;
126 aio_lstat $path; 137 aio_lstat $path;
127 my ($size, $mtime) = (stat _)[7,9]; 138 my ($size, $mtime) = (stat _)[7,9];
128 139
… …
159 if ($w % $T || $h % $T) { 170 if ($w % $T || $h % $T) {
160 warn "$path: weird png size ($w $h), skipping.\n"; 171 warn "$path: weird png size ($w $h), skipping.\n";
161 next; 172 next;
162 } 173 }
163 174
175 (my $base = $stem) =~ s/^.*\///;
176
177 my $fi = $FACEINFO{$base};
178 unless ($fi) {
179 warn "$path: <$base> not referenced by any archetype, skipping.\n";
180 next;
181 }
182
183 my $arc = $FACEINFO{$base}{arc}
184 or die "FATAL: internal error, cannot continue";
185
164 unless ($path =~ /~$/) { 186 unless ($path =~ /~$/) {
165 # possibly enlarge 187 # possibly enlarge
166 if (0 > aio_stat "$stem.64x64.png") { 188 if (0 > aio_stat "$stem.64x64.png") {
167 my $other = "$stem.64x64.png~"; 189 my $other = "$stem.64x64.png~";
168 190
169 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 191 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
170 my $wrap = 0; # for the time being
171 fork_sub { 192 fork_sub {
193 my $CROP;
194 my $SRC = "png:\Q$path\E";
195
196 my $is_floor = $arc->{is_floor};
197 my $is_wall = 0;
198
199 my ($wall_pfx, $wall_dir, $wall_sfx);
200
201 if (
202 !$is_floor
203 && !$arc->{alive}
204 && $arc->{no_pass}
205 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
206 ) {
207 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
208
209 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
210 $is_wall = 1;
211 }
212 }
213
214 if ($is_wall || $is_floor) {
215 # add a 4px border and add other images around it
216 $CROP = "-shave 8x8 +repage";
217
218 $w += 8;
219 $h += 8;
220
221 $SRC = "-size ${w}x${h} xc:transparent";
222 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
223
224 # 8 surrounding images
225 for (
226 # x y b r0 r1
227 [-1, -1, 0, 6],
228 [ 0, -1, 1, 10, 14],
229 [+1, -1, 0, 12],
230
231 [-1, 0, 8, 5, 7],
232 #
233 [+1, 0, 2, 5, 13],
234
235 [-1, +1, 0, 3],
236 [ 0, +1, 4, 10, 11],
237 [+1, +1, 0, 9],
238 ) {
239 my ($x, $y, $d, $r0, $r1) = @$_;
240
241 my $tile = $is_floor ? $path
242 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
243 : die;
244
245 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
246 "\Q$tile",
247 $x * ($w - 8) + 4,
248 $y * ($h - 8) + 4;
249 }
250 }
251
172 system "convert png:\Q$path\E -depth 8 rgba:-" 252 system "convert -depth 8 $SRC rgba:-"
173 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 253 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
174 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 254 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
175 and die "convert/hq2xa pipeline error: status $? ($!)"; 255 and die "convert/cfhq2xa pipeline error: status $? ($!)";
176 system $OPTIPNG, "-i0", "-q", "$other~"; 256 system $OPTIPNG, "-i0", "-q", "$other~";
177 die "$other~ has zero size, aborting." unless -s "$other~"; 257 die "$other~ has zero size, aborting." unless -s "$other~";
178 rename "$other~", $other; 258 rename "$other~", $other;
179 }; 259 };
180 } 260 }
181 261
182 push @png, [$other, !$CACHE]; 262 push @c_png, [$other, !$CACHE];
183 } 263 }
184 264
185 # possibly scale down 265 # possibly scale down
186 if (0 > aio_stat "$stem.32x32.png") { 266 if (0 > aio_stat "$stem.32x32.png") {
187 my $other = "$stem.32x32.png~"; 267 my $other = "$stem.32x32.png~";
… …
212 rename "$other~", $other; 292 rename "$other~", $other;
213 }; 293 };
214 } 294 }
215 295
216 #warn "scaled down $path to $other\n";#d# 296 #warn "scaled down $path to $other\n";#d#
217 push @png, [$other, !$CACHE]; 297 push @c_png, [$other, !$CACHE];
218 } 298 }
219 } 299 }
220 300
221 (my $face = $stem) =~ s/^.*\///; 301 (my $face = $stem) =~ s/^.*\///;
222 302
… …
283 aio_unlink $path if $delete; 363 aio_unlink $path if $delete;
284 } 364 }
285 } 365 }
286 366
287 sub process_arc { 367 sub process_arc {
288 while (@arc) { 368 while (my $job = $c_arc->get) {
289 my ($dir, $file) = @{pop @arc}; 369 my ($dir, $file) = @$job;
290 370
291 my $arc; 371 my $arc;
292 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 372 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
293 373
294 my $arc = read_arch "$dir/$file"; 374 my $arc = read_arch "$dir/$file";
… …
351 for my $face ($o->{face} || (), @{$anim || []}) { 431 for my $face ($o->{face} || (), @{$anim || []}) {
352 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 432 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
353 433
354 my $info = $FACEINFO{$face} ||= {}; 434 my $info = $FACEINFO{$face} ||= {};
355 435
436 $info->{arc} = $o;
356 $info->{visibility} = $visibility if defined $visibility; 437 $info->{visibility} = $visibility if defined $visibility;
357 $info->{magicmap} = $magicmap if defined $magicmap; 438 $info->{magicmap} = $magicmap if defined $magicmap;
358 } 439 }
359 440
360 if (my $smooth = delete $o->{smoothface}) { 441 if (my $smooth = delete $o->{smoothface}) {
361 my %kv =split /\s+/, $smooth; 442 my %kv = split /\s+/, $smooth;
362 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 443 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
363 while (my ($face, $smooth) = each %kv) { 444 while (my ($face, $smooth) = each %kv) {
445 $FACEINFO{$smooth}{arc} = $o;
446
364 $FACEINFO{$face}{smooth} = $smooth; 447 $FACEINFO{$face}{smooth} = $smooth;
365 $FACEINFO{$face}{smoothlevel} = $level; 448 $FACEINFO{$face}{smoothlevel} = $level;
366 } 449 }
367 } 450 }
368 } 451 }
369 } 452 }
370 } 453 }
371 } 454 }
372 455
373 sub process_trs { 456 sub process_trs {
374 while (@trs) { 457 while (my $job = $c_trs->get) {
375 my ($dir, $file) = @{pop @trs}; 458 my ($dir, $file) = @$job;
376 my $path = "$dir/$file"; 459 my $path = "$dir/$file";
377 460
378 my $trs; 461 my $trs;
379 if (0 > aio_load $path, $trs) { 462 if (0 > aio_load $path, $trs) {
380 warn "$path: $!, skipping.\n"; 463 warn "$path: $!, skipping.\n";
… …
383 466
384 $TRS .= $trs; 467 $TRS .= $trs;
385 } 468 }
386 } 469 }
387 470
471 my %FILECACHE;
472
473 sub load_cached($;$) {
474 unless (exists $FILECACHE{$_[0]}) {
475 my $data;
476 if (0 < aio_load $_[0], $data) {
477 if ($_[1]) {
478 $data = eval { $_[1]->($data) };
479 warn "$_[0]: $@" if $@;
480 }
481 }
482
483 $FILECACHE{$_[0]} = $data;
484 }
485
486 $FILECACHE{$_[0]}
487 }
488
489 sub process_res {
490 while (my $job = $c_res->get) {
491 my ($dir, $file, $type) = @$job;
492
493 my $data;
494 aio_load "$dir/$file", $data;
495
496 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
497
498 next if $meta && !exists $meta->{$file};
499
500 $meta = {
501 %{ $meta->{"" } || {} },
502 %{ $meta->{$file} || {} },
503 };
504
505 if ($meta->{license} =~ s/^#//) {
506 $meta->{license} = ({
507 "pd" => "Public Domain",
508 "gpl" => "GNU General Public License, version 3.0 or any later",
509 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
510 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
511 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
512 })->{$meta->{license}}
513 || warn "$dir/$file: license tag '$meta->{license}' not found.";
514 }
515
516 $file =~ s/\.res$//;
517 $file =~ s/\.(ogg|wav|jpg|png)$//;
518
519 substr $dir, 0, 1 + length $PATH, "";
520
521 $RESOURCE{"$dir/$file"} = {
522 type => (delete $meta->{type}) || $type,
523 data => $data,
524 chksum => (Digest::MD5::md5 $data),
525 %$meta ? (meta => $meta) : (),
526 };
527 }
528 }
529
388 sub find_files; 530 sub find_files;
389 sub find_files { 531 sub find_files {
390 my ($path) = @_; 532 my ($path) = @_;
391 533
392 IO::AIO::aioreq_pri 4; 534 IO::AIO::aioreq_pri 4;
… …
394 my ($dirs, $nondirs) = @_; 536 my ($dirs, $nondirs) = @_;
395 537
396 find_files "$path/$_" 538 find_files "$path/$_"
397 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 539 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
398 540
541 my $dir = $path;
542 substr $dir, 0, 1 + length $PATH, "";
543
399 for my $file (@$nondirs) { 544 for my $file (@$nondirs) {
545 if ($dir =~ /^music(?:\/|$)/) {
546 $c_res->put ([$path, $file, 3]) # FT_MUSIC
547 if $file =~ /\.(ogg)$/;
548
549 } elsif ($dir =~ /^sound(?:\/|$)/) {
550 $c_res->put ([$path, $file, 5]) # FT_SOUND
551 if $file =~ /\.(wav|ogg)$/;
552
553 } elsif ($dir =~ /^res(?:\/|$)/) {
554 $c_res->put ([$path, $file, 0]) # FT_FACE
555 if $file =~ /\.(jpg|png)$/;
556 $c_res->put ([$path, $file, 7]) # FT_RSRC
557 if $file =~ /\.(res)$/;
558
400 if ($file =~ /\.png$/) { 559 } elsif ($file =~ /\.png$/) {
401 push @png, ["$path/$file", 0]; 560 push @c_png, ["$path/$file", 0];
561
402 } elsif ($file =~ /\.trs$/) { 562 } elsif ($file =~ /\.trs$/) {
403 push @trs, [$path, $file]; 563 $c_trs->put ([$path, $file]);
564
404 } elsif ($file =~ /\.arc$/) { 565 } elsif ($file =~ /\.arc$/) {
405 push @arc, [$path, $file]; 566 $c_arc->put ([$path, $file]);
567
406 } else { 568 } else {
407 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 569 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
408 } 570 }
409 } 571 }
410 }; 572 };
411 } 573 }
412 574
413 sub inst_arch($) { 575 sub inst_arch($) {
414 my (undef, $path) = @_; 576 my (undef, $path) = @_;
577
578 $PATH = $path;
415 579
416 print "\n", 580 print "\n",
417 "Installing '$path' to '$DATADIR'\n", 581 "Installing '$path' to '$DATADIR'\n",
418 "\n", 582 "\n",
419 "This can take a long time if you run this\n", 583 "This can take a long time if you run this\n",
… …
426 if (!-d "$path/treasures") { 590 if (!-d "$path/treasures") {
427 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 591 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
428 exit 1 unless $FORCE; 592 exit 1 unless $FORCE;
429 } 593 }
430 594
595 print "scanning files...\n" if $VERBOSE;
596
431 find_files $path; 597 find_files $path;
598
599 my @a_arc = map +(async \&process_arc), 1..2;
600 my @a_res = map +(async \&process_res), 1..2;
601 my @a_trs = map +(async \&process_trs), 1..2;
602
432 IO::AIO::flush; 603 IO::AIO::flush;
433 604
434 $_->join for ( 605 $c_res->put (undef) for @a_res;
606 $c_arc->put (undef) for @a_arc;
607 $c_trs->put (undef) for @a_trs;
608
609 print "start file scan, arc, res processing...\n" if $VERBOSE;
610
611 $_->join for @a_arc; # need to parse all archetypes before png processing
612
613 print "end arc, start png processing...\n" if $VERBOSE;
614
435 # four png crunchers work fine for my 2x smp machine 615 # four png crunchers work fine for my 2x smp machine
436 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 616 my @a_png = map +(async \&process_png), 1..4;
437 (async \&process_trs), (async \&process_trs),
438 (async \&process_arc), (async \&process_arc),
439 );
440 617
618 $_->join for (@a_trs, @a_res, @a_png);
619
620 print "scanning done, processing results...\n" if $VERBOSE;
441 { 621 {
442 # remove path prefix from editor_folder 622 # remove path prefix from editor_folder
443 substr $_->{editor_folder}, 0, 1 + length $path, "" 623 substr $_->{editor_folder}, 0, 1 + length $path, ""
444 for values %ARC; 624 for values %ARC;
445 625
626 print "resolving inheritance tree...\n" if $VERBOSE;
446 # resolve inherit 627 # resolve inherit
447 while () { 628 while () {
448 my $progress; 629 my $progress;
449 my $loop; 630 my $loop;
450 631
… …
476 } 657 }
477 658
478 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 659 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
479 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 660 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
480 661
662 print "writing archetypes...\n" if $VERBOSE;
481 open my $fh, ">:utf8", "$DATADIR/archetypes~" 663 open my $fh, ">:utf8", "$DATADIR/archetypes~"
482 or die "$DATADIR/archetypes~: $!"; 664 or die "$DATADIR/archetypes~: $!";
483 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 665 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
484 } 666 }
485 667
486 { 668 {
669 print "writing treasures...\n" if $VERBOSE;
487 open my $fh, ">:utf8", "$DATADIR/treasures~" 670 open my $fh, ">:utf8", "$DATADIR/treasures~"
488 or die "$DATADIR/treasures~: $!"; 671 or die "$DATADIR/treasures~: $!";
489 print $fh $TRS; 672 print $fh $TRS;
490 } 673 }
491 674
492 { 675 {
676 print "processing facedata...\n" if $VERBOSE;
493 while (my ($k, $v) = each %FACEINFO) { 677 while (my ($k, $v) = each %FACEINFO) {
494 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 678 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
495 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 679 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
496 680
497 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 681 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
… …
502 686
503 if (my $magicmap = $v->{magicmap}) { 687 if (my $magicmap = $v->{magicmap}) {
504 $magicmap =~ y/A-Z_\-/a-z/d; 688 $magicmap =~ y/A-Z_\-/a-z/d;
505 $v->{magicmap} = $COLOR{$magicmap}; 689 $v->{magicmap} = $COLOR{$magicmap};
506 } 690 }
507 }
508 691
692 delete $v->{arc};
693 }
694
695 print "writing facedata...\n" if $VERBOSE;
509 open my $fh, ">:perlio", "$DATADIR/facedata~" 696 open my $fh, ">:perlio", "$DATADIR/facedata~"
510 or die "$DATADIR/facedata~: $!"; 697 or die "$DATADIR/facedata~: $!";
511 698
512 print $fh freeze { 699 print $fh freeze {
513 version => 2, 700 version => 2,
514 faceinfo => \%FACEINFO, 701 faceinfo => \%FACEINFO,
515 animinfo => \%ANIMINFO, 702 animinfo => \%ANIMINFO,
703 resource => \%RESOURCE,
516 }; 704 };
517 } 705 }
706
707 print "committing files...\n" if $VERBOSE;
518 708
519 for (qw(archetypes facedata treasures)) { 709 for (qw(archetypes facedata treasures)) {
520 chmod 0644, "$DATADIR/$_~"; 710 chmod 0644, "$DATADIR/$_~";
521 rename "$DATADIR/$_~", "$DATADIR/$_" 711 rename "$DATADIR/$_~", "$DATADIR/$_"
522 or die "$DATADIR/$_: $!"; 712 or die "$DATADIR/$_: $!";

Diff Legend

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