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.2 by root, Wed Mar 7 01:23:37 2007 UTC vs.
Revision 1.3 by root, Wed Mar 7 18:04:44 2007 UTC

… …
7my $datarootdir = "@datarootdir@"; 7my $datarootdir = "@datarootdir@";
8my $DATADIR = "@datadir@/@PACKAGE@"; 8my $DATADIR = "@datadir@/@PACKAGE@";
9 9
10my $CONVERT = "@CONVERT@"; 10my $CONVERT = "@CONVERT@";
11my $IDENTIFY = "@IDENTIFY@"; 11my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@";
12my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
13 14
14use Getopt::Long; 15use Getopt::Long;
16use Coro::Event;
17use AnyEvent;
15use IO::AIO; 18use IO::AIO ();
16use File::Temp; 19use File::Temp;
17use Crossfire; 20use Crossfire;
21use Coro;
22use Coro::AIO;
23use POSIX ();
18 24
19sub usage { 25sub usage {
20 warn <<EOF; 26 warn <<EOF;
21Usage: cfutil [-v] [-q] [--force] 27Usage: cfutil [-v] [-q] [--force] [--cache]
22 [--install-arch path] 28 [--install-arch path]
23 [--install-maps maps] 29 [--install-maps maps]
24 [--print-statedir] 30 [--print-statedir]
25 [--print-confdir] 31 [--print-confdir]
26 [--print-datadir] 32 [--print-datadir]
… …
29EOF 35EOF
30 exit 1; 36 exit 1;
31} 37}
32 38
33my $VERBOSE = 1; 39my $VERBOSE = 1;
40my $CACHE = 0;
34my $FORCE; 41my $FORCE;
35my $TMPDIR = "/tmp/cfutil$$~"; 42my $TMPDIR = "/tmp/cfutil$$~";
43my $TMPFILE = "aaaa0";
36 44
37END { system "rm", "-rf", $TMPDIR } 45END { system "rm", "-rf", $TMPDIR }
46
47Event->signal (signal => "INT", cb => sub { exit 1 });
48Event->signal (signal => "TERM", cb => sub { exit 1 });
38 49
39mkdir $TMPDIR, 0700 50mkdir $TMPDIR, 0700
40 or die "$TMPDIR: $!"; 51 or die "$TMPDIR: $!";
52
53sub fork_sub(&) {
54 my ($cb) = @_;
55
56 if (my $pid = fork) {
57 my $current = $Coro::current;
58 my $w = AnyEvent->child (pid => $pid, cb => sub { $current->ready });
59 Coro::schedule;
60 } else {
61 eval { $cb->() };
62 POSIX::_exit 0 unless $@;
63 warn $@;
64 POSIX::_exit 1;
65 }
66}
41 67
42sub inst_maps($) { 68sub inst_maps($) {
43 my (undef, $path) = @_; 69 my (undef, $path) = @_;
44 70
45 print "installing '$path' to '$DATADIR/maps'\n\n"; 71 print "installing '$path' to '$DATADIR/maps'\n\n";
… …
51 77
52 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"; 78 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded";
53} 79}
54 80
55{ 81{
56 my @PNG; 82 our @PNG;
57 my @ARC; 83 our @ARC;
84 our $NFILE;
85
86 our (@png, @trs, @arc); # files we are interested in
58 87
59 sub commit_png { 88 sub commit_png {
60 my ($name, $data) = @_; 89 my ($name, $data) = @_;
61 #warn "$name: commited\n"; 90 #warn "$name: commited\n";
62 } 91 }
63 92
64 sub add_png($) { 93 sub process_png {
94 while (@png) {
95 my $path = pop @png;
96
97 my $png;
98 aio_lstat $path;
99 my ($size, $mtime) = (stat _)[7,9];
100
101 if (0 > aio_load $path, $png) {
102 warn "$path: $!, skipping.\n";
103 return;
104 }
105
106 # quickly extratc width and height of the (necessarily PNG) image
107 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
108 warn "$path: not a recongized png file, skipping.\n";
109 return;
110 }
111
112 my ($w, $h) = unpack "NN", $1;
113
114 (my $face = $path) =~ s/^.*\///;
115 my $T = 32;
116
117 unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
118 warn "$path: weird filename, skipping.\n";
119 return;
120 }
121
122 if ($w < $T || $h < $T) {
123 warn "$path: too small ($w $h), skipping.\n";
124 return;
125 }
126
127 if ($w % $T || $h % $T) {
128 warn "$path: weird png size ($w $h), skipping.\n";
129 return;
130 }
131
132 if (($w > $T || $h > $T) && $face !~ /_S\./) {
133 # split
134 my @tile;
135 for my $x (0 .. (int $w / $T) - 1) {
136 for my $y (0 .. (int $h / $T) - 1) {
137 my $file = "$path+$x+$y~";
138 aio_lstat $file;
139 push @tile, [$x, $y, $file, (stat _)[9]];
140 }
141 }
142
143 my $mtime = (lstat $path)[9];
144 my @todo = grep { $_->[3] <= $mtime } @tile;
145 if (@todo) {
146 fork_sub {
147 open my $convert, "|-", $CONVERT,
148 "png:-",
149 (map {
150 (
151 "(",
152 "+clone",
153 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
154 -write => "png:$_->[2]~",
155 "+delete",
156 ")",
157 )
158 } @todo),
159 "null:";
160
161 binmode $convert;
162 print $convert $png;
163 close $convert;
164
165 # pass 2, optimise, and rename
166 for (@todo) {
167 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
168 rename "$_->[2]~", $_->[2];
169 }
170 };
171 }
172
173 for (@tile) {
174 my ($x, $y, $file) = @$_;
175 my $tile;
176
177 if (0 > aio_load $file, $tile) {
178 die "$path: unable to read tile +$x+$y, aborting.\n";
179 }
180 IO::AIO::aio_unlink $file unless $CACHE;
181 commit_png $x|$y ? "$face+$x+$y" : $face, $tile;
182 }
183 } else {
184 # use as-is (either small, use smooth)
185 commit_png $face, $png;
186 }
187 }
188 }
189
190 sub process_arc {
191 while (@arc) {
192 my ($dir, $file) = @{pop @arc};
193
194 my $arc;
195 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
196 my $arc = read_arch "$dir/$file";
197 }
198 }
199
200 sub process_trs {
201 while (@trs) {
202 my ($dir, $file) = @{pop @trs};
203 }
204 }
205
206 sub find_files;
207 sub find_files {
65 my ($path) = @_; 208 my ($path) = @_;
66 209
67 my $png;
68 aio_lstat $path, sub {
69 my ($size, $mtime) = (stat _)[7,9];
70
71 aio_load $path, $png, sub {
72 if ($_[0] < 0) {
73 warn "$path: $!, skipping.\n";
74 return;
75 }
76
77 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
78 warn "$path: not a recongized png file, skipping.\n";
79 return;
80 }
81
82 my ($w, $h) = unpack "NN", $1;
83
84 (my $face = $path) =~ s/^.*\///;
85 my $T = 32;
86
87 unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
88 warn "$path: weird filename, skipping.\n";
89 return;
90 }
91
92 if ($w < $T || $h < $T) {
93 warn "$path: too small ($w $h), skipping.\n";
94 return;
95 }
96
97 if ($w % $T || $h % $T) {
98 warn "$path: weird png size ($w $h), skipping.\n";
99 return;
100 }
101
102 if ($w > $T || $h > $T) {
103 # split
104 } else {
105 # use as-is
106 commit_png $face, $png;
107 }
108
109 #warn "$path: $w, $h\n";
110 };
111 };
112
113 IO::AIO::poll; # reduce file-handle pressure
114 }
115
116 sub add_arc($$) {
117 my ($dir, $file) = @_;
118
119 my $arc;
120 aio_load "$dir/$file", $arc, sub { # simply pre-cache, as read_arch wants a file :/
121 my $arc = read_arch "$dir/$file";
122 };
123 }
124
125 sub add_trs($$) {
126 my ($dir, $file) = @_;
127 }
128
129 sub collect_arch;
130 sub collect_arch {
131 my ($path) = @_;
132
133 aioreq_pri 4; 210 IO::AIO::aioreq_pri 4;
134 aio_scandir $path, 4, sub { 211 IO::AIO::aio_scandir $path, 4, sub {
135 my ($dirs, $nondirs) = @_; 212 my ($dirs, $nondirs) = @_;
136 213
137 collect_arch "$path/$_" 214 find_files "$path/$_"
138 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 215 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
139 216
140 for my $file (@$nondirs) { 217 for my $file (@$nondirs) {
141 if ($file =~ /\.png$/) { 218 if ($file =~ /\.png$/) {
142 add_png "$path/$file"; 219 push @png, "$path/$file";
143 } elsif ($file =~ /\.trs$/) { 220 } elsif ($file =~ /\.trs$/) {
144 add_trs $path, $file; 221 push @trs, [$path, $file];
145 } elsif ($file =~ /\.arc$/) { 222 } elsif ($file =~ /\.arc$/) {
146 add_arc $path, $file; 223 push @arc, [$path, $file];
147 } else { 224 } else {
148 warn "ignoring $path/$file\n" if $VERBOSE >= 2; 225 warn "ignoring $path/$file\n" if $VERBOSE >= 2;
149 } 226 }
150 } 227 }
151 }; 228 };
… …
159 if (!-d "$path/treasures") { 236 if (!-d "$path/treasures") {
160 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 237 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
161 exit 1 unless $FORCE; 238 exit 1 unless $FORCE;
162 } 239 }
163 240
164 collect_arch $path; 241 find_files $path;
165 IO::AIO::flush; 242 IO::AIO::flush;
243
244 $_->join for (
245 (async \&process_png), (async \&process_png),
246 (async \&process_trs), (async \&process_trs),
247 (async \&process_arc), (async \&process_arc),
248 );
166 249
167 die "--install-arch not yet implemented\n"; 250 die "--install-arch not yet implemented\n";
168 } 251 }
169} 252}
170 253
171Getopt::Long::Configure ("bundling", "no_ignore_case"); 254Getopt::Long::Configure ("bundling", "no_ignore_case");
172GetOptions ( 255GetOptions (
173 "verbose|v:+" => \$VERBOSE, 256 "verbose|v:+" => \$VERBOSE,
257 "cache" => \$CACHE,
174 "quiet|q" => sub { $VERBOSE = 0 }, 258 "quiet|q" => sub { $VERBOSE = 0 },
175 "force" => sub { $FORCE = 1 }, 259 "force" => sub { $FORCE = 1 },
176 "install-arch=s" => \&inst_arch, 260 "install-arch=s" => \&inst_arch,
177 "install-maps=s" => \&inst_maps, 261 "install-maps=s" => \&inst_maps,
178 "print-statedir" => sub { print "@pkgstatedir@\n" }, 262 "print-statedir" => sub { print "@pkgstatedir@\n" },

Diff Legend

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