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.48 by root, Tue Jul 31 02:24:43 2007 UTC vs.
Revision 1.63 by root, Mon Dec 17 08:03:22 2007 UTC

… …
14my $PNGNQ = "@PNGNQ@"; 14my $PNGNQ = "@PNGNQ@";
15 15
16use Getopt::Long; 16use Getopt::Long;
17use Coro::Event; 17use Coro::Event;
18use AnyEvent; 18use AnyEvent;
19use YAML::Syck ();
20use JSON::XS ();
19use IO::AIO (); 21use IO::AIO ();
20use File::Temp; 22use File::Temp;
21use Crossfire; 23use Crossfire;
22use Coro; 24use Coro;
23use Coro::AIO; 25use Coro::AIO;
26use Coro::Util;
24use POSIX (); 27use POSIX ();
25use Digest::MD5;
26use Carp; 28use Carp;
29use Coro::Channel;
27use Coro::Storable; $Storable::canonical = 1; 30use Coro::Storable; $Storable::canonical = 1;
28 31
29$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 32$SIG{QUIT} = sub { Carp::cluck "QUIT" };
30 33
31sub usage { 34sub usage {
… …
95 if (!-f "$path/regions") { 98 if (!-f "$path/regions") {
96 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 99 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
97 exit 1 unless $FORCE; 100 exit 1 unless $FORCE;
98 } 101 }
99 102
100 system $RSYNC, "-a", "--chmod=u=rwX,go=rX", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded" 103 system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
104 "$path/.", "$DATADIR/maps/.",
105 "--exclude", "CVS", "--exclude", "/world-precomposed",
106 "--delete", "--delete-excluded"
101 and die "map installation failed.\n"; 107 and die "map installation failed.\n";
102 108
103 print "maps installed successfully.\n"; 109 print "maps installed successfully.\n";
104} 110}
105 111
… …
113 our $NFILE; 119 our $NFILE;
114 our $PATH; 120 our $PATH;
115 121
116 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 122 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
117 123
118 our (@png, @trs, @arc, @res); # files we are interested in 124 our $c_arc = new Coro::Channel;
125 our $c_trs = new Coro::Channel;
126 our $c_res = new Coro::Channel;
127
128 our @c_png;
119 129
120 sub commit_png($$$) { 130 sub commit_png($$$) {
121 my ($name, $data, $T) = @_; 131 my ($name, $data, $T) = @_;
122 132
123 $FACEINFO{$name}{"data$T"} = $data; 133 $FACEINFO{$name}{"data$T"} = $data;
124 } 134 }
125 135
126 sub process_png { 136 sub process_png {
127 while (@png) { 137 while (@c_png) {
128 my ($path, $delete) = @{pop @png}; 138 my ($path, $delete) = @{pop @c_png};
129 139
130 my $png; 140 my $png;
131 aio_lstat $path; 141 aio_lstat $path;
132 my ($size, $mtime) = (stat _)[7,9]; 142 my ($size, $mtime) = (stat _)[7,9];
133 143
… …
164 if ($w % $T || $h % $T) { 174 if ($w % $T || $h % $T) {
165 warn "$path: weird png size ($w $h), skipping.\n"; 175 warn "$path: weird png size ($w $h), skipping.\n";
166 next; 176 next;
167 } 177 }
168 178
179 (my $base = $stem) =~ s/^.*\///;
180
181 my $fi = $FACEINFO{$base};
182 unless ($fi) {
183 #warn "$path: <$base> not referenced by any archetype, skipping.\n";
184 #next;
185 }
186
187 my $arc = $fi->{arc} || { };
188
169 unless ($path =~ /~$/) { 189 unless ($path =~ /~$/) {
170 # possibly enlarge 190 # possibly enlarge
171 if (0 > aio_stat "$stem.64x64.png") { 191 if (0 > aio_stat "$stem.64x64.png") {
172 my $other = "$stem.64x64.png~"; 192 my $other = "$stem.64x64.png~";
173 193
174 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 194 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
175 my $wrap = 0; # for the time being
176 fork_sub { 195 fork_sub {
196 my $CROP;
197 my $SRC = "png:\Q$path\E";
198
199 my $is_floor = $arc->{is_floor};
200 my $is_wall = 0;
201
202 my ($wall_pfx, $wall_dir, $wall_sfx);
203
204 if (
205 !$is_floor
206 && !$arc->{alive}
207 && $arc->{move_block} eq "all"
208 && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/
209 ) {
210 ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
211
212 unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
213 $is_wall = 1;
214 }
215 }
216
217 if ($is_wall || $is_floor) {
218 # add a 4px border and add other images around it
219 $CROP = "-shave 8x8 +repage";
220
221 $w += 8;
222 $h += 8;
223
224 $SRC = "-size ${w}x${h} xc:transparent";
225 $SRC .= " png:\Q$path\E -geometry +4+4 -composite";
226
227 # 8 surrounding images
228 for (
229 # x y b r0 r1
230 [-1, -1, 0, 6],
231 [ 0, -1, 1, 10, 14],
232 [+1, -1, 0, 12],
233
234 [-1, 0, 8, 5, 7],
235 #
236 [+1, 0, 2, 5, 13],
237
238 [-1, +1, 0, 3],
239 [ 0, +1, 4, 10, 11],
240 [+1, +1, 0, 9],
241 ) {
242 my ($x, $y, $d, $r0, $r1) = @$_;
243
244 my $tile = $is_floor ? $path
245 : $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
246 : die;
247
248 $SRC .= sprintf " png:%s -geometry %+d%+d -composite",
249 "\Q$tile",
250 $x * ($w - 8) + 4,
251 $y * ($h - 8) + 4;
252 }
253 }
254
177 system "convert png:\Q$path\E -depth 8 rgba:-" 255 system "convert -depth 8 $SRC rgba:-"
178 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 256 . "| $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~" 257 . "| 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 $? ($!)"; 258 and die "convert/cfhq2xa pipeline error: status $? ($!)";
181 system $OPTIPNG, "-i0", "-q", "$other~"; 259 system $OPTIPNG, "-i0", "-q", "$other~";
182 die "$other~ has zero size, aborting." unless -s "$other~"; 260 die "$other~ has zero size, aborting." unless -s "$other~";
183 rename "$other~", $other; 261 rename "$other~", $other;
184 }; 262 };
185 } 263 }
186 264
187 push @png, [$other, !$CACHE]; 265 push @c_png, [$other, !$CACHE];
188 } 266 }
189 267
190 # possibly scale down 268 # possibly scale down
191 if (0 > aio_stat "$stem.32x32.png") { 269 if (0 > aio_stat "$stem.32x32.png") {
192 my $other = "$stem.32x32.png~"; 270 my $other = "$stem.32x32.png~";
… …
217 rename "$other~", $other; 295 rename "$other~", $other;
218 }; 296 };
219 } 297 }
220 298
221 #warn "scaled down $path to $other\n";#d# 299 #warn "scaled down $path to $other\n";#d#
222 push @png, [$other, !$CACHE]; 300 push @c_png, [$other, !$CACHE];
223 } 301 }
224 } 302 }
225 303
226 (my $face = $stem) =~ s/^.*\///; 304 (my $face = $stem) =~ s/^.*\///;
227 305
… …
288 aio_unlink $path if $delete; 366 aio_unlink $path if $delete;
289 } 367 }
290 } 368 }
291 369
292 sub process_arc { 370 sub process_arc {
293 while (@arc) { 371 while (my $job = $c_arc->get) {
294 my ($dir, $file) = @{pop @arc}; 372 my ($dir, $file) = @$job;
295 373
296 my $arc; 374 my $arc;
297 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 375 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
298 376
299 my $arc = read_arch "$dir/$file"; 377 my $arc = read_arch "$dir/$file";
… …
351 facings => $facings, 429 facings => $facings,
352 frames => \@frames, 430 frames => \@frames,
353 }; 431 };
354 } 432 }
355 433
356 for my $face ($o->{face} || (), @{$anim || []}) { 434 for ($o->{face} || (), @{$anim || []}) {
357 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 435 next if /^facings\s/;
358 436
437 my $face = $_;
438 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
439
359 my $info = $FACEINFO{$face} ||= {}; 440 my $info = $FACEINFO{$face} ||= { };
441 $info->{arc} = $o;
442
443 next if $face =~ /^blank.x11$|^empty.x11$/;
360 444
361 $info->{visibility} = $visibility if defined $visibility; 445 $info->{visibility} = $visibility if defined $visibility;
362 $info->{magicmap} = $magicmap if defined $magicmap; 446 $info->{magicmap} = $magicmap if defined $magicmap;
363 } 447 }
364 448
365 if (my $smooth = delete $o->{smoothface}) { 449 if (my $smooth = delete $o->{smoothface}) {
366 my %kv =split /\s+/, $smooth; 450 my %kv = split /\s+/, $smooth;
367 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 451 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
368 while (my ($face, $smooth) = each %kv) { 452 while (my ($face, $smooth) = each %kv) {
453 $FACEINFO{$smooth}{arc} = $o;
454
369 $FACEINFO{$face}{smooth} = $smooth; 455 $FACEINFO{$face}{smooth} = $smooth;
370 $FACEINFO{$face}{smoothlevel} = $level; 456 $FACEINFO{$face}{smoothlevel} = $level;
371 } 457 }
372 } 458 }
373 } 459 }
374 } 460 }
375 } 461 }
376 } 462 }
377 463
378 sub process_trs { 464 sub process_trs {
379 while (@trs) { 465 while (my $job = $c_trs->get) {
380 my ($dir, $file) = @{pop @trs}; 466 my ($dir, $file) = @$job;
381 my $path = "$dir/$file"; 467 my $path = "$dir/$file";
382 468
383 my $trs; 469 my $trs;
384 if (0 > aio_load $path, $trs) { 470 if (0 > aio_load $path, $trs) {
385 warn "$path: $!, skipping.\n"; 471 warn "$path: $!, skipping.\n";
… …
394 480
395 sub load_cached($;$) { 481 sub load_cached($;$) {
396 unless (exists $FILECACHE{$_[0]}) { 482 unless (exists $FILECACHE{$_[0]}) {
397 my $data; 483 my $data;
398 if (0 < aio_load $_[0], $data) { 484 if (0 < aio_load $_[0], $data) {
485 if ($_[1]) {
399 $data = $_[1]->($data) 486 $data = eval { $_[1]->($data) };
400 if $_[1]; 487 warn "$_[0]: $@" if $@;
488 }
401 } 489 }
402 490
403 $FILECACHE{$_[0]} = $data; 491 $FILECACHE{$_[0]} = $data;
404 } 492 }
405 493
406 $FILECACHE{$_[0]} 494 $FILECACHE{$_[0]}
407 } 495 }
408 496
409 sub process_res { 497 sub process_res {
410 while (@res) { 498 while (my $job = $c_res->get) {
411 my ($dir, $file, $type) = @{pop @res}; 499 my ($dir, $file, $type) = @$job;
412 500
413 my $data; 501 my $data;
414 aio_load "$dir/$file", $data; 502 aio_load "$dir/$file", $data;
415 503
416 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift }; 504 my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
505
506 utf8::decode $dir;
507 utf8::decode $file;
508
509 # a meta file for resources is now mandatory
510 unless (exists $meta->{$file}) {
511 warn "skipping $dir/$file\n" if $VERBOSE >= 3;
512 }
417 513
418 $meta = { 514 $meta = {
419 %{ $meta->{"" } || {} }, 515 %{ $meta->{"" } || {} },
420 %{ $meta->{$file} || {} }, 516 %{ $meta->{$file} || {} },
421 }; 517 };
422 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 }
529
423 $file =~ s/\.res$//; 530 $file =~ s/\.res$//;
424 $file =~ s/\.(ogg|wav|jpg|png)$//; 531 $file =~ s/\.(ogg|wav|jpg|png)$//;
425 532
426 substr $dir, 0, 1 + length $PATH, ""; 533 substr $dir, 0, 1 + length $PATH, "";
427 534
535 if (my $filter = $meta->{cfutil_filter}) {
536 if ($filter eq "yaml2json") {
537 $data = JSON::XS::encode_json YAML::Syck::Load $data;
538 } else {
539 warn "$dir/$file: unknown filter $filter, skipping\n";
540 }
541 }
542
428 $RESOURCE{"$dir/$file"} = { 543 $RESOURCE{"$dir/$file"} = {
429 type => (delete $meta->{type}) || $type, 544 type => (exists $meta->{type} ? delete $meta->{type} : $type),
430 data => $data, 545 data => $data,
431 chksum => (Digest::MD5::md5 $data),
432 %$meta ? (meta => $meta) : (), 546 %$meta ? (meta => $meta) : (),
433 }; 547 };
434 } 548 }
435 } 549 }
436 550
… …
448 my $dir = $path; 562 my $dir = $path;
449 substr $dir, 0, 1 + length $PATH, ""; 563 substr $dir, 0, 1 + length $PATH, "";
450 564
451 for my $file (@$nondirs) { 565 for my $file (@$nondirs) {
452 if ($dir =~ /^music(?:\/|$)/) { 566 if ($dir =~ /^music(?:\/|$)/) {
453 push @res, [$path, $file, 3] # FT_MUSIC 567 $c_res->put ([$path, $file, 3]) # FT_MUSIC
454 if $file =~ /\.(ogg)$/; 568 if $file =~ /\.(ogg)$/;
455 569
456 } elsif ($dir =~ /^sound(?:\/|$)/) { 570 } elsif ($dir =~ /^sound(?:\/|$)/) {
457 push @res, [$path, $file, 5] # FT_SOUND 571 $c_res->put ([$path, $file, 5]) # FT_SOUND
458 if $file =~ /\.(wav|ogg)$/; 572 if $file =~ /\.(wav|ogg)$/;
459 573
460 } elsif ($dir =~ /^res(?:\/|$)/) { 574 } elsif ($dir =~ /^res(?:\/|$)/) {
461 push @res, [$path, $file, 0] # FT_FACE
462 if $file =~ /\.(jpg|png)$/; 575 if ($file =~ /\.(jpg|png)$/) {
463 push @res, [$path, $file, 7] # FT_RSRC 576 $c_res->put ([$path, $file, 0]) # FT_FACE
464 if $file =~ /\.(res)$/; 577 } elsif ($file =~ /\.(res)$/) {
578 $c_res->put ([$path, $file, 7]) # FT_RSRC
579 } else {
580 $c_res->put ([$path, $file, undef]);
581 }
465 582
466 } elsif ($file =~ /\.png$/) { 583 } elsif ($file =~ /\.png$/) {
467 push @png, ["$path/$file", 0]; 584 push @c_png, ["$path/$file", 0];
468 585
469 } elsif ($file =~ /\.trs$/) { 586 } elsif ($file =~ /\.trs$/) {
470 push @trs, [$path, $file]; 587 $c_trs->put ([$path, $file]);
471 588
472 } elsif ($file =~ /\.arc$/) { 589 } elsif ($file =~ /\.arc$/) {
473 push @arc, [$path, $file]; 590 $c_arc->put ([$path, $file]);
474 591
475 } else { 592 } else {
476 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 593 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
477 } 594 }
478 } 595 }
… …
497 if (!-d "$path/treasures") { 614 if (!-d "$path/treasures") {
498 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 615 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
499 exit 1 unless $FORCE; 616 exit 1 unless $FORCE;
500 } 617 }
501 618
619 print "scanning files...\n" if $VERBOSE;
620
502 find_files $path; 621 find_files $path;
622
623 my @a_arc = map +(async \&process_arc), 1..2;
624 my @a_res = map +(async \&process_res), 1..2;
625 my @a_trs = map +(async \&process_trs), 1..2;
626
503 IO::AIO::flush; 627 IO::AIO::flush;
504 628
505 $_->join for ( 629 $c_res->put (undef) for @a_res;
630 $c_arc->put (undef) for @a_arc;
631 $c_trs->put (undef) for @a_trs;
632
633 print "start file scan, arc, res processing...\n" if $VERBOSE;
634
635 $_->join for @a_arc; # need to parse all archetypes before png processing
636
637 print "end arc, start png processing...\n" if $VERBOSE;
638
506 # four png crunchers work fine for my 2x smp machine 639 # four png crunchers work fine for my 2x smp machine
507 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 640 my @a_png = map +(async \&process_png), 1..4;
508 (async \&process_trs), (async \&process_trs),
509 (async \&process_arc), (async \&process_arc),
510 (async \&process_res), (async \&process_res),
511 );
512 641
642 $_->join for (@a_trs, @a_res, @a_png);
643
644 print "scanning done, processing results...\n" if $VERBOSE;
513 { 645 {
514 # remove path prefix from editor_folder 646 # remove path prefix from editor_folder
515 substr $_->{editor_folder}, 0, 1 + length $path, "" 647 substr $_->{editor_folder}, 0, 1 + length $path, ""
516 for values %ARC; 648 for values %ARC;
517 649
650 print "resolving inheritance tree...\n" if $VERBOSE;
518 # resolve inherit 651 # resolve inherit
519 while () { 652 while () {
520 my $progress; 653 my $progress;
521 my $loop; 654 my $loop;
522 655
… …
548 } 681 }
549 682
550 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 683 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
551 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 684 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
552 685
686 print "writing archetypes...\n" if $VERBOSE;
553 open my $fh, ">:utf8", "$DATADIR/archetypes~" 687 open my $fh, ">:utf8", "$DATADIR/archetypes~"
554 or die "$DATADIR/archetypes~: $!"; 688 or die "$DATADIR/archetypes~: $!";
555 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 689 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
556 } 690 }
557 691
558 { 692 {
693 print "writing treasures...\n" if $VERBOSE;
559 open my $fh, ">:utf8", "$DATADIR/treasures~" 694 open my $fh, ">:utf8", "$DATADIR/treasures~"
560 or die "$DATADIR/treasures~: $!"; 695 or die "$DATADIR/treasures~: $!";
561 print $fh $TRS; 696 print $fh $TRS;
562 } 697 }
563 698
564 { 699 {
700 print "processing facedata...\n" if $VERBOSE;
565 while (my ($k, $v) = each %FACEINFO) { 701 while (my ($k, $v) = each %FACEINFO) {
566 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 702 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
567 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 703 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
568 704
569 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 705 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
570 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 706 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
571 707
572 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
573 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
574
575 if (my $magicmap = $v->{magicmap}) { 708 if (my $magicmap = $v->{magicmap}) {
576 $magicmap =~ y/A-Z_\-/a-z/d; 709 $magicmap =~ y/A-Z_\-/a-z/d;
577 $v->{magicmap} = $COLOR{$magicmap}; 710 $v->{magicmap} = $COLOR{$magicmap};
578 } 711 }
579 }
580 712
713 delete $v->{arc};
714 }
715
716 print "writing facedata...\n" if $VERBOSE;
581 open my $fh, ">:perlio", "$DATADIR/facedata~" 717 open my $fh, ">:perlio", "$DATADIR/facedata~"
582 or die "$DATADIR/facedata~: $!"; 718 or die "$DATADIR/facedata~: $!";
583 719
584 print $fh freeze { 720 print $fh freeze {
585 version => 2, 721 version => 2,
586 faceinfo => \%FACEINFO, 722 faceinfo => \%FACEINFO,
587 animinfo => \%ANIMINFO, 723 animinfo => \%ANIMINFO,
588 resource => \%RESOURCE, 724 resource => \%RESOURCE,
589 }; 725 };
590 } 726 }
727
728 print "committing files...\n" if $VERBOSE;
591 729
592 for (qw(archetypes facedata treasures)) { 730 for (qw(archetypes facedata treasures)) {
593 chmod 0644, "$DATADIR/$_~"; 731 chmod 0644, "$DATADIR/$_~";
594 rename "$DATADIR/$_~", "$DATADIR/$_" 732 rename "$DATADIR/$_~", "$DATADIR/$_"
595 or die "$DATADIR/$_: $!"; 733 or die "$DATADIR/$_: $!";

Diff Legend

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