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.35 by root, Sun Jun 3 15:32:51 2007 UTC vs.
Revision 1.53 by root, Sun Aug 19 09:27:08 2007 UTC

… …
6my $exec_prefix = "@exec_prefix@"; 6my $exec_prefix = "@exec_prefix@";
7my $datarootdir = "@datarootdir@"; 7my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 8my $DATADIR = "@datadir@/@PACKAGE@";
9 9
10my $CONVERT = "@CONVERT@"; 10my $CONVERT = "@CONVERT@";
11my $IDENTIFY = "@IDENTIFY@"; 11#my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 12my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@"; 14my $PNGNQ = "@PNGNQ@";
15 15
16use Getopt::Long; 16use Getopt::Long;
… …
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 Digest::MD5;
27use Carp;
28use Coro::Channel;
26use Coro::Storable; $Storable::canonical = 1; 29use Coro::Storable; $Storable::canonical = 1;
30
31$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 32
28sub usage { 33sub usage {
29 warn <<EOF; 34 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 35Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 36 [--install-arch path]
… …
92 if (!-f "$path/regions") { 97 if (!-f "$path/regions") {
93 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 98 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
94 exit 1 unless $FORCE; 99 exit 1 unless $FORCE;
95 } 100 }
96 101
97 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 102 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
98 and die "map installation failed.\n"; 103 and die "map installation failed.\n";
99 104
100 print "maps installed successfully.\n"; 105 print "maps installed successfully.\n";
101} 106}
102 107
103{ 108{
104 our %ANIMINFO; 109 our %ANIMINFO;
105 our %FACEINFO; 110 our %FACEINFO;
111 our %RESOURCE;
106 our @ARC; 112 our @ARC;
107 our %ARC; 113 our %ARC;
108 our $TRS; 114 our $TRS;
109 our $NFILE; 115 our $NFILE;
116 our $PATH;
110 117
111 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 118 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
112 119
113 our (@png, @trs, @arc); # files we are interested in 120 our $c_arc = new Coro::Channel;
121 our $c_trs = new Coro::Channel;
122 our $c_res = new Coro::Channel;
123
124 our @c_png;
114 125
115 sub commit_png($$$) { 126 sub commit_png($$$) {
116 my ($name, $data, $T) = @_; 127 my ($name, $data, $T) = @_;
117 128
118 $FACEINFO{$name}{"data$T"} = $data; 129 $FACEINFO{$name}{"data$T"} = $data;
119 } 130 }
120 131
121 sub process_png { 132 sub process_png {
122 while (@png) { 133 while (@c_png) {
123 my ($path, $delete) = @{pop @png}; 134 my ($path, $delete) = @{pop @c_png};
124 135
125 my $png; 136 my $png;
126 aio_lstat $path; 137 aio_lstat $path;
127 my ($size, $mtime) = (stat _)[7,9]; 138 my ($size, $mtime) = (stat _)[7,9];
128 139
… …
165 # possibly enlarge 176 # possibly enlarge
166 if (0 > aio_stat "$stem.64x64.png") { 177 if (0 > aio_stat "$stem.64x64.png") {
167 my $other = "$stem.64x64.png~"; 178 my $other = "$stem.64x64.png~";
168 179
169 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 180 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
170 my $wrap = 0; # for the time being
171 fork_sub { 181 fork_sub {
182 my $CROP;
183 my $SRC = "png:\Q$path\E";
184
185 # check if this is a wall. ultra-ugly. ultra-ultra-ugly.
186 if ($path =~ /^(.*\/wall\/.*_)([0-9A-F])(\.x11.*\.png)$/) {
187 my ($pfx, $dir, $sfx) = ($1, hex $2, $3);
188 #check for 0..F images to be sure(?) this is a wall
189 unless (grep { !-e sprintf "%s%X%s", $pfx, $_, $sfx } 0..15) {
190 # add a 4px border and add other images around it
191 $CROP = "-shave 8x8 +repage";
192
193 $w += 8;
194 $h += 8;
195
196 $SRC = "-size ${w}x${h} xc:transparent";
197 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
198
199 # 8 surrounding images
200 for (
201 # x y b r0 r1
202 [-1, -1, 0, 6],
203 [ 0, -1, 1, 10, 14],
204 [+1, -1, 0, 12],
205
206 [-1, 0, 8, 5, 7],
207 #
208 [+1, 0, 2, 5, 13],
209
210 [-1, +1, 0, 3],
211 [ 0, +1, 4, 10, 11],
212 [+1, +1, 0, 9],
213 ) {
214 my ($x, $y, $d, $r0, $r1) = @$_;
215 $SRC .= sprintf " png:%s%X%s -geometry %+d%+d -composite",
216 "\Q$pfx",
217 ($dir & $d) ? $r1 : $r0,
218 "\Q$sfx",
219 $x * ($w - 8) + 4,
220 $y * ($h - 8) + 4;
221 }
222 }
223 }
224
172 system "convert png:\Q$path\E -depth 8 rgba:-" 225 system "convert -depth 8 $SRC rgba:-"
173 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 226 . "| $exec_prefix/bin/cfhq2xa $w $h 0"
174 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~" 227 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
175 and die "convert/hq2xa pipeline error: status $? ($!)"; 228 and die "convert/cfhq2xa pipeline error: status $? ($!)";
176 system $OPTIPNG, "-i0", "-q", "$other~"; 229 system $OPTIPNG, "-i0", "-q", "$other~";
177 die "$other~ has zero size, aborting." unless -s "$other~"; 230 die "$other~ has zero size, aborting." unless -s "$other~";
178 rename "$other~", $other; 231 rename "$other~", $other;
179 }; 232 };
180 } 233 }
181 234
182 push @png, [$other, !$CACHE]; 235 push @c_png, [$other, !$CACHE];
183 } 236 }
184 237
185 # possibly scale down 238 # possibly scale down
186 if (0 > aio_stat "$stem.32x32.png") { 239 if (0 > aio_stat "$stem.32x32.png") {
187 my $other = "$stem.32x32.png~"; 240 my $other = "$stem.32x32.png~";
… …
212 rename "$other~", $other; 265 rename "$other~", $other;
213 }; 266 };
214 } 267 }
215 268
216 #warn "scaled down $path to $other\n";#d# 269 #warn "scaled down $path to $other\n";#d#
217 push @png, [$other, !$CACHE]; 270 push @c_png, [$other, !$CACHE];
218 } 271 }
219 } 272 }
220 273
221 (my $face = $stem) =~ s/^.*\///; 274 (my $face = $stem) =~ s/^.*\///;
222 275
… …
283 aio_unlink $path if $delete; 336 aio_unlink $path if $delete;
284 } 337 }
285 } 338 }
286 339
287 sub process_arc { 340 sub process_arc {
288 while (@arc) { 341 while (my $job = $c_arc->get) {
289 my ($dir, $file) = @{pop @arc}; 342 my ($dir, $file) = @$job;
290 343
291 my $arc; 344 my $arc;
292 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 345 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
293 346
294 my $arc = read_arch "$dir/$file"; 347 my $arc = read_arch "$dir/$file";
… …
351 for my $face ($o->{face} || (), @{$anim || []}) { 404 for my $face ($o->{face} || (), @{$anim || []}) {
352 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 405 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
353 406
354 my $info = $FACEINFO{$face} ||= {}; 407 my $info = $FACEINFO{$face} ||= {};
355 408
409 $info->{arc} = $o;
356 $info->{visibility} = $visibility if defined $visibility; 410 $info->{visibility} = $visibility if defined $visibility;
357 $info->{magicmap} = $magicmap if defined $magicmap; 411 $info->{magicmap} = $magicmap if defined $magicmap;
358 } 412 }
359 413
360 if (my $smooth = delete $o->{smoothface}) { 414 if (my $smooth = delete $o->{smoothface}) {
… …
369 } 423 }
370 } 424 }
371 } 425 }
372 426
373 sub process_trs { 427 sub process_trs {
374 while (@trs) { 428 while (my $job = $c_trs->get) {
375 my ($dir, $file) = @{pop @trs}; 429 my ($dir, $file) = @$job;
376 my $path = "$dir/$file"; 430 my $path = "$dir/$file";
377 431
378 my $trs; 432 my $trs;
379 if (0 > aio_load $path, $trs) { 433 if (0 > aio_load $path, $trs) {
380 warn "$path: $!, skipping.\n"; 434 warn "$path: $!, skipping.\n";
… …
383 437
384 $TRS .= $trs; 438 $TRS .= $trs;
385 } 439 }
386 } 440 }
387 441
442 my %FILECACHE;
443
444 sub load_cached($;$) {
445 unless (exists $FILECACHE{$_[0]}) {
446 my $data;
447 if (0 < aio_load $_[0], $data) {
448 if ($_[1]) {
449 $data = eval { $_[1]->($data) };
450 warn "$_[0]: $@" if $@;
451 }
452 }
453
454 $FILECACHE{$_[0]} = $data;
455 }
456
457 $FILECACHE{$_[0]}
458 }
459
460 sub process_res {
461 while (my $job = $c_res->get) {
462 my ($dir, $file, $type) = @$job;
463
464 my $data;
465 aio_load "$dir/$file", $data;
466
467 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
468
469 next if $meta && !exists $meta->{$file};
470
471 $meta = {
472 %{ $meta->{"" } || {} },
473 %{ $meta->{$file} || {} },
474 };
475
476 if ($meta->{license} =~ s/^#//) {
477 $meta->{license} = ({
478 "pd" => "Public Domain",
479 "gpl" => "GNU General Public License, version 3.0 or any later",
480 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
481 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
482 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
483 })->{$meta->{license}}
484 || warn "$dir/$file: license tag '$meta->{license}' not found.";
485 }
486
487 $file =~ s/\.res$//;
488 $file =~ s/\.(ogg|wav|jpg|png)$//;
489
490 substr $dir, 0, 1 + length $PATH, "";
491
492 $RESOURCE{"$dir/$file"} = {
493 type => (delete $meta->{type}) || $type,
494 data => $data,
495 chksum => (Digest::MD5::md5 $data),
496 %$meta ? (meta => $meta) : (),
497 };
498 }
499 }
500
388 sub find_files; 501 sub find_files;
389 sub find_files { 502 sub find_files {
390 my ($path) = @_; 503 my ($path) = @_;
391 504
392 IO::AIO::aioreq_pri 4; 505 IO::AIO::aioreq_pri 4;
… …
394 my ($dirs, $nondirs) = @_; 507 my ($dirs, $nondirs) = @_;
395 508
396 find_files "$path/$_" 509 find_files "$path/$_"
397 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 510 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
398 511
512 my $dir = $path;
513 substr $dir, 0, 1 + length $PATH, "";
514
399 for my $file (@$nondirs) { 515 for my $file (@$nondirs) {
516 if ($dir =~ /^music(?:\/|$)/) {
517 $c_res->put ([$path, $file, 3]) # FT_MUSIC
518 if $file =~ /\.(ogg)$/;
519
520 } elsif ($dir =~ /^sound(?:\/|$)/) {
521 $c_res->put ([$path, $file, 5]) # FT_SOUND
522 if $file =~ /\.(wav|ogg)$/;
523
524 } elsif ($dir =~ /^res(?:\/|$)/) {
525 $c_res->put ([$path, $file, 0]) # FT_FACE
526 if $file =~ /\.(jpg|png)$/;
527 $c_res->put ([$path, $file, 7]) # FT_RSRC
528 if $file =~ /\.(res)$/;
529
400 if ($file =~ /\.png$/) { 530 } elsif ($file =~ /\.png$/) {
401 push @png, ["$path/$file", 0]; 531 push @c_png, ["$path/$file", 0];
532
402 } elsif ($file =~ /\.trs$/) { 533 } elsif ($file =~ /\.trs$/) {
403 push @trs, [$path, $file]; 534 $c_trs->put ([$path, $file]);
535
404 } elsif ($file =~ /\.arc$/) { 536 } elsif ($file =~ /\.arc$/) {
405 push @arc, [$path, $file]; 537 $c_arc->put ([$path, $file]);
538
406 } else { 539 } else {
407 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 540 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
408 } 541 }
409 } 542 }
410 }; 543 };
411 } 544 }
412 545
413 sub inst_arch($) { 546 sub inst_arch($) {
414 my (undef, $path) = @_; 547 my (undef, $path) = @_;
548
549 $PATH = $path;
415 550
416 print "\n", 551 print "\n",
417 "Installing '$path' to '$DATADIR'\n", 552 "Installing '$path' to '$DATADIR'\n",
418 "\n", 553 "\n",
419 "This can take a long time if you run this\n", 554 "This can take a long time if you run this\n",
… …
426 if (!-d "$path/treasures") { 561 if (!-d "$path/treasures") {
427 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 562 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
428 exit 1 unless $FORCE; 563 exit 1 unless $FORCE;
429 } 564 }
430 565
566 print "scanning files...\n" if $VERBOSE;
567
431 find_files $path; 568 find_files $path;
569
570 my @a_arc = map +(async \&process_arc), 1..2;
571 my @a_res = map +(async \&process_res), 1..2;
572 my @a_trs = map +(async \&process_trs), 1..2;
573
432 IO::AIO::flush; 574 IO::AIO::flush;
433 575
434 $_->join for ( 576 $c_res->put (undef) for @a_res;
577 $c_arc->put (undef) for @a_arc;
578 $c_trs->put (undef) for @a_trs;
579
580 print "start file scan, arc, res processing...\n" if $VERBOSE;
581
582 $_->join for @a_arc; # need to parse all archetypes before png processing
583
584 print "end arc, start png processing...\n" if $VERBOSE;
585
435 # four png crunchers work fine for my 2x smp machine 586 # four png crunchers work fine for my 2x smp machine
436 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 587 my @a_png = map +(async \&process_png), 1..4;
437 (async \&process_trs), (async \&process_trs),
438 (async \&process_arc), (async \&process_arc),
439 );
440 588
589 $_->join for (@a_trs, @a_res, @a_png);
590
591 print "scanning done, processing results...\n" if $VERBOSE;
441 { 592 {
442 # remove path prefix from editor_folder 593 # remove path prefix from editor_folder
443 substr $_->{editor_folder}, 0, 1 + length $path, "" 594 substr $_->{editor_folder}, 0, 1 + length $path, ""
444 for values %ARC; 595 for values %ARC;
445 596
597 print "resolving inheritance tree...\n" if $VERBOSE;
446 # resolve inherit 598 # resolve inherit
447 while () { 599 while () {
448 my $progress; 600 my $progress;
449 my $loop; 601 my $loop;
450 602
… …
476 } 628 }
477 629
478 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 630 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
479 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 631 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
480 632
633 print "writing archetypes...\n" if $VERBOSE;
481 open my $fh, ">:utf8", "$DATADIR/archetypes~" 634 open my $fh, ">:utf8", "$DATADIR/archetypes~"
482 or die "$DATADIR/archetypes~: $!"; 635 or die "$DATADIR/archetypes~: $!";
483 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 636 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
484 } 637 }
485 638
486 { 639 {
640 print "writing treasures...\n" if $VERBOSE;
487 open my $fh, ">:utf8", "$DATADIR/treasures~" 641 open my $fh, ">:utf8", "$DATADIR/treasures~"
488 or die "$DATADIR/treasures~: $!"; 642 or die "$DATADIR/treasures~: $!";
489 print $fh $TRS; 643 print $fh $TRS;
490 } 644 }
491 645
492 { 646 {
647 print "processing facedata...\n" if $VERBOSE;
493 while (my ($k, $v) = each %FACEINFO) { 648 while (my ($k, $v) = each %FACEINFO) {
494 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 649 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
495 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 650 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
496 651
497 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 652 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
… …
502 657
503 if (my $magicmap = $v->{magicmap}) { 658 if (my $magicmap = $v->{magicmap}) {
504 $magicmap =~ y/A-Z_\-/a-z/d; 659 $magicmap =~ y/A-Z_\-/a-z/d;
505 $v->{magicmap} = $COLOR{$magicmap}; 660 $v->{magicmap} = $COLOR{$magicmap};
506 } 661 }
507 }
508 662
663 delete $v->{arc};
664 }
665
666 print "writing facedata...\n" if $VERBOSE;
509 open my $fh, ">:perlio", "$DATADIR/facedata~" 667 open my $fh, ">:perlio", "$DATADIR/facedata~"
510 or die "$DATADIR/facedata~: $!"; 668 or die "$DATADIR/facedata~: $!";
511 669
512 print $fh freeze { 670 print $fh freeze {
513 version => 2, 671 version => 2,
514 faceinfo => \%FACEINFO, 672 faceinfo => \%FACEINFO,
515 animinfo => \%ANIMINFO, 673 animinfo => \%ANIMINFO,
674 resource => \%RESOURCE,
516 }; 675 };
517 } 676 }
677
678 print "committing files...\n" if $VERBOSE;
518 679
519 for (qw(archetypes facedata treasures)) { 680 for (qw(archetypes facedata treasures)) {
520 chmod 0644, "$DATADIR/$_~"; 681 chmod 0644, "$DATADIR/$_~";
521 rename "$DATADIR/$_~", "$DATADIR/$_" 682 rename "$DATADIR/$_~", "$DATADIR/$_"
522 or die "$DATADIR/$_: $!"; 683 or die "$DATADIR/$_: $!";

Diff Legend

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