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.51 by root, Sat Aug 18 20:39:14 2007 UTC vs.
Revision 1.62 by root, Mon Sep 10 18:30:30 2007 UTC

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

Diff Legend

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