ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/utils/cfutil.in
(Generate patch)

Comparing cf.schmorp.de/server/utils/cfutil.in (file contents):
Revision 1.52 by root, Sat Aug 18 22:25:35 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 {
177 my $CROP; 194 my $CROP;
178 my $SRC = "png:\Q$path\E"; 195 my $SRC = "png:\Q$path\E";
179 196
180 # check if this is a wall. ultra-ugly. ultra-ultra-ugly. 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"
181 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) { 206 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
207 ) {
182 my ($pfx, $dir, $sfx) = ($1, hex $2, $3); 208 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
183 #check for 0..F images to be sure(?) this is a wall 209
184 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) { 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) {
185 # add a 4px border and add other images around it 216 # add a 4px border and add other images around it
186 $CROP = "-shave 8x8 +repage"; 217 $CROP = "-shave 8x8 +repage";
187 218
188 $w += 8; 219 $w += 8;
189 $h += 8; 220 $h += 8;
190 221
191 $SRC = "-size ${w}x${h} xc:transparent"; 222 $SRC = "-size ${w}x${h} xc:transparent";
192 $SRC .= " png:\Q$path\E -geometry +4+4 -composite"; 223 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
193 224
194 # 8 surrounding images 225 # 8 surrounding images
195 for ( 226 for (
196 # x y b r0 r1 227 # x y b r0 r1
197 [-1, -1, 0, 6], 228 [-1, -1, 0, 6],
198 [ 0, -1, 1, 10, 14], 229 [ 0, -1, 1, 10, 14],
199 [+1, -1, 0, 12], 230 [+1, -1, 0, 12],
200 231
201 [-1, 0, 8, 5, 7], 232 [-1, 0, 8, 5, 7],
202 # 233 #
203 [+1, 0, 2, 5, 13], 234 [+1, 0, 2, 5, 13],
204 235
205 [-1, +1, 0, 3], 236 [-1, +1, 0, 3],
206 [ 0, +1, 4, 10, 11], 237 [ 0, +1, 4, 10, 11],
207 [+1, +1, 0, 9], 238 [+1, +1, 0, 9],
208 ) { 239 ) {
209 my ($x, $y, $d, $r0, $r1) = @$_; 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
210 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite", 246 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
211 "\Q$pfx", 247 "\Q$tile",
212 ($dir & $d) ? $r1 : $r0,
213 "\Q$sfx",
214 $x * ($w - 8) + 4, 248 $x * ($w - 8) + 4,
215 $y * ($h - 8) + 4; 249 $y * ($h - 8) + 4;
216 }
217 } 250 }
218 } 251 }
219 252
220 system "convert -depth 8 $SRC rgba:-" 253 system "convert -depth 8 $SRC rgba:-"
221 . "| $exec_prefix/bin/cfhq2xa $w $h 0" 254 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
225 die "$other~ has zero size, aborting." unless -s "$other~"; 258 die "$other~ has zero size, aborting." unless -s "$other~";
226 rename "$other~", $other; 259 rename "$other~", $other;
227 }; 260 };
228 } 261 }
229 262
230 push @png, [$other, !$CACHE]; 263 push @c_png, [$other, !$CACHE];
231 } 264 }
232 265
233 # possibly scale down 266 # possibly scale down
234 if (0 > aio_stat "$stem.32x32.png") { 267 if (0 > aio_stat "$stem.32x32.png") {
235 my $other = "$stem.32x32.png~"; 268 my $other = "$stem.32x32.png~";
260 rename "$other~", $other; 293 rename "$other~", $other;
261 }; 294 };
262 } 295 }
263 296
264 #warn "scaled down $path to $other\n";#d# 297 #warn "scaled down $path to $other\n";#d#
265 push @png, [$other, !$CACHE]; 298 push @c_png, [$other, !$CACHE];
266 } 299 }
267 } 300 }
268 301
269 (my $face = $stem) =~ s/^.*\///; 302 (my $face = $stem) =~ s/^.*\///;
270 303
331 aio_unlink $path if $delete; 364 aio_unlink $path if $delete;
332 } 365 }
333 } 366 }
334 367
335 sub process_arc { 368 sub process_arc {
336 while (@arc) { 369 while (my $job = $c_arc->get) {
337 my ($dir, $file) = @{pop @arc}; 370 my ($dir, $file) = @$job;
338 371
339 my $arc; 372 my $arc;
340 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 :/
341 374
342 my $arc = read_arch "$dir/$file"; 375 my $arc = read_arch "$dir/$file";
394 facings => $facings, 427 facings => $facings,
395 frames => \@frames, 428 frames => \@frames,
396 }; 429 };
397 } 430 }
398 431
399 for my $face ($o->{face} || (), @{$anim || []}) { 432 for ($o->{face} || (), @{$anim || []}) {
400 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 433 next if /^facings\s/;
401 434
435 my $face = $_;
436 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
437
402 my $info = $FACEINFO{$face} ||= {}; 438 my $info = $FACEINFO{$face} ||= { };
439 $info->{arc} = $o;
440
441 next if $face =~ /^blank.x11$|^empty.x11$/;
403 442
404 $info->{visibility} = $visibility if defined $visibility; 443 $info->{visibility} = $visibility if defined $visibility;
405 $info->{magicmap} = $magicmap if defined $magicmap; 444 $info->{magicmap} = $magicmap if defined $magicmap;
406 } 445 }
407 446
408 if (my $smooth = delete $o->{smoothface}) { 447 if (my $smooth = delete $o->{smoothface}) {
409 my %kv =split /\s+/, $smooth; 448 my %kv = split /\s+/, $smooth;
410 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 449 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
411 while (my ($face, $smooth) = each %kv) { 450 while (my ($face, $smooth) = each %kv) {
451 $FACEINFO{$smooth}{arc} = $o;
452
412 $FACEINFO{$face}{smooth} = $smooth; 453 $FACEINFO{$face}{smooth} = $smooth;
413 $FACEINFO{$face}{smoothlevel} = $level; 454 $FACEINFO{$face}{smoothlevel} = $level;
414 } 455 }
415 } 456 }
416 } 457 }
417 } 458 }
418 } 459 }
419 } 460 }
420 461
421 sub process_trs { 462 sub process_trs {
422 while (@trs) { 463 while (my $job = $c_trs->get) {
423 my ($dir, $file) = @{pop @trs}; 464 my ($dir, $file) = @$job;
424 my $path = "$dir/$file"; 465 my $path = "$dir/$file";
425 466
426 my $trs; 467 my $trs;
427 if (0 > aio_load $path, $trs) { 468 if (0 > aio_load $path, $trs) {
428 warn "$path: $!, skipping.\n"; 469 warn "$path: $!, skipping.\n";
450 491
451 $FILECACHE{$_[0]} 492 $FILECACHE{$_[0]}
452 } 493 }
453 494
454 sub process_res { 495 sub process_res {
455 while (@res) { 496 while (my $job = $c_res->get) {
456 my ($dir, $file, $type) = @{pop @res}; 497 my ($dir, $file, $type) = @$job;
457 498
458 my $data; 499 my $data;
459 aio_load "$dir/$file", $data; 500 aio_load "$dir/$file", $data;
460 501
502
461 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) };
462 504
463 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 }
464 513
465 $meta = { 514 $meta = {
466 %{ $meta->{"" } || {} }, 515 %{ $meta->{"" } || {} },
467 %{ $meta->{$file} || {} }, 516 %{ $meta->{$file} || {} },
468 }; 517 };
470 if ($meta->{license} =~ s/^#//) { 519 if ($meta->{license} =~ s/^#//) {
471 $meta->{license} = ({ 520 $meta->{license} = ({
472 "pd" => "Public Domain", 521 "pd" => "Public Domain",
473 "gpl" => "GNU General Public License, version 3.0 or any later", 522 "gpl" => "GNU General Public License, version 3.0 or any later",
474 "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/",
475 "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/",
476 "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/",
477 })->{$meta->{license}} 526 })->{$meta->{license}}
478 || warn "$dir/$file: license tag '$meta->{license}' not found."; 527 || warn "$dir/$file: license tag '$meta->{license}' not found.";
479 } 528 }
480 529
484 substr $dir, 0, 1 + length $PATH, ""; 533 substr $dir, 0, 1 + length $PATH, "";
485 534
486 $RESOURCE{"$dir/$file"} = { 535 $RESOURCE{"$dir/$file"} = {
487 type => (delete $meta->{type}) || $type, 536 type => (delete $meta->{type}) || $type,
488 data => $data, 537 data => $data,
489 chksum => (Digest::MD5::md5 $data),
490 %$meta ? (meta => $meta) : (), 538 %$meta ? (meta => $meta) : (),
491 }; 539 };
492 } 540 }
493 } 541 }
494 542
506 my $dir = $path; 554 my $dir = $path;
507 substr $dir, 0, 1 + length $PATH, ""; 555 substr $dir, 0, 1 + length $PATH, "";
508 556
509 for my $file (@$nondirs) { 557 for my $file (@$nondirs) {
510 if ($dir =~ /^music(?:\/|$)/) { 558 if ($dir =~ /^music(?:\/|$)/) {
511 push @res, [$path, $file, 3] # FT_MUSIC 559 $c_res->put ([$path, $file, 3]) # FT_MUSIC
512 if $file =~ /\.(ogg)$/; 560 if $file =~ /\.(ogg)$/;
513 561
514 } elsif ($dir =~ /^sound(?:\/|$)/) { 562 } elsif ($dir =~ /^sound(?:\/|$)/) {
515 push @res, [$path, $file, 5] # FT_SOUND 563 $c_res->put ([$path, $file, 5]) # FT_SOUND
516 if $file =~ /\.(wav|ogg)$/; 564 if $file =~ /\.(wav|ogg)$/;
517 565
518 } elsif ($dir =~ /^res(?:\/|$)/) { 566 } elsif ($dir =~ /^res(?:\/|$)/) {
519 push @res, [$path, $file, 0] # FT_FACE 567 $c_res->put ([$path, $file, 0]) # FT_FACE
520 if $file =~ /\.(jpg|png)$/; 568 if $file =~ /\.(jpg|png)$/;
521 push @res, [$path, $file, 7] # FT_RSRC 569 $c_res->put ([$path, $file, 7]) # FT_RSRC
522 if $file =~ /\.(res)$/; 570 if $file =~ /\.(res)$/;
523 571
524 } elsif ($file =~ /\.png$/) { 572 } elsif ($file =~ /\.png$/) {
525 push @png, ["$path/$file", 0]; 573 push @c_png, ["$path/$file", 0];
526 574
527 } elsif ($file =~ /\.trs$/) { 575 } elsif ($file =~ /\.trs$/) {
528 push @trs, [$path, $file]; 576 $c_trs->put ([$path, $file]);
529 577
530 } elsif ($file =~ /\.arc$/) { 578 } elsif ($file =~ /\.arc$/) {
531 push @arc, [$path, $file]; 579 $c_arc->put ([$path, $file]);
532 580
533 } else { 581 } else {
534 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 582 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
535 } 583 }
536 } 584 }
555 if (!-d "$path/treasures") { 603 if (!-d "$path/treasures") {
556 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";
557 exit 1 unless $FORCE; 605 exit 1 unless $FORCE;
558 } 606 }
559 607
608 print "scanning files...\n" if $VERBOSE;
609
560 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
561 IO::AIO::flush; 616 IO::AIO::flush;
562 617
563 $_->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
564 # four png crunchers work fine for my 2x smp machine 628 # four png crunchers work fine for my 2x smp machine
565 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 629 my @a_png = map +(async \&process_png), 1..4;
566 (async \&process_trs), (async \&process_trs),
567 (async \&process_arc), (async \&process_arc),
568 (async \&process_res), (async \&process_res),
569 );
570 630
631 $_->join for (@a_trs, @a_res, @a_png);
632
633 print "scanning done, processing results...\n" if $VERBOSE;
571 { 634 {
572 # remove path prefix from editor_folder 635 # remove path prefix from editor_folder
573 substr $_->{editor_folder}, 0, 1 + length $path, "" 636 substr $_->{editor_folder}, 0, 1 + length $path, ""
574 for values %ARC; 637 for values %ARC;
575 638
639 print "resolving inheritance tree...\n" if $VERBOSE;
576 # resolve inherit 640 # resolve inherit
577 while () { 641 while () {
578 my $progress; 642 my $progress;
579 my $loop; 643 my $loop;
580 644
606 } 670 }
607 671
608 # 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
609 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 673 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
610 674
675 print "writing archetypes...\n" if $VERBOSE;
611 open my $fh, ">:utf8", "$DATADIR/archetypes~" 676 open my $fh, ">:utf8", "$DATADIR/archetypes~"
612 or die "$DATADIR/archetypes~: $!"; 677 or die "$DATADIR/archetypes~: $!";
613 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];
614 } 679 }
615 680
616 { 681 {
682 print "writing treasures...\n" if $VERBOSE;
617 open my $fh, ">:utf8", "$DATADIR/treasures~" 683 open my $fh, ">:utf8", "$DATADIR/treasures~"
618 or die "$DATADIR/treasures~: $!"; 684 or die "$DATADIR/treasures~: $!";
619 print $fh $TRS; 685 print $fh $TRS;
620 } 686 }
621 687
622 { 688 {
689 print "processing facedata...\n" if $VERBOSE;
623 while (my ($k, $v) = each %FACEINFO) { 690 while (my ($k, $v) = each %FACEINFO) {
624 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";
625 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";
626 693
627 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";
628 #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";
629 696
630 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
631 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
632
633 if (my $magicmap = $v->{magicmap}) { 697 if (my $magicmap = $v->{magicmap}) {
634 $magicmap =~ y/A-Z_\-/a-z/d; 698 $magicmap =~ y/A-Z_\-/a-z/d;
635 $v->{magicmap} = $COLOR{$magicmap}; 699 $v->{magicmap} = $COLOR{$magicmap};
636 } 700 }
637 }
638 701
702 delete $v->{arc};
703 }
704
705 print "writing facedata...\n" if $VERBOSE;
639 open my $fh, ">:perlio", "$DATADIR/facedata~" 706 open my $fh, ">:perlio", "$DATADIR/facedata~"
640 or die "$DATADIR/facedata~: $!"; 707 or die "$DATADIR/facedata~: $!";
641 708
642 print $fh freeze { 709 print $fh freeze {
643 version => 2, 710 version => 2,
644 faceinfo => \%FACEINFO, 711 faceinfo => \%FACEINFO,
645 animinfo => \%ANIMINFO, 712 animinfo => \%ANIMINFO,
646 resource => \%RESOURCE, 713 resource => \%RESOURCE,
647 }; 714 };
648 } 715 }
716
717 print "committing files...\n" if $VERBOSE;
649 718
650 for (qw(archetypes facedata treasures)) { 719 for (qw(archetypes facedata treasures)) {
651 chmod 0644, "$DATADIR/$_~"; 720 chmod 0644, "$DATADIR/$_~";
652 rename "$DATADIR/$_~", "$DATADIR/$_" 721 rename "$DATADIR/$_~", "$DATADIR/$_"
653 or die "$DATADIR/$_: $!"; 722 or die "$DATADIR/$_: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines