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.37 by root, Tue Jul 10 16:24:00 2007 UTC vs.
Revision 1.65 by root, Thu Dec 27 15:32:41 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 Deliantra;
22use Coro; 24use Coro;
23use Coro::AIO; 25use Coro::AIO;
26use Coro::Util;
24use POSIX (); 27use POSIX ();
25use Digest::MD5; 28use Carp;
29use Coro::Channel;
26use Coro::Storable; $Storable::canonical = 1; 30use Coro::Storable; $Storable::canonical = 1;
31
32$SIG{QUIT} = sub { Carp::cluck "QUIT" };
27 33
28sub usage { 34sub usage {
29 warn <<EOF; 35 warn <<EOF;
30Usage: cfutil [-v] [-q] [--force] [--cache] 36Usage: cfutil [-v] [-q] [--force] [--cache]
31 [--install-arch path] 37 [--install-arch path]
… …
92 if (!-f "$path/regions") { 98 if (!-f "$path/regions") {
93 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";
94 exit 1 unless $FORCE; 100 exit 1 unless $FORCE;
95 } 101 }
96 102
97 system $RSYNC, "-av", "$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"
98 and die "map installation failed.\n"; 107 and die "map installation failed.\n";
99 108
100 print "maps installed successfully.\n"; 109 print "maps installed successfully.\n";
101} 110}
102 111
… …
110 our $NFILE; 119 our $NFILE;
111 our $PATH; 120 our $PATH;
112 121
113 our $QUANTIZE = "+dither -colorspace RGB -colors 256"; 122 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
114 123
115 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;
116 129
117 sub commit_png($$$) { 130 sub commit_png($$$) {
118 my ($name, $data, $T) = @_; 131 my ($name, $data, $T) = @_;
119 132
120 $FACEINFO{$name}{"data$T"} = $data; 133 $FACEINFO{$name}{"data$T"} = $data;
121 } 134 }
122 135
123 sub process_png { 136 sub process_png {
124 while (@png) { 137 while (@c_png) {
125 my ($path, $delete) = @{pop @png}; 138 my ($path, $delete) = @{pop @c_png};
126 139
127 my $png; 140 my $png;
128 aio_lstat $path; 141 aio_lstat $path;
129 my ($size, $mtime) = (stat _)[7,9]; 142 my ($size, $mtime) = (stat _)[7,9];
130 143
… …
161 if ($w % $T || $h % $T) { 174 if ($w % $T || $h % $T) {
162 warn "$path: weird png size ($w $h), skipping.\n"; 175 warn "$path: weird png size ($w $h), skipping.\n";
163 next; 176 next;
164 } 177 }
165 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
166 unless ($path =~ /~$/) { 189 unless ($path =~ /~$/) {
167 # possibly enlarge 190 # possibly enlarge
168 if (0 > aio_stat "$stem.64x64.png") { 191 if (0 > aio_stat "$stem.64x64.png") {
169 my $other = "$stem.64x64.png~"; 192 my $other = "$stem.64x64.png~";
170 193
171 if (0 > aio_lstat $other or (-M _) > (-M $path)) { 194 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
172 my $wrap = 0; # for the time being
173 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
174 system "convert png:\Q$path\E -depth 8 rgba:-" 255 system "convert -depth 8 $SRC rgba:-"
175 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap" 256 . "| $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~" 257 . "| 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 $? ($!)"; 258 and die "convert/cfhq2xa pipeline error: status $? ($!)";
178 system $OPTIPNG, "-i0", "-q", "$other~"; 259 system $OPTIPNG, "-i0", "-q", "$other~";
179 die "$other~ has zero size, aborting." unless -s "$other~"; 260 die "$other~ has zero size, aborting." unless -s "$other~";
180 rename "$other~", $other; 261 rename "$other~", $other;
181 }; 262 };
182 } 263 }
183 264
184 push @png, [$other, !$CACHE]; 265 push @c_png, [$other, !$CACHE];
185 } 266 }
186 267
187 # possibly scale down 268 # possibly scale down
188 if (0 > aio_stat "$stem.32x32.png") { 269 if (0 > aio_stat "$stem.32x32.png") {
189 my $other = "$stem.32x32.png~"; 270 my $other = "$stem.32x32.png~";
… …
214 rename "$other~", $other; 295 rename "$other~", $other;
215 }; 296 };
216 } 297 }
217 298
218 #warn "scaled down $path to $other\n";#d# 299 #warn "scaled down $path to $other\n";#d#
219 push @png, [$other, !$CACHE]; 300 push @c_png, [$other, !$CACHE];
220 } 301 }
221 } 302 }
222 303
223 (my $face = $stem) =~ s/^.*\///; 304 (my $face = $stem) =~ s/^.*\///;
224 305
… …
285 aio_unlink $path if $delete; 366 aio_unlink $path if $delete;
286 } 367 }
287 } 368 }
288 369
289 sub process_arc { 370 sub process_arc {
290 while (@arc) { 371 while (my $job = $c_arc->get) {
291 my ($dir, $file) = @{pop @arc}; 372 my ($dir, $file) = @$job;
292 373
293 my $arc; 374 my $arc;
294 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 :/
295 376
296 my $arc = read_arch "$dir/$file"; 377 my $arc = read_arch "$dir/$file";
… …
348 facings => $facings, 429 facings => $facings,
349 frames => \@frames, 430 frames => \@frames,
350 }; 431 };
351 } 432 }
352 433
353 for my $face ($o->{face} || (), @{$anim || []}) { 434 for ($o->{face} || (), @{$anim || []}) {
354 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; 435 next if /^facings\s/;
355 436
437 my $face = $_;
438 $face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
439
356 my $info = $FACEINFO{$face} ||= {}; 440 my $info = $FACEINFO{$face} ||= { };
441 $info->{arc} = $o;
442
443 next if $face =~ /^blank.x11$|^empty.x11$/;
357 444
358 $info->{visibility} = $visibility if defined $visibility; 445 $info->{visibility} = $visibility if defined $visibility;
359 $info->{magicmap} = $magicmap if defined $magicmap; 446 $info->{magicmap} = $magicmap if defined $magicmap;
360 } 447 }
361 448
362 if (my $smooth = delete $o->{smoothface}) { 449 if (my $smooth = delete $o->{smoothface}) {
363 my %kv =split /\s+/, $smooth; 450 my %kv = split /\s+/, $smooth;
364 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support 451 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
365 while (my ($face, $smooth) = each %kv) { 452 while (my ($face, $smooth) = each %kv) {
453 $FACEINFO{$smooth}{arc} = $o;
454
366 $FACEINFO{$face}{smooth} = $smooth; 455 $FACEINFO{$face}{smooth} = $smooth;
367 $FACEINFO{$face}{smoothlevel} = $level; 456 $FACEINFO{$face}{smoothlevel} = $level;
368 } 457 }
369 } 458 }
370 } 459 }
371 } 460 }
372 } 461 }
373 } 462 }
374 463
375 sub process_trs { 464 sub process_trs {
376 while (@trs) { 465 while (my $job = $c_trs->get) {
377 my ($dir, $file) = @{pop @trs}; 466 my ($dir, $file) = @$job;
378 my $path = "$dir/$file"; 467 my $path = "$dir/$file";
379 468
380 my $trs; 469 my $trs;
381 if (0 > aio_load $path, $trs) { 470 if (0 > aio_load $path, $trs) {
382 warn "$path: $!, skipping.\n"; 471 warn "$path: $!, skipping.\n";
… …
385 474
386 $TRS .= $trs; 475 $TRS .= $trs;
387 } 476 }
388 } 477 }
389 478
479 my %FILECACHE;
480
481 sub load_cached($;$) {
482 unless (exists $FILECACHE{$_[0]}) {
483 my $data;
484 if (0 < aio_load $_[0], $data) {
485 if ($_[1]) {
486 $data = eval { $_[1]->($data) };
487 warn "$_[0]: $@" if $@;
488 }
489 }
490
491 $FILECACHE{$_[0]} = $data;
492 }
493
494 $FILECACHE{$_[0]}
495 }
496
390 sub process_res { 497 sub process_res {
391 while (@res) { 498 while (my $job = $c_res->get) {
392 my ($dir, $file) = @{pop @res}; 499 my ($dir, $file, $type) = @$job;
393 500
394 my $data; 501 my $data;
395 aio_load "$dir/$file", $data; 502 aio_load "$dir/$file", $data;
396 503
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 next;
513 }
514
515 $meta = {
516 %{ $meta->{"" } || {} },
517 %{ $meta->{$file} || {} },
518 };
519
520 if ($meta->{license} =~ s/^#//) {
521 $meta->{license} = ({
522 "pd" => "Public Domain",
523 "gpl" => "GNU General Public License, version 3.0 or any later",
524 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
525 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
526 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
527 })->{$meta->{license}}
528 || warn "$dir/$file: license tag '$meta->{license}' not found.";
529 }
530
397 $file =~ s/\.res$//; 531 $file =~ s/\.res$//;
398 $file =~ /\.([^.]+)$/ 532 $file =~ s/\.(ogg|wav|jpg|png)$//;
399 or next;
400
401 my $type = $1;
402 533
403 substr $dir, 0, 1 + length $PATH, ""; 534 substr $dir, 0, 1 + length $PATH, "";
404 535
536 if (my $filter = $meta->{cfutil_filter}) {
537 if ($filter eq "yaml2json") {
538 $data = JSON::XS::encode_json YAML::Syck::Load $data;
539 } elsif ($filter eq "json2json") {
540 $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
541 } else {
542 warn "$dir/$file: unknown filter $filter, skipping\n";
543 }
544 }
545
405 $RESOURCE{"$dir/$file"} = { 546 $RESOURCE{"$dir/$file"} = {
406 type => $1, 547 type => (exists $meta->{type} ? delete $meta->{type} : $type),
407 copyright => "", # TODO
408 data => $data, 548 data => $data,
409 chksum => Digest::MD5::md5 $data, 549 %$meta ? (meta => $meta) : (),
410 }; 550 };
411 } 551 }
412 } 552 }
413 553
414 sub find_files; 554 sub find_files;
… …
420 my ($dirs, $nondirs) = @_; 560 my ($dirs, $nondirs) = @_;
421 561
422 find_files "$path/$_" 562 find_files "$path/$_"
423 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 563 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
424 564
565 my $dir = $path;
566 substr $dir, 0, 1 + length $PATH, "";
567
425 for my $file (@$nondirs) { 568 for my $file (@$nondirs) {
569 if ($dir =~ /^music(?:\/|$)/) {
570 $c_res->put ([$path, $file, 3]) # FT_MUSIC
571 if $file =~ /\.(ogg)$/;
572
573 } elsif ($dir =~ /^sound(?:\/|$)/) {
574 $c_res->put ([$path, $file, 5]) # FT_SOUND
575 if $file =~ /\.(wav|ogg)$/;
576
577 } elsif ($dir =~ /^res(?:\/|$)/) {
578 if ($file =~ /\.(jpg|png)$/) {
579 $c_res->put ([$path, $file, 0]) # FT_FACE
580 } elsif ($file =~ /\.(res)$/) {
581 $c_res->put ([$path, $file, 7]) # FT_RSRC
582 } else {
583 $c_res->put ([$path, $file, undef]);
584 }
585
426 if ($file =~ /\.png$/) { 586 } elsif ($file =~ /\.png$/) {
427 push @png, ["$path/$file", 0]; 587 push @c_png, ["$path/$file", 0];
588
428 } elsif ($file =~ /\.trs$/) { 589 } elsif ($file =~ /\.trs$/) {
429 push @trs, [$path, $file]; 590 $c_trs->put ([$path, $file]);
591
430 } elsif ($file =~ /\.arc$/) { 592 } elsif ($file =~ /\.arc$/) {
431 push @arc, [$path, $file]; 593 $c_arc->put ([$path, $file]);
432 } elsif ($file =~ /\.(ogg|res)$/) { 594
433 push @res, [$path, $file];
434 } else { 595 } else {
435 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 596 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
436 } 597 }
437 } 598 }
438 }; 599 };
… …
456 if (!-d "$path/treasures") { 617 if (!-d "$path/treasures") {
457 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 618 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
458 exit 1 unless $FORCE; 619 exit 1 unless $FORCE;
459 } 620 }
460 621
622 print "scanning files...\n" if $VERBOSE;
623
461 find_files $path; 624 find_files $path;
625
626 my @a_arc = map +(async \&process_arc), 1..2;
627 my @a_res = map +(async \&process_res), 1..2;
628 my @a_trs = map +(async \&process_trs), 1..2;
629
462 IO::AIO::flush; 630 IO::AIO::flush;
463 631
464 $_->join for ( 632 $c_res->put (undef) for @a_res;
633 $c_arc->put (undef) for @a_arc;
634 $c_trs->put (undef) for @a_trs;
635
636 print "start file scan, arc, res processing...\n" if $VERBOSE;
637
638 $_->join for @a_arc; # need to parse all archetypes before png processing
639
640 print "end arc, start png processing...\n" if $VERBOSE;
641
465 # four png crunchers work fine for my 2x smp machine 642 # four png crunchers work fine for my 2x smp machine
466 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png), 643 my @a_png = map +(async \&process_png), 1..4;
467 (async \&process_trs), (async \&process_trs),
468 (async \&process_arc), (async \&process_arc),
469 (async \&process_res), (async \&process_res),
470 );
471 644
645 $_->join for (@a_trs, @a_res, @a_png);
646
647 print "scanning done, processing results...\n" if $VERBOSE;
472 { 648 {
473 # remove path prefix from editor_folder 649 # remove path prefix from editor_folder
474 substr $_->{editor_folder}, 0, 1 + length $path, "" 650 substr $_->{editor_folder}, 0, 1 + length $path, ""
475 for values %ARC; 651 for values %ARC;
476 652
653 print "resolving inheritance tree...\n" if $VERBOSE;
477 # resolve inherit 654 # resolve inherit
478 while () { 655 while () {
479 my $progress; 656 my $progress;
480 my $loop; 657 my $loop;
481 658
… …
507 } 684 }
508 685
509 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit 686 # remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
510 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; 687 @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC;
511 688
689 print "writing archetypes...\n" if $VERBOSE;
512 open my $fh, ">:utf8", "$DATADIR/archetypes~" 690 open my $fh, ">:utf8", "$DATADIR/archetypes~"
513 or die "$DATADIR/archetypes~: $!"; 691 or die "$DATADIR/archetypes~: $!";
514 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; 692 print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
515 } 693 }
516 694
517 { 695 {
696 print "writing treasures...\n" if $VERBOSE;
518 open my $fh, ">:utf8", "$DATADIR/treasures~" 697 open my $fh, ">:utf8", "$DATADIR/treasures~"
519 or die "$DATADIR/treasures~: $!"; 698 or die "$DATADIR/treasures~: $!";
520 print $fh $TRS; 699 print $fh $TRS;
521 } 700 }
522 701
523 { 702 {
703 print "processing facedata...\n" if $VERBOSE;
524 while (my ($k, $v) = each %FACEINFO) { 704 while (my ($k, $v) = each %FACEINFO) {
525 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 705 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
526 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n"; 706 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
527 707
528 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 708 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
529 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 709 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
530 710
531 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
532 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
533
534 if (my $magicmap = $v->{magicmap}) { 711 if (my $magicmap = $v->{magicmap}) {
535 $magicmap =~ y/A-Z_\-/a-z/d; 712 $magicmap =~ y/A-Z_\-/a-z/d;
536 $v->{magicmap} = $COLOR{$magicmap}; 713 $v->{magicmap} = $COLOR{$magicmap};
537 } 714 }
538 }
539 715
716 delete $v->{arc};
717 }
718
719 print "writing facedata...\n" if $VERBOSE;
540 open my $fh, ">:perlio", "$DATADIR/facedata~" 720 open my $fh, ">:perlio", "$DATADIR/facedata~"
541 or die "$DATADIR/facedata~: $!"; 721 or die "$DATADIR/facedata~: $!";
542 722
543 print $fh freeze { 723 print $fh freeze {
544 version => 2, 724 version => 2,
545 faceinfo => \%FACEINFO, 725 faceinfo => \%FACEINFO,
546 animinfo => \%ANIMINFO, 726 animinfo => \%ANIMINFO,
547 resource => \%RESOURCE, 727 resource => \%RESOURCE,
548 }; 728 };
549 } 729 }
730
731 print "committing files...\n" if $VERBOSE;
550 732
551 for (qw(archetypes facedata treasures)) { 733 for (qw(archetypes facedata treasures)) {
552 chmod 0644, "$DATADIR/$_~"; 734 chmod 0644, "$DATADIR/$_~";
553 rename "$DATADIR/$_~", "$DATADIR/$_" 735 rename "$DATADIR/$_~", "$DATADIR/$_"
554 or die "$DATADIR/$_: $!"; 736 or die "$DATADIR/$_: $!";

Diff Legend

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