… | |
… | |
12 | my $OPTIPNG = "@OPTIPNG@"; |
12 | my $OPTIPNG = "@OPTIPNG@"; |
13 | my $RSYNC = "@RSYNC@"; |
13 | my $RSYNC = "@RSYNC@"; |
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::EV; |
18 | use AnyEvent; |
18 | use AnyEvent; |
|
|
19 | use YAML (); |
|
|
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 Deliantra; |
22 | use Coro; |
24 | use Coro; |
23 | use Coro::AIO; |
25 | use Coro::AIO; |
24 | use Coro::Util; |
26 | use Coro::Util; |
25 | use POSIX (); |
27 | use POSIX (); |
26 | use Carp; |
28 | use Carp; |
… | |
… | |
65 | tan => 12, |
67 | tan => 12, |
66 | ); |
68 | ); |
67 | |
69 | |
68 | END { system "rm", "-rf", $TMPDIR } |
70 | END { system "rm", "-rf", $TMPDIR } |
69 | |
71 | |
70 | Event->signal (signal => "INT", cb => sub { exit 1 }); |
72 | my $s_INT = EV::signal INT => sub { exit 1 }; |
71 | Event->signal (signal => "TERM", cb => sub { exit 1 }); |
73 | my $s_TERM = EV::signal TERM => sub { exit 1 }; |
72 | |
74 | |
73 | mkdir $TMPDIR, 0700 |
75 | mkdir $TMPDIR, 0700 |
74 | or die "$TMPDIR: $!"; |
76 | or die "$TMPDIR: $!"; |
75 | |
77 | |
76 | sub fork_sub(&) { |
78 | sub fork_sub(&) { |
… | |
… | |
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::Load $data; |
|
|
539 | } elsif ($filter eq "json2json") { |
|
|
540 | $data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data); |
|
|
541 | } elsif ($filter eq "perl2json") { |
|
|
542 | $data = eval $data; die if $@; |
|
|
543 | $data = JSON::XS::encode_json $data; |
|
|
544 | } else { |
|
|
545 | warn "$dir/$file: unknown filter $filter, skipping\n"; |
|
|
546 | } |
|
|
547 | } |
|
|
548 | |
525 | $RESOURCE{"$dir/$file"} = { |
549 | $RESOURCE{"$dir/$file"} = { |
526 | type => (delete $meta->{type}) || $type, |
550 | type => (exists $meta->{type} ? delete $meta->{type} : $type), |
527 | data => $data, |
551 | data => $data, |
528 | %$meta ? (meta => $meta) : (), |
552 | %$meta ? (meta => $meta) : (), |
529 | }; |
553 | }; |
530 | } |
554 | } |
531 | } |
555 | } |
… | |
… | |
552 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
576 | } elsif ($dir =~ /^sound(?:\/|$)/) { |
553 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
577 | $c_res->put ([$path, $file, 5]) # FT_SOUND |
554 | if $file =~ /\.(wav|ogg)$/; |
578 | if $file =~ /\.(wav|ogg)$/; |
555 | |
579 | |
556 | } elsif ($dir =~ /^res(?:\/|$)/) { |
580 | } elsif ($dir =~ /^res(?:\/|$)/) { |
|
|
581 | if ($file =~ /\.(jpg|png)$/) { |
557 | $c_res->put ([$path, $file, 0]) # FT_FACE |
582 | $c_res->put ([$path, $file, 0]) # FT_FACE |
558 | if $file =~ /\.(jpg|png)$/; |
583 | } elsif ($file =~ /\.(res)$/) { |
559 | $c_res->put ([$path, $file, 7]) # FT_RSRC |
584 | $c_res->put ([$path, $file, 6]) # FT_RSRC |
560 | if $file =~ /\.(res)$/; |
585 | } else { |
|
|
586 | $c_res->put ([$path, $file, undef]); |
|
|
587 | } |
561 | |
588 | |
562 | } elsif ($file =~ /\.png$/) { |
589 | } elsif ($file =~ /\.png$/) { |
563 | push @c_png, ["$path/$file", 0]; |
590 | push @c_png, ["$path/$file", 0]; |
564 | |
591 | |
565 | } elsif ($file =~ /\.trs$/) { |
592 | } elsif ($file =~ /\.trs$/) { |
… | |
… | |
613 | |
640 | |
614 | $_->join for @a_arc; # need to parse all archetypes before png processing |
641 | $_->join for @a_arc; # need to parse all archetypes before png processing |
615 | |
642 | |
616 | print "end arc, start png processing...\n" if $VERBOSE; |
643 | print "end arc, start png processing...\n" if $VERBOSE; |
617 | |
644 | |
618 | # four png crunchers work fine for my 2x smp machine |
645 | # eight png crunchers work fine for my 4x smp machine |
619 | my @a_png = map +(async \&process_png), 1..4; |
646 | my @a_png = map +(async \&process_png), 1..8; |
620 | |
647 | |
621 | $_->join for (@a_trs, @a_res, @a_png); |
648 | $_->join for (@a_trs, @a_res, @a_png); |
622 | |
649 | |
623 | print "scanning done, processing results...\n" if $VERBOSE; |
650 | print "scanning done, processing results...\n" if $VERBOSE; |
624 | { |
651 | { |
… | |
… | |
663 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
690 | @ARC = grep $_->{_name} !~ /^(?:type|class)_/, @ARC; |
664 | |
691 | |
665 | print "writing archetypes...\n" if $VERBOSE; |
692 | print "writing archetypes...\n" if $VERBOSE; |
666 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
693 | open my $fh, ">:utf8", "$DATADIR/archetypes~" |
667 | or die "$DATADIR/archetypes~: $!"; |
694 | or die "$DATADIR/archetypes~: $!"; |
668 | print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
695 | print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC]; |
669 | } |
696 | } |
670 | |
697 | |
671 | { |
698 | { |
672 | print "writing treasures...\n" if $VERBOSE; |
699 | print "writing treasures...\n" if $VERBOSE; |
673 | open my $fh, ">:utf8", "$DATADIR/treasures~" |
700 | open my $fh, ">:utf8", "$DATADIR/treasures~" |