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.40 by root, Mon Jul 16 19:43:33 2007 UTC vs.
Revision 1.59 by root, Tue Aug 21 20:00:18 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;
27use Coro::Channel;
26use Coro::Storable; $Storable::canonical = 1; 28use Coro::Storable; $Storable::canonical = 1;
29
30$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 31
28sub usage { 32sub usage {
29 warn <<EOF; 33 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 34Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 35 [--install-arch path]
… …
92 if (!-f "$path/regions") { 96 if (!-f "$path/regions") {
93 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";
94 exit 1 unless $FORCE; 98 exit 1 unless $FORCE;
95 } 99 }
96 100
97 system $RSYNC, "-av", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 101 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
98 and die "map installation failed.\n"; 102 and die "map installation failed.\n";
99 103
100 print "maps installed successfully.\n"; 104 print "maps installed successfully.\n";
101} 105}
102 106
… …
110 our $NFILE; 114 our $NFILE;
111 our $PATH; 115 our $PATH;
112 116
113 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 117 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
114 118
115 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;
116 124
117 sub commit_png($$$) { 125 sub commit_png($$$) {
118 my ($name, $data, $T) = @_; 126 my ($name, $data, $T) = @_;
119 127
120 $FACEINFO{$name}{"data$T"} = $data; 128 $FACEINFO{$name}{"data$T"} = $data;
121 } 129 }
122 130
123 sub process_png { 131 sub process_png {
124 while (@png) { 132 while (@c_png) {
125 my ($path, $delete) = @{pop @png}; 133 my ($path, $delete) = @{pop @c_png};
126 134
127 my $png; 135 my $png;
128 aio_lstat $path; 136 aio_lstat $path;
129 my ($size, $mtime) = (stat _)[7,9]; 137 my ($size, $mtime) = (stat _)[7,9];
130 138
… …
161 if ($w % $T || $h % $T) { 169 if ($w % $T || $h % $T) {
162 warn "$path: weird png size ($w $h), skipping.\n"; 170 warn "$path: weird png size ($w $h), skipping.\n";
163 next; 171 next;
164 } 172 }
165 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
166 unless ($path =~ /~$/) { 184 unless ($path =~ /~$/) {
167 # possibly enlarge 185 # possibly enlarge
168 if (0 > aio_stat "$stem.64x64.png") { 186 if (0 > aio_stat "$stem.64x64.png") {
169 my $other = "$stem.64x64.png~"; 187 my $other = "$stem.64x64.png~";
170 188
171 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 189 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
172 my $wrap = 0; # for the time being
173 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
174 system "convert png:\Q$path\E -depth 8 rgba:-" 250 system "convert -depth 8 $SRC rgba:-"
175 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 251 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
176 . "| 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~"
177 and die "convert/hq2xa pipeline error: status $? ($!)"; 253 and die "convert/cfhq2xa pipeline error: status $? ($!)";
178 system $OPTIPNG, "-i0", "-q", "$other~"; 254 system $OPTIPNG, "-i0", "-q", "$other~";
179 die "$other~ has zero size, aborting." unless -s "$other~"; 255 die "$other~ has zero size, aborting." unless -s "$other~";
180 rename "$other~", $other; 256 rename "$other~", $other;
181 }; 257 };
182 } 258 }
183 259
184 push @png, [$other, !$CACHE]; 260 push @c_png, [$other, !$CACHE];
185 } 261 }
186 262
187 # possibly scale down 263 # possibly scale down
188 if (0 > aio_stat "$stem.32x32.png") { 264 if (0 > aio_stat "$stem.32x32.png") {
189 my $other = "$stem.32x32.png~"; 265 my $other = "$stem.32x32.png~";
… …
214 rename "$other~", $other; 290 rename "$other~", $other;
215 }; 291 };
216 } 292 }
217 293
218 #warn "scaled down $path to $other\n";#d# 294 #warn "scaled down $path to $other\n";#d#
219 push @png, [$other, !$CACHE]; 295 push @c_png, [$other, !$CACHE];
220 } 296 }
221 } 297 }
222 298
223 (my $face = $stem) =~ s/^.*\///; 299 (my $face = $stem) =~ s/^.*\///;
224 300
… …
285 aio_unlink $path if $delete; 361 aio_unlink $path if $delete;
286 } 362 }
287 } 363 }
288 364
289 sub process_arc { 365 sub process_arc {
290 while (@arc) { 366 while (my $job = $c_arc->get) {
291 my ($dir, $file) = @{pop @arc}; 367 my ($dir, $file) = @$job;
292 368
293 my $arc; 369 my $arc;
294 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 :/
295 371
296 my $arc = read_arch "$dir/$file"; 372 my $arc = read_arch "$dir/$file";
… …
348 facings => $facings, 424 facings => $facings,
349 frames => \@frames, 425 frames => \@frames,
350 }; 426 };
351 } 427 }
352 428
353 for my $face ($o->{face} || (), @{$anim || []}) { 429 for ($o->{face} || (), @{$anim || []}) {
354 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 430 next if /^facings\s/;
355 431
432 my $face = $_;
433 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
434
356 my $info = $FACEINFO{$face} ||= {}; 435 my $info = $FACEINFO{$face} ||= { };
436 $info->{arc} = $o;
437
438 next if $face =~ /^blank.x11$|^empty.x11$/;
357 439
358 $info->{visibility} = $visibility if defined $visibility; 440 $info->{visibility} = $visibility if defined $visibility;
359 $info->{magicmap} = $magicmap if defined $magicmap; 441 $info->{magicmap} = $magicmap if defined $magicmap;
360 } 442 }
361 443
362 if (my $smooth = delete $o->{smoothface}) { 444 if (my $smooth = delete $o->{smoothface}) {
363 my %kv =split /\s+/, $smooth; 445 my %kv = split /\s+/, $smooth;
364 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 446 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
365 while (my ($face, $smooth) = each %kv) { 447 while (my ($face, $smooth) = each %kv) {
448 $FACEINFO{$smooth}{arc} = $o;
449
366 $FACEINFO{$face}{smooth} = $smooth; 450 $FACEINFO{$face}{smooth} = $smooth;
367 $FACEINFO{$face}{smoothlevel} = $level; 451 $FACEINFO{$face}{smoothlevel} = $level;
368 } 452 }
369 } 453 }
370 } 454 }
371 } 455 }
372 } 456 }
373 } 457 }
374 458
375 sub process_trs { 459 sub process_trs {
376 while (@trs) { 460 while (my $job = $c_trs->get) {
377 my ($dir, $file) = @{pop @trs}; 461 my ($dir, $file) = @$job;
378 my $path = "$dir/$file"; 462 my $path = "$dir/$file";
379 463
380 my $trs; 464 my $trs;
381 if (0 > aio_load $path, $trs) { 465 if (0 > aio_load $path, $trs) {
382 warn "$path: $!, skipping.\n"; 466 warn "$path: $!, skipping.\n";
… …
385 469
386 $TRS .= $trs; 470 $TRS .= $trs;
387 } 471 }
388 } 472 }
389 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
390 sub process_res { 492 sub process_res {
391 while (@res) { 493 while (my $job = $c_res->get) {
392 my ($dir, $file) = @{pop @res}; 494 my ($dir, $file, $type) = @$job;
393 495
394 my $data; 496 my $data;
395 aio_load "$dir/$file", $data; 497 aio_load "$dir/$file", $data;
396 498
397 my $copyright; 499 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
398 aio_load "$dir/copyright", $copyright; 500
501 next if $meta && !exists $meta->{$file};
502
503 $meta = {
504 %{ $meta->{"" } || {} },
505 %{ $meta->{$file} || {} },
506 };
507
508 if ($meta->{license} =~ s/^#//) {
509 $meta->{license} = ({
510 "pd" => "Public Domain",
511 "gpl" => "GNU General Public License, version 3.0 or any later",
512 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
513 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
514 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
515 })->{$meta->{license}}
516 || warn "$dir/$file: license tag '$meta->{license}' not found.";
517 }
399 518
400 $file =~ s/\.res$//; 519 $file =~ s/\.res$//;
401 $file =~ /\.([^.]+)$/ 520 $file =~ s/\.(ogg|wav|jpg|png)$//;
402 or next;
403
404 my $type = $1;
405 521
406 substr $dir, 0, 1 + length $PATH, ""; 522 substr $dir, 0, 1 + length $PATH, "";
407 523
408 $RESOURCE{"$dir/$file"} = { 524 $RESOURCE{"$dir/$file"} = {
409 type => $1, 525 type => (delete $meta->{type}) || $type,
410 copyright => $copyright,
411 data => $data, 526 data => $data,
412 chksum => Digest::MD5::md5 $data, 527 %$meta ? (meta => $meta) : (),
413 }; 528 };
414 } 529 }
415 } 530 }
416 531
417 sub find_files; 532 sub find_files;
… …
423 my ($dirs, $nondirs) = @_; 538 my ($dirs, $nondirs) = @_;
424 539
425 find_files "$path/$_" 540 find_files "$path/$_"
426 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 541 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
427 542
543 my $dir = $path;
544 substr $dir, 0, 1 + length $PATH, "";
545
428 for my $file (@$nondirs) { 546 for my $file (@$nondirs) {
547 if ($dir =~ /^music(?:\/|$)/) {
548 $c_res->put ([$path, $file, 3]) # FT_MUSIC
549 if $file =~ /\.(ogg)$/;
550
551 } elsif ($dir =~ /^sound(?:\/|$)/) {
552 $c_res->put ([$path, $file, 5]) # FT_SOUND
553 if $file =~ /\.(wav|ogg)$/;
554
555 } elsif ($dir =~ /^res(?:\/|$)/) {
556 $c_res->put ([$path, $file, 0]) # FT_FACE
557 if $file =~ /\.(jpg|png)$/;
558 $c_res->put ([$path, $file, 7]) # FT_RSRC
559 if $file =~ /\.(res)$/;
560
429 if ($file =~ /\.png$/) { 561 } elsif ($file =~ /\.png$/) {
430 push @png, ["$path/$file", 0]; 562 push @c_png, ["$path/$file", 0];
563
431 } elsif ($file =~ /\.trs$/) { 564 } elsif ($file =~ /\.trs$/) {
432 push @trs, [$path, $file]; 565 $c_trs->put ([$path, $file]);
566
433 } elsif ($file =~ /\.arc$/) { 567 } elsif ($file =~ /\.arc$/) {
434 push @arc, [$path, $file]; 568 $c_arc->put ([$path, $file]);
435 } elsif ($file =~ /\.(ogg|jpg|res)$/) { 569
436 push @res, [$path, $file];
437 } else { 570 } else {
438 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 571 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
439 } 572 }
440 } 573 }
441 }; 574 };
… …
459 if (!-d "$path/treasures") { 592 if (!-d "$path/treasures") {
460 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 593 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
461 exit 1 unless $FORCE; 594 exit 1 unless $FORCE;
462 } 595 }
463 596
597 print "scanning files...\n" if $VERBOSE;
598
464 find_files $path; 599 find_files $path;
600
601 my @a_arc = map +(async \&process_arc), 1..2;
602 my @a_res = map +(async \&process_res), 1..2;
603 my @a_trs = map +(async \&process_trs), 1..2;
604
465 IO::AIO::flush; 605 IO::AIO::flush;
466 606
467 $_->join for ( 607 $c_res->put (undef) for @a_res;
608 $c_arc->put (undef) for @a_arc;
609 $c_trs->put (undef) for @a_trs;
610
611 print "start file scan, arc, res processing...\n" if $VERBOSE;
612
613 $_->join for @a_arc; # need to parse all archetypes before png processing
614
615 print "end arc, start png processing...\n" if $VERBOSE;
616
468 # four png crunchers work fine for my 2x smp machine 617 # four png crunchers work fine for my 2x smp machine
469 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 618 my @a_png = map +(async \&process_png), 1..4;
470 (async \&process_trs), (async \&process_trs),
471 (async \&process_arc), (async \&process_arc),
472 (async \&process_res), (async \&process_res),
473 );
474 619
620 $_->join for (@a_trs, @a_res, @a_png);
621
622 print "scanning done, processing results...\n" if $VERBOSE;
475 { 623 {
476 # remove path prefix from editor_folder 624 # remove path prefix from editor_folder
477 substr $_->{editor_folder}, 0, 1 + length $path, "" 625 substr $_->{editor_folder}, 0, 1 + length $path, ""
478 for values %ARC; 626 for values %ARC;
479 627
628 print "resolving inheritance tree...\n" if $VERBOSE;
480 # resolve inherit 629 # resolve inherit
481 while () { 630 while () {
482 my $progress; 631 my $progress;
483 my $loop; 632 my $loop;
484 633
… …
510 } 659 }
511 660
512 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 661 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
513 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 662 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
514 663
664 print "writing archetypes...\n" if $VERBOSE;
515 open my $fh, ">:utf8", "$DATADIR/archetypes~" 665 open my $fh, ">:utf8", "$DATADIR/archetypes~"
516 or die "$DATADIR/archetypes~: $!"; 666 or die "$DATADIR/archetypes~: $!";
517 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 667 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
518 } 668 }
519 669
520 { 670 {
671 print "writing treasures...\n" if $VERBOSE;
521 open my $fh, ">:utf8", "$DATADIR/treasures~" 672 open my $fh, ">:utf8", "$DATADIR/treasures~"
522 or die "$DATADIR/treasures~: $!"; 673 or die "$DATADIR/treasures~: $!";
523 print $fh $TRS; 674 print $fh $TRS;
524 } 675 }
525 676
526 { 677 {
678 print "processing facedata...\n" if $VERBOSE;
527 while (my ($k, $v) = each %FACEINFO) { 679 while (my ($k, $v) = each %FACEINFO) {
528 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 680 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
529 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 681 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
530 682
531 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 683 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
532 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 684 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
533 685
534 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
535 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
536
537 if (my $magicmap = $v->{magicmap}) { 686 if (my $magicmap = $v->{magicmap}) {
538 $magicmap =~ y/A-Z_\-/a-z/d; 687 $magicmap =~ y/A-Z_\-/a-z/d;
539 $v->{magicmap} = $COLOR{$magicmap}; 688 $v->{magicmap} = $COLOR{$magicmap};
540 } 689 }
541 }
542 690
691 delete $v->{arc};
692 }
693
694 print "writing facedata...\n" if $VERBOSE;
543 open my $fh, ">:perlio", "$DATADIR/facedata~" 695 open my $fh, ">:perlio", "$DATADIR/facedata~"
544 or die "$DATADIR/facedata~: $!"; 696 or die "$DATADIR/facedata~: $!";
545 697
546 print $fh freeze { 698 print $fh freeze {
547 version => 2, 699 version => 2,
548 faceinfo => \%FACEINFO, 700 faceinfo => \%FACEINFO,
549 animinfo => \%ANIMINFO, 701 animinfo => \%ANIMINFO,
550 resource => \%RESOURCE, 702 resource => \%RESOURCE,
551 }; 703 };
552 } 704 }
705
706 print "committing files...\n" if $VERBOSE;
553 707
554 for (qw(archetypes facedata treasures)) { 708 for (qw(archetypes facedata treasures)) {
555 chmod 0644, "$DATADIR/$_~"; 709 chmod 0644, "$DATADIR/$_~";
556 rename "$DATADIR/$_~", "$DATADIR/$_" 710 rename "$DATADIR/$_~", "$DATADIR/$_"
557 or die "$DATADIR/$_: $!"; 711 or die "$DATADIR/$_: $!";

Diff Legend

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