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.56 by root, Sun Aug 19 15:47:56 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 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", "--chmod=u=rwX,go=rX", "$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
… …
110 our $NFILE; 115 our $NFILE;
111 our $PATH; 116 our $PATH;
112 117
113 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 118 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
114 119
115 our (@png, @trs, @arc, @res); # 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;
116 125
117 sub commit_png($$$) { 126 sub commit_png($$$) {
118 my ($name, $data, $T) = @_; 127 my ($name, $data, $T) = @_;
119 128
120 $FACEINFO{$name}{"data$T"} = $data; 129 $FACEINFO{$name}{"data$T"} = $data;
121 } 130 }
122 131
123 sub process_png { 132 sub process_png {
124 while (@png) { 133 while (@c_png) {
125 my ($path, $delete) = @{pop @png}; 134 my ($path, $delete) = @{pop @c_png};
126 135
127 my $png; 136 my $png;
128 aio_lstat $path; 137 aio_lstat $path;
129 my ($size, $mtime) = (stat _)[7,9]; 138 my ($size, $mtime) = (stat _)[7,9];
130 139
… …
161 if ($w % $T || $h % $T) { 170 if ($w % $T || $h % $T) {
162 warn "$path: weird png size ($w $h), skipping.\n"; 171 warn "$path: weird png size ($w $h), skipping.\n";
163 next; 172 next;
164 } 173 }
165 174
175 (my $base = $stem) =~ s/^.*\///;
176
177 my $fi = $FACEINFO{$base};
178 unless ($fi) {
179 warn "$path: <$base> not referenced by any archetype, skipping.\n";
180 next;
181 }
182
183 my $arc = $FACEINFO{$base}{arc}
184 or die "FATAL: internal error <$base>, cannot continue";
185
166 unless ($path =~ /~$/) { 186 unless ($path =~ /~$/) {
167 # possibly enlarge 187 # possibly enlarge
168 if (0 > aio_stat "$stem.64x64.png") { 188 if (0 > aio_stat "$stem.64x64.png") {
169 my $other = "$stem.64x64.png~"; 189 my $other = "$stem.64x64.png~";
170 190
171 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 191 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
172 my $wrap = 0; # for the time being
173 fork_sub { 192 fork_sub {
193 my $CROP;
194 my $SRC = "png:\Q$path\E";
195
196 my $is_floor = $arc->{is_floor};
197 my $is_wall = 0;
198
199 my ($wall_pfx, $wall_dir, $wall_sfx);
200
201 if (
202 !$is_floor
203 && !$arc->{alive}
204 && $arc->{move_block} eq "all"
205 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
206 ) {
207 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
208
209 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
210 $is_wall = 1;
211 }
212 }
213
214 if ($is_wall || $is_floor) {
215 # add a 4px border and add other images around it
216 $CROP = "-shave 8x8 +repage";
217
218 $w += 8;
219 $h += 8;
220
221 $SRC = "-size ${w}x${h} xc:transparent";
222 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
223
224 # 8 surrounding images
225 for (
226 # x y b r0 r1
227 [-1, -1, 0, 6],
228 [ 0, -1, 1, 10, 14],
229 [+1, -1, 0, 12],
230
231 [-1, 0, 8, 5, 7],
232 #
233 [+1, 0, 2, 5, 13],
234
235 [-1, +1, 0, 3],
236 [ 0, +1, 4, 10, 11],
237 [+1, +1, 0, 9],
238 ) {
239 my ($x, $y, $d, $r0, $r1) = @$_;
240
241 my $tile = $is_floor ? $path
242 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
243 : die;
244
245 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
246 "\Q$tile",
247 $x * ($w - 8) + 4,
248 $y * ($h - 8) + 4;
249 }
250 }
251
174 system "convert png:\Q$path\E -depth 8 rgba:-" 252 system "convert -depth 8 $SRC rgba:-"
175 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 253 . "| $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~" 254 . "| 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 $? ($!)"; 255 and die "convert/cfhq2xa pipeline error: status $? ($!)";
178 system $OPTIPNG, "-i0", "-q", "$other~"; 256 system $OPTIPNG, "-i0", "-q", "$other~";
179 die "$other~ has zero size, aborting." unless -s "$other~"; 257 die "$other~ has zero size, aborting." unless -s "$other~";
180 rename "$other~", $other; 258 rename "$other~", $other;
181 }; 259 };
182 } 260 }
183 261
184 push @png, [$other, !$CACHE]; 262 push @c_png, [$other, !$CACHE];
185 } 263 }
186 264
187 # possibly scale down 265 # possibly scale down
188 if (0 > aio_stat "$stem.32x32.png") { 266 if (0 > aio_stat "$stem.32x32.png") {
189 my $other = "$stem.32x32.png~"; 267 my $other = "$stem.32x32.png~";
… …
214 rename "$other~", $other; 292 rename "$other~", $other;
215 }; 293 };
216 } 294 }
217 295
218 #warn "scaled down $path to $other\n";#d# 296 #warn "scaled down $path to $other\n";#d#
219 push @png, [$other, !$CACHE]; 297 push @c_png, [$other, !$CACHE];
220 } 298 }
221 } 299 }
222 300
223 (my $face = $stem) =~ s/^.*\///; 301 (my $face = $stem) =~ s/^.*\///;
224 302
… …
285 aio_unlink $path if $delete; 363 aio_unlink $path if $delete;
286 } 364 }
287 } 365 }
288 366
289 sub process_arc { 367 sub process_arc {
290 while (@arc) { 368 while (my $job = $c_arc->get) {
291 my ($dir, $file) = @{pop @arc}; 369 my ($dir, $file) = @$job;
292 370
293 my $arc; 371 my $arc;
294 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 372 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
295 373
296 my $arc = read_arch "$dir/$file"; 374 my $arc = read_arch "$dir/$file";
… …
349 frames => \@frames, 427 frames => \@frames,
350 }; 428 };
351 } 429 }
352 430
353 for my $face ($o->{face} || (), @{$anim || []}) { 431 for my $face ($o->{face} || (), @{$anim || []}) {
354 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 432 next if $face =~ /^facings\s/;
355 433
356 my $info = $FACEINFO{$face} ||= {}; 434 my $info = $FACEINFO{$face} ||= { };
435 $info->{arc} = $o;
436
437 next if $face =~ /^blank.x11$|^empty.x11$/;
357 438
358 $info->{visibility} = $visibility if defined $visibility; 439 $info->{visibility} = $visibility if defined $visibility;
359 $info->{magicmap} = $magicmap if defined $magicmap; 440 $info->{magicmap} = $magicmap if defined $magicmap;
360 } 441 }
361 442
362 if (my $smooth = delete $o->{smoothface}) { 443 if (my $smooth = delete $o->{smoothface}) {
363 my %kv =split /\s+/, $smooth; 444 my %kv = split /\s+/, $smooth;
364 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 445 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
365 while (my ($face, $smooth) = each %kv) { 446 while (my ($face, $smooth) = each %kv) {
447 $FACEINFO{$smooth}{arc} = $o;
448
366 $FACEINFO{$face}{smooth} = $smooth; 449 $FACEINFO{$face}{smooth} = $smooth;
367 $FACEINFO{$face}{smoothlevel} = $level; 450 $FACEINFO{$face}{smoothlevel} = $level;
368 } 451 }
369 } 452 }
370 } 453 }
371 } 454 }
372 } 455 }
373 } 456 }
374 457
375 sub process_trs { 458 sub process_trs {
376 while (@trs) { 459 while (my $job = $c_trs->get) {
377 my ($dir, $file) = @{pop @trs}; 460 my ($dir, $file) = @$job;
378 my $path = "$dir/$file"; 461 my $path = "$dir/$file";
379 462
380 my $trs; 463 my $trs;
381 if (0 > aio_load $path, $trs) { 464 if (0 > aio_load $path, $trs) {
382 warn "$path: $!, skipping.\n"; 465 warn "$path: $!, skipping.\n";
… …
385 468
386 $TRS .= $trs; 469 $TRS .= $trs;
387 } 470 }
388 } 471 }
389 472
473 my %FILECACHE;
474
475 sub load_cached($;$) {
476 unless (exists $FILECACHE{$_[0]}) {
477 my $data;
478 if (0 < aio_load $_[0], $data) {
479 if ($_[1]) {
480 $data = eval { $_[1]->($data) };
481 warn "$_[0]: $@" if $@;
482 }
483 }
484
485 $FILECACHE{$_[0]} = $data;
486 }
487
488 $FILECACHE{$_[0]}
489 }
490
390 sub process_res { 491 sub process_res {
391 while (@res) { 492 while (my $job = $c_res->get) {
392 my ($dir, $file) = @{pop @res}; 493 my ($dir, $file, $type) = @$job;
393 494
394 my $data; 495 my $data;
395 aio_load "$dir/$file", $data; 496 aio_load "$dir/$file", $data;
396 497
397 my $copyright; 498 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
398 aio_load "$dir/copyright", $copyright; 499
500 next if $meta && !exists $meta->{$file};
501
502 $meta = {
503 %{ $meta->{"" } || {} },
504 %{ $meta->{$file} || {} },
505 };
506
507 if ($meta->{license} =~ s/^#//) {
508 $meta->{license} = ({
509 "pd" => "Public Domain",
510 "gpl" => "GNU General Public License, version 3.0 or any later",
511 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
512 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
513 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
514 })->{$meta->{license}}
515 || warn "$dir/$file: license tag '$meta->{license}' not found.";
516 }
399 517
400 $file =~ s/\.res$//; 518 $file =~ s/\.res$//;
401 $file =~ /\.([^.]+)$/ 519 $file =~ s/\.(ogg|wav|jpg|png)$//;
402 or next;
403
404 my $type = $1;
405 520
406 substr $dir, 0, 1 + length $PATH, ""; 521 substr $dir, 0, 1 + length $PATH, "";
407 522
408 $RESOURCE{"$dir/$file"} = { 523 $RESOURCE{"$dir/$file"} = {
409 type => $1, 524 type => (delete $meta->{type}) || $type,
410 copyright => $copyright,
411 data => $data, 525 data => $data,
412 chksum => Digest::MD5::md5 $data, 526 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";
… …
536 688
537 if (my $magicmap = $v->{magicmap}) { 689 if (my $magicmap = $v->{magicmap}) {
538 $magicmap =~ y/A-Z_\-/a-z/d; 690 $magicmap =~ y/A-Z_\-/a-z/d;
539 $v->{magicmap} = $COLOR{$magicmap}; 691 $v->{magicmap} = $COLOR{$magicmap};
540 } 692 }
541 }
542 693
694 delete $v->{arc};
695 }
696
697 print "writing facedata...\n" if $VERBOSE;
543 open my $fh, ">:perlio", "$DATADIR/facedata~" 698 open my $fh, ">:perlio", "$DATADIR/facedata~"
544 or die "$DATADIR/facedata~: $!"; 699 or die "$DATADIR/facedata~: $!";
545 700
546 print $fh freeze { 701 print $fh freeze {
547 version => 2, 702 version => 2,
548 faceinfo => \%FACEINFO, 703 faceinfo => \%FACEINFO,
549 animinfo => \%ANIMINFO, 704 animinfo => \%ANIMINFO,
550 resource => \%RESOURCE, 705 resource => \%RESOURCE,
551 }; 706 };
552 } 707 }
708
709 print "committing files...\n" if $VERBOSE;
553 710
554 for (qw(archetypes facedata treasures)) { 711 for (qw(archetypes facedata treasures)) {
555 chmod 0644, "$DATADIR/$_~"; 712 chmod 0644, "$DATADIR/$_~";
556 rename "$DATADIR/$_~", "$DATADIR/$_" 713 rename "$DATADIR/$_~", "$DATADIR/$_"
557 or die "$DATADIR/$_: $!"; 714 or die "$DATADIR/$_: $!";

Diff Legend

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