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

Diff Legend

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