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.42 by root, Thu Jul 19 13:46:39 2007 UTC vs.
Revision 1.62 by root, Mon Sep 10 18:30:30 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 {
… …
95 if (!-f "$path/regions") { 96 if (!-f "$path/regions") {
96 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";
97 exit 1 unless $FORCE; 98 exit 1 unless $FORCE;
98 } 99 }
99 100
100 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"
101 and die "map installation failed.\n"; 105 and die "map installation failed.\n";
102 106
103 print "maps installed successfully.\n"; 107 print "maps installed successfully.\n";
104} 108}
105 109
… …
113 our $NFILE; 117 our $NFILE;
114 our $PATH; 118 our $PATH;
115 119
116 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 120 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
117 121
118 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;
119 127
120 sub commit_png($$$) { 128 sub commit_png($$$) {
121 my ($name, $data, $T) = @_; 129 my ($name, $data, $T) = @_;
122 130
123 $FACEINFO{$name}{"data$T"} = $data; 131 $FACEINFO{$name}{"data$T"} = $data;
124 } 132 }
125 133
126 sub process_png { 134 sub process_png {
127 while (@png) { 135 while (@c_png) {
128 my ($path, $delete) = @{pop @png}; 136 my ($path, $delete) = @{pop @c_png};
129 137
130 my $png; 138 my $png;
131 aio_lstat $path; 139 aio_lstat $path;
132 my ($size, $mtime) = (stat _)[7,9]; 140 my ($size, $mtime) = (stat _)[7,9];
133 141
… …
164 if ($w % $T || $h % $T) { 172 if ($w % $T || $h % $T) {
165 warn "$path: weird png size ($w $h), skipping.\n"; 173 warn "$path: weird png size ($w $h), skipping.\n";
166 next; 174 next;
167 } 175 }
168 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
169 unless ($path =~ /~$/) { 187 unless ($path =~ /~$/) {
170 # possibly enlarge 188 # possibly enlarge
171 if (0 > aio_stat "$stem.64x64.png") { 189 if (0 > aio_stat "$stem.64x64.png") {
172 my $other = "$stem.64x64.png~"; 190 my $other = "$stem.64x64.png~";
173 191
174 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 192 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175 my $wrap = 0; # for the time being
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 png:\Q$path\E -depth 8 rgba:-" 253 system "convert -depth 8 $SRC rgba:-"
178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 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";
… …
388 472
389 $TRS .= $trs; 473 $TRS .= $trs;
390 } 474 }
391 } 475 }
392 476
477 my %FILECACHE;
478
479 sub load_cached($;$) {
480 unless (exists $FILECACHE{$_[0]}) {
481 my $data;
482 if (0 < aio_load $_[0], $data) {
483 if ($_[1]) {
484 $data = eval { $_[1]->($data) };
485 warn "$_[0]: $@" if $@;
486 }
487 }
488
489 $FILECACHE{$_[0]} = $data;
490 }
491
492 $FILECACHE{$_[0]}
493 }
494
393 sub process_res { 495 sub process_res {
394 while (@res) { 496 while (my $job = $c_res->get) {
395 my ($dir, $file) = @{pop @res}; 497 my ($dir, $file, $type) = @$job;
396 498
397 my $data; 499 my $data;
398 aio_load "$dir/$file", $data; 500 aio_load "$dir/$file", $data;
399 501
400 my $copyright; 502
401 aio_load "$dir/copyright", $copyright; 503 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
504
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 }
513
514 $meta = {
515 %{ $meta->{"" } || {} },
516 %{ $meta->{$file} || {} },
517 };
518
519 if ($meta->{license} =~ s/^#//) {
520 $meta->{license} = ({
521 "pd" => "Public Domain",
522 "gpl" => "GNU General Public License, version 3.0 or any later",
523 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
524 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
525 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
526 })->{$meta->{license}}
527 || warn "$dir/$file: license tag '$meta->{license}' not found.";
528 }
402 529
403 $file =~ s/\.res$//; 530 $file =~ s/\.res$//;
404 $file =~ /\.([^.]+)$/ 531 $file =~ s/\.(ogg|wav|jpg|png)$//;
405 or next;
406
407 my $type = $1;
408 532
409 substr $dir, 0, 1 + length $PATH, ""; 533 substr $dir, 0, 1 + length $PATH, "";
410 534
411 $RESOURCE{"$dir/$file"} = { 535 $RESOURCE{"$dir/$file"} = {
412 type => $1, 536 type => (delete $meta->{type}) || $type,
413 copyright => $copyright,
414 data => $data, 537 data => $data,
415 chksum => Digest::MD5::md5 $data, 538 %$meta ? (meta => $meta) : (),
416 }; 539 };
417 } 540 }
418 } 541 }
419 542
420 sub find_files; 543 sub find_files;
… …
426 my ($dirs, $nondirs) = @_; 549 my ($dirs, $nondirs) = @_;
427 550
428 find_files "$path/$_" 551 find_files "$path/$_"
429 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 552 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
430 553
554 my $dir = $path;
555 substr $dir, 0, 1 + length $PATH, "";
556
431 for my $file (@$nondirs) { 557 for my $file (@$nondirs) {
558 if ($dir =~ /^music(?:\/|$)/) {
559 $c_res->put ([$path, $file, 3]) # FT_MUSIC
560 if $file =~ /\.(ogg)$/;
561
562 } elsif ($dir =~ /^sound(?:\/|$)/) {
563 $c_res->put ([$path, $file, 5]) # FT_SOUND
564 if $file =~ /\.(wav|ogg)$/;
565
566 } elsif ($dir =~ /^res(?:\/|$)/) {
567 $c_res->put ([$path, $file, 0]) # FT_FACE
568 if $file =~ /\.(jpg|png)$/;
569 $c_res->put ([$path, $file, 7]) # FT_RSRC
570 if $file =~ /\.(res)$/;
571
432 if ($file =~ /\.png$/) { 572 } elsif ($file =~ /\.png$/) {
433 push @png, ["$path/$file", 0]; 573 push @c_png, ["$path/$file", 0];
574
434 } elsif ($file =~ /\.trs$/) { 575 } elsif ($file =~ /\.trs$/) {
435 push @trs, [$path, $file]; 576 $c_trs->put ([$path, $file]);
577
436 } elsif ($file =~ /\.arc$/) { 578 } elsif ($file =~ /\.arc$/) {
437 push @arc, [$path, $file]; 579 $c_arc->put ([$path, $file]);
438 } elsif ($file =~ /\.(ogg|jpg|res)$/) { 580
439 push @res, [$path, $file];
440 } else { 581 } else {
441 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 582 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
442 } 583 }
443 } 584 }
444 }; 585 };
… …
462 if (!-d "$path/treasures") { 603 if (!-d "$path/treasures") {
463 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";
464 exit 1 unless $FORCE; 605 exit 1 unless $FORCE;
465 } 606 }
466 607
608 print "scanning files...\n" if $VERBOSE;
609
467 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
468 IO::AIO::flush; 616 IO::AIO::flush;
469 617
470 $_->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
471 # four png crunchers work fine for my 2x smp machine 628 # four png crunchers work fine for my 2x smp machine
472 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 629 my @a_png = map +(async \&process_png), 1..4;
473 (async \&process_trs), (async \&process_trs),
474 (async \&process_arc), (async \&process_arc),
475 (async \&process_res), (async \&process_res),
476 );
477 630
631 $_->join for (@a_trs, @a_res, @a_png);
632
633 print "scanning done, processing results...\n" if $VERBOSE;
478 { 634 {
479 # remove path prefix from editor_folder 635 # remove path prefix from editor_folder
480 substr $_->{editor_folder}, 0, 1 + length $path, "" 636 substr $_->{editor_folder}, 0, 1 + length $path, ""
481 for values %ARC; 637 for values %ARC;
482 638
639 print "resolving inheritance tree...\n" if $VERBOSE;
483 # resolve inherit 640 # resolve inherit
484 while () { 641 while () {
485 my $progress; 642 my $progress;
486 my $loop; 643 my $loop;
487 644
… …
513 } 670 }
514 671
515 # 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
516 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 673 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
517 674
675 print "writing archetypes...\n" if $VERBOSE;
518 open my $fh, ">:utf8", "$DATADIR/archetypes~" 676 open my $fh, ">:utf8", "$DATADIR/archetypes~"
519 or die "$DATADIR/archetypes~: $!"; 677 or die "$DATADIR/archetypes~: $!";
520 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];
521 } 679 }
522 680
523 { 681 {
682 print "writing treasures...\n" if $VERBOSE;
524 open my $fh, ">:utf8", "$DATADIR/treasures~" 683 open my $fh, ">:utf8", "$DATADIR/treasures~"
525 or die "$DATADIR/treasures~: $!"; 684 or die "$DATADIR/treasures~: $!";
526 print $fh $TRS; 685 print $fh $TRS;
527 } 686 }
528 687
529 { 688 {
689 print "processing facedata...\n" if $VERBOSE;
530 while (my ($k, $v) = each %FACEINFO) { 690 while (my ($k, $v) = each %FACEINFO) {
531 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";
532 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";
533 693
534 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";
535 #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";
536 696
537 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
538 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
539
540 if (my $magicmap = $v->{magicmap}) { 697 if (my $magicmap = $v->{magicmap}) {
541 $magicmap =~ y/A-Z_\-/a-z/d; 698 $magicmap =~ y/A-Z_\-/a-z/d;
542 $v->{magicmap} = $COLOR{$magicmap}; 699 $v->{magicmap} = $COLOR{$magicmap};
543 } 700 }
544 }
545 701
702 delete $v->{arc};
703 }
704
705 print "writing facedata...\n" if $VERBOSE;
546 open my $fh, ">:perlio", "$DATADIR/facedata~" 706 open my $fh, ">:perlio", "$DATADIR/facedata~"
547 or die "$DATADIR/facedata~: $!"; 707 or die "$DATADIR/facedata~: $!";
548 708
549 print $fh freeze { 709 print $fh freeze {
550 version => 2, 710 version => 2,
551 faceinfo => \%FACEINFO, 711 faceinfo => \%FACEINFO,
552 animinfo => \%ANIMINFO, 712 animinfo => \%ANIMINFO,
553 resource => \%RESOURCE, 713 resource => \%RESOURCE,
554 }; 714 };
555 } 715 }
716
717 print "committing files...\n" if $VERBOSE;
556 718
557 for (qw(archetypes facedata treasures)) { 719 for (qw(archetypes facedata treasures)) {
558 chmod 0644, "$DATADIR/$_~"; 720 chmod 0644, "$DATADIR/$_~";
559 rename "$DATADIR/$_~", "$DATADIR/$_" 721 rename "$DATADIR/$_~", "$DATADIR/$_"
560 or die "$DATADIR/$_: $!"; 722 or die "$DATADIR/$_: $!";

Diff Legend

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