| … | |
… | |
| 14 | my $PNGNQ = "@PNGNQ@"; |
14 | my $PNGNQ = "@PNGNQ@"; |
| 15 | |
15 | |
| 16 | use Getopt::Long; |
16 | use Getopt::Long; |
| 17 | use Coro::Event; |
17 | use Coro::Event; |
| 18 | use AnyEvent; |
18 | use AnyEvent; |
|
|
19 | use YAML::Syck (); |
|
|
20 | use JSON::XS (); |
| 19 | use IO::AIO (); |
21 | use IO::AIO (); |
| 20 | use File::Temp; |
22 | use File::Temp; |
| 21 | use Crossfire; |
23 | use Crossfire; |
| 22 | use Coro; |
24 | use Coro; |
| 23 | use Coro::AIO; |
25 | use Coro::AIO; |
| … | |
… | |
| 96 | if (!-f "$path/regions") { |
98 | if (!-f "$path/regions") { |
| 97 | 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"; |
| 98 | exit 1 unless $FORCE; |
100 | exit 1 unless $FORCE; |
| 99 | } |
101 | } |
| 100 | |
102 | |
| 101 | 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" |
| 102 | and die "map installation failed.\n"; |
107 | and die "map installation failed.\n"; |
| 103 | |
108 | |
| 104 | print "maps installed successfully.\n"; |
109 | print "maps installed successfully.\n"; |
| 105 | } |
110 | } |
| 106 | |
111 | |
| … | |
… | |
| 173 | |
178 | |
| 174 | (my $base = $stem) =~ s/^.*\///; |
179 | (my $base = $stem) =~ s/^.*\///; |
| 175 | |
180 | |
| 176 | my $fi = $FACEINFO{$base}; |
181 | my $fi = $FACEINFO{$base}; |
| 177 | unless ($fi) { |
182 | unless ($fi) { |
| 178 | warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
183 | #warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
| 179 | next; |
184 | #next; |
| 180 | } |
185 | } |
| 181 | |
186 | |
| 182 | my $arc = $FACEINFO{$base}{arc} |
187 | my $arc = $fi->{arc} || { }; |
| 183 | or die "FATAL: internal error <$base>, cannot continue"; |
|
|
| 184 | |
188 | |
| 185 | unless ($path =~ /~$/) { |
189 | unless ($path =~ /~$/) { |
| 186 | # possibly enlarge |
190 | # possibly enlarge |
| 187 | if (0 > aio_stat "$stem.64x64.png") { |
191 | if (0 > aio_stat "$stem.64x64.png") { |
| 188 | my $other = "$stem.64x64.png~"; |
192 | my $other = "$stem.64x64.png~"; |
| … | |
… | |
| 495 | my ($dir, $file, $type) = @$job; |
499 | my ($dir, $file, $type) = @$job; |
| 496 | |
500 | |
| 497 | my $data; |
501 | my $data; |
| 498 | aio_load "$dir/$file", $data; |
502 | aio_load "$dir/$file", $data; |
| 499 | |
503 | |
| 500 | 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) }; |
| 501 | |
505 | |
| 502 | next if $meta && !exists $meta->{$file}; |
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 | } |
| 503 | |
514 | |
| 504 | $meta = { |
515 | $meta = { |
| 505 | %{ $meta->{"" } || {} }, |
516 | %{ $meta->{"" } || {} }, |
| 506 | %{ $meta->{$file} || {} }, |
517 | %{ $meta->{$file} || {} }, |
| 507 | }; |
518 | }; |
| … | |
… | |
| 520 | $file =~ s/\.res$//; |
531 | $file =~ s/\.res$//; |
| 521 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
532 | $file =~ s/\.(ogg|wav|jpg|png)$//; |
| 522 | |
533 | |
| 523 | substr $dir, 0, 1 + length $PATH, ""; |
534 | substr $dir, 0, 1 + length $PATH, ""; |
| 524 | |
535 | |
|
|
536 | if (my $filter = $meta->{cfutil_filter}) { |
|
|
537 | if ($filter eq "yaml2json") { |
|
|
538 | $data = JSON::XS::encode_json YAML::Syck::Load $data; |
|
|
539 | } else { |
|
|
540 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
|
|
541 | } |
|
|
542 | } |
|
|
543 | |
| 525 | $RESOURCE{"$dir/$file"} = { |
544 | $RESOURCE{"$dir/$file"} = { |
| 526 | type => (delete $meta->{type}) || $type, |
545 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
| 527 | data => $data, |
546 | data => $data, |
| 528 | %$meta ? (meta => $meta) : (), |
547 | %$meta ? (meta => $meta) : (), |
| 529 | }; |
548 | }; |
| 530 | } |
549 | } |
| 531 | } |
550 | } |
| … | |
… | |
| 552 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
571 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
| 553 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
572 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
| 554 | if $file =~ /\.(wav|ogg)$/; |
573 | if $file =~ /\.(wav|ogg)$/; |
| 555 | |
574 | |
| 556 | } elsif ($dir =~ /^res(?:\/|$)/) { |
575 | } elsif ($dir =~ /^res(?:\/|$)/) { |
|
|
576 | if ($file =~ /\.(jpg|png)$/) { |
| 557 | $c_res->put ([$path, $file, 0]) # FT_FACE |
577 | $c_res->put ([$path, $file, 0]) # FT_FACE |
| 558 | if $file =~ /\.(jpg|png)$/; |
578 | } elsif ($file =~ /\.(res)$/) { |
| 559 | $c_res->put ([$path, $file, 7]) # FT_RSRC |
579 | $c_res->put ([$path, $file, 7]) # FT_RSRC |
| 560 | if $file =~ /\.(res)$/; |
580 | } else { |
|
|
581 | $c_res->put ([$path, $file, undef]); |
|
|
582 | } |
| 561 | |
583 | |
| 562 | } elsif ($file =~ /\.png$/) { |
584 | } elsif ($file =~ /\.png$/) { |
| 563 | push @c_png, ["$path/$file", 0]; |
585 | push @c_png, ["$path/$file", 0]; |
| 564 | |
586 | |
| 565 | } elsif ($file =~ /\.trs$/) { |
587 | } elsif ($file =~ /\.trs$/) { |
