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.5 by root, Thu Mar 8 15:19:08 2007 UTC vs.
Revision 1.19 by root, Sun Apr 1 00:36:35 2007 UTC

… …
19use File::Temp; 19use File::Temp;
20use Crossfire; 20use Crossfire;
21use Coro; 21use Coro;
22use Coro::AIO; 22use Coro::AIO;
23use POSIX (); 23use POSIX ();
24use Digest::MD5;
25use Storable; $Storable::canonical = 1;
24 26
25sub usage { 27sub usage {
26 warn <<EOF; 28 warn <<EOF;
27Usage: cfutil [-v] [-q] [--force] [--cache] 29Usage: cfutil [-v] [-q] [--force] [--cache]
28 [--install-arch path] 30 [--install-arch path]
… …
66} 68}
67 69
68sub inst_maps($) { 70sub inst_maps($) {
69 my (undef, $path) = @_; 71 my (undef, $path) = @_;
70 72
71 print "installing '$path' to '$DATADIR/maps'\n\n"; 73 print "installing '$path' to '$DATADIR/maps'\n";
72 74
73 if (!-f "$path/regions") { 75 if (!-f "$path/regions") {
74 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 76 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
75 exit 1 unless $FORCE; 77 exit 1 unless $FORCE;
76 } 78 }
77 79
78 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"; 80 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
81 and die "map installation failed.\n";
82
83 print "maps installed successfully.\n";
79} 84}
80 85
81{ 86{
82 our @PNG; 87 our %FACEINFO;
83 our @ARC; 88 our @ARC;
89 our $TRS;
84 our $NFILE; 90 our $NFILE;
85 our @FACE;
86 our $ANIM; 91 our %ANIM;
92
93 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
87 94
88 our (@png, @trs, @arc); # files we are interested in 95 our (@png, @trs, @arc); # files we are interested in
89 96
90 sub commit_png { 97 sub commit_png($$$) {
91 my ($name, $data) = @_; 98 my ($name, $data, $T) = @_;
92 99
93 push @PNG, [$name => $data]; 100 $FACEINFO{$name}{"data$T"} = $data;
94 } 101 }
95 102
96 sub process_png { 103 sub process_png {
97 while (@png) { 104 while (@png) {
98 my $path = pop @png; 105 my ($path, $delete) = @{pop @png};
99 106
100 my $png; 107 my $png;
101 aio_lstat $path; 108 aio_lstat $path;
102 my ($size, $mtime) = (stat _)[7,9]; 109 my ($size, $mtime) = (stat _)[7,9];
103 110
104 if (0 > aio_load $path, $png) { 111 if (0 > aio_load $path, $png) {
105 warn "$path: $!, skipping.\n"; 112 warn "$path: $!, skipping.\n";
106 next; 113 next;
107 } 114 }
108 115
116 my $stem = $path;
117 my $T;
118
119 if ($stem =~ s/\.32x32\.png~?$//) {
120 $T = 32;
121 } elsif ($stem =~ s/\.64x64\.png~?$//) {
122 $T = 64;
123 } else {
124 warn "$path: weird filename, skipping.\n";
125 next;
126 }
127
109 # quickly extratc width and height of the (necessarily PNG) image 128 # quickly extract width and height of the (necessarily PNG) image
110 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 129 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
111 warn "$path: not a recongized png file, skipping.\n"; 130 warn "$path: not a recognized png file, skipping.\n";
112 next; 131 next;
113 } 132 }
114 133
115 my ($w, $h) = unpack "NN", $1; 134 my ($w, $h) = unpack "NN", $1;
116
117 (my $face = $path) =~ s/^.*\///;
118 my $T = 32;
119
120 unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
121 warn "$path: weird filename, skipping.\n";
122 next;
123 }
124 135
125 if ($w < $T || $h < $T) { 136 if ($w < $T || $h < $T) {
126 warn "$path: too small ($w $h), skipping.\n"; 137 warn "$path: too small ($w $h), skipping.\n";
127 next; 138 next;
128 } 139 }
129 140
130 if ($w % $T || $h % $T) { 141 if ($w % $T || $h % $T) {
131 warn "$path: weird png size ($w $h), skipping.\n"; 142 warn "$path: weird png size ($w $h), skipping.\n";
132 next; 143 next;
133 } 144 }
145
146 unless ($path =~ /~$/) {
147 # possibly enlarge
148 if (0 > aio_stat "$stem.64x64.png") {
149 my $other = "$stem.64x64.png~";
150
151 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
152 warn "rescale $other\n";#d#
153 my $wrap = 0; # for the time being
154 fork_sub {
155 system "convert png:\Q$path\E -depth 8 rgba:-"
156 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
157 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
158 and die "convert/hq2xa pipeline error: status $? ($!)";
159 system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
160 die "$other~ has zero size, aborting." unless -s "$other~";
161 rename "$other~", $other;
162 };
163 }
164
165 push @png, [$other, !$CACHE];
166 }
167
168 # possibly scale down
169 if (0 > aio_stat "$stem.32x32.png") {
170 my $other = "$stem.32x32.png~";
171
172 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
173 fork_sub {
174 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
175 system $OPTIPNG, "-o5", "-i0", "-q", "$other~";
176 die "$other~ has zero size, aborting." unless -s "$other~";
177 rename "$other~", $other;
178 };
179 }
180
181 warn "scaled down $path to $other\n";#d#
182
183 push @png, [$other, !$CACHE];
184 }
185 }
186
187 (my $face = $stem) =~ s/^.*\///;
134 188
135 if (($w > $T || $h > $T) && $face !~ /_S\./) { 189 if (($w > $T || $h > $T) && $face !~ /_S\./) {
136 # split 190 # split
137 my @tile; 191 my @tile;
138 for my $x (0 .. (int $w / $T) - 1) { 192 for my $x (0 .. (int $w / $T) - 1) {
… …
147 my @todo = grep { $_->[3] <= $mtime } @tile; 201 my @todo = grep { $_->[3] <= $mtime } @tile;
148 if (@todo) { 202 if (@todo) {
149 fork_sub { 203 fork_sub {
150 open my $convert, "|-", $CONVERT, 204 open my $convert, "|-", $CONVERT,
151 "png:-", 205 "png:-",
152 -negate,#d#
153 (map { 206 (map {
154 ( 207 (
155 "(", 208 "(",
156 "+clone", 209 "+clone",
157 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), 210 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
211 "+repage",
212 -quality => "00",
158 -write => "png:$_->[2]~", 213 -write => "png32:$_->[2]~",
159 "+delete", 214 "+delete",
160 ")", 215 ")",
161 ) 216 )
162 } @todo), 217 } @todo),
163 "null:"; 218 "null:";
… …
167 close $convert; 222 close $convert;
168 223
169 # pass 2, optimise, and rename 224 # pass 2, optimise, and rename
170 for (@todo) { 225 for (@todo) {
171 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 226 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
227 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
172 rename "$_->[2]~", $_->[2]; 228 rename "$_->[2]~", $_->[2];
173 } 229 }
174 }; 230 };
175 } 231 }
176 232
… …
180 236
181 if (0 > aio_load $file, $tile) { 237 if (0 > aio_load $file, $tile) {
182 die "$path: unable to read tile +$x+$y, aborting.\n"; 238 die "$path: unable to read tile +$x+$y, aborting.\n";
183 } 239 }
184 IO::AIO::aio_unlink $file unless $CACHE; 240 IO::AIO::aio_unlink $file unless $CACHE;
185 commit_png $x|$y ? "$face+$x+$y" : $face, $tile; 241 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
186 } 242 }
187 } else { 243 } else {
188 # use as-is (either small, use smooth) 244 # use as-is (either small, use smooth)
189 commit_png $face, $png; 245 commit_png $face, $png, $T;
190 } 246 }
247
248 aio_unlink $path if $delete;
191 } 249 }
192 } 250 }
193 251
194 sub process_arc { 252 sub process_arc {
195 while (@arc) { 253 while (@arc) {
… …
199 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 257 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
200 258
201 my $arc = read_arch "$dir/$file"; 259 my $arc = read_arch "$dir/$file";
202 for my $o (values %$arc) { 260 for my $o (values %$arc) {
203 push @ARC, $o; 261 push @ARC, $o;
262
263 $o->{editor_folder} = $dir;
264
265 my $visibility = delete $o->{visibility};
266 my $magicmap = delete $o->{magicmap};
267
268 # find upper left corner :/
269 # omg, this is sooo broken
204 my ($dx, $dy); 270 my ($dx, $dy);
205 # omg, this is sooo broken
206 for (my $o = $o; $o; $o = $o->{more}) { 271 for (my $o = $o; $o; $o = $o->{more}) {
207 $dx = $o->{x} if $o->{x} < $dx; 272 $dx = $o->{x} if $o->{x} < $dx;
208 $dy = $o->{y} if $o->{y} < $dy; 273 $dy = $o->{y} if $o->{y} < $dy;
209 } 274 }
275
210 for (my $o = $o; $o; $o = $o->{more}) { 276 for (my $o = $o; $o; $o = $o->{more}) {
211 my $x = $o->{x} - $dx; 277 my $x = $o->{x} - $dx;
212 my $y = $o->{y} - $dy; 278 my $y = $o->{y} - $dy;
213 if ($x|$y) { 279
214 $_ .= "+$x+$y" for $o->{face}, @{$o->{anim} || []}; 280 my $ext = $x|$y ? "+$x+$y" : "";
215 } 281
216 } 282 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/;
283
284 my $visibility = delete $o->{visibility} if exists $o->{visibility};
285 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
286
217 if (my $anim = delete $o->{anim}) { 287 my $anim = delete $o->{anim};
288
289 if ($anim) {
218 $o->{animation} = $o->{_name}; 290 $o->{animation} = "$o->{_name}";
291
292 for (@$anim) {
293 $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/;
294 }
295
296 $ANIM{"$o->{_name}$ext"} =
219 $ANIM .= join "", map "$_\n", 297 join "", map "$_\n",
220 "anim $o->{_name}", 298 "anim $o->{_name}",
221 @$anim, 299 @$anim,
222 "mina"; 300 "mina";
301 }
302
303 for my $face ($o->{face} || (), @{$anim || []}) {
304 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
305
306 my $info = $FACEINFO{$face} ||= {};
307
308 $info->{visibility} = $visibility if defined $visibility;
309 $info->{magicmap} = $magicmap if defined $magicmap;
310 }
311
312 if (my $smooth = delete $o->{smoothface}) {
313 my ($face, $smooth) = split /\s+/, $smooth;
314 # skip empty_S.x11, it seems to server no purpose whatsoever
315 # but increases bandwidth demands and worse.
316 unless ($smooth eq "empty_S.x11") {
317 $FACEINFO{$face}{smooth} = $smooth;
318 }
319 }
223 } 320 }
224 } 321 }
225 } 322 }
226 } 323 }
227 324
228 sub process_trs { 325 sub process_trs {
229 while (@trs) { 326 while (@trs) {
230 my ($dir, $file) = @{pop @trs}; 327 my ($dir, $file) = @{pop @trs};
328 my $path = "$dir/$file";
329
330 my $trs;
331 if (0 > aio_load $path, $trs) {
332 warn "$path: $!, skipping.\n";
333 next;
334 }
335
336 $TRS .= $trs;
231 } 337 }
232 } 338 }
233 339
234 sub find_files; 340 sub find_files;
235 sub find_files { 341 sub find_files {
… …
242 find_files "$path/$_" 348 find_files "$path/$_"
243 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 349 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
244 350
245 for my $file (@$nondirs) { 351 for my $file (@$nondirs) {
246 if ($file =~ /\.png$/) { 352 if ($file =~ /\.png$/) {
247 push @png, "$path/$file"; 353 push @png, ["$path/$file", 0];
248 } elsif ($file =~ /\.trs$/) { 354 } elsif ($file =~ /\.trs$/) {
249 push @trs, [$path, $file]; 355 push @trs, [$path, $file];
250 } elsif ($file =~ /\.arc$/) { 356 } elsif ($file =~ /\.arc$/) {
251 push @arc, [$path, $file]; 357 push @arc, [$path, $file];
252 } else { 358 } else {
… …
257 } 363 }
258 364
259 sub inst_arch($) { 365 sub inst_arch($) {
260 my (undef, $path) = @_; 366 my (undef, $path) = @_;
261 367
262 print "installing '$path' to '$DATADIR'\n\n"; 368 print "installing '$path' to '$DATADIR'\n",
369 "(this can take a long time if you run this\n",
370 "for the first time or do not use --cache).\n";
263 371
264 if (!-d "$path/treasures") { 372 if (!-d "$path/treasures") {
265 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 373 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
266 exit 1 unless $FORCE; 374 exit 1 unless $FORCE;
267 } 375 }
268 376
269 find_files $path; 377 find_files $path;
270 IO::AIO::flush; 378 IO::AIO::flush;
271 379
272 $_->join for ( 380 $_->join for (
273 (async \&process_png), (async \&process_png), 381 # four png crunchers work fine for my 2x smp machine
382 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
274 (async \&process_trs), (async \&process_trs), 383 (async \&process_trs), (async \&process_trs),
275 (async \&process_arc), (async \&process_arc), 384 (async \&process_arc), (async \&process_arc),
276 ); 385 );
277 386
278 { 387 {
279 open my $fh, ">:utf8", "$DATADIR/animations~" 388 open my $fh, ">:utf8", "$DATADIR/animations~"
280 or die "$DATADIR/animations~: $!"; 389 or die "$DATADIR/animations~: $!";
281 print $fh $ANIM; 390 print $fh join "", map $ANIM{$_}, sort keys %ANIM
282 } 391 }
283 392
284 { 393 {
285 open my $fh, ">:utf8", "$DATADIR/archetypes~" 394 open my $fh, ">:utf8", "$DATADIR/archetypes~"
286 or die "$DATADIR/archetypes~: $!"; 395 or die "$DATADIR/archetypes~: $!";
396 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
287 print $fh Crossfire::archlist_to_string \@ARC; 397 print $fh Crossfire::archlist_to_string \@ARC;
288 } 398 }
289 399
290 @PNG = sort { $a->[0] cmp $b->[0] } @PNG;
291
292 { 400 {
401 open my $fh, ">:utf8", "$DATADIR/treasures~"
402 or die "$DATADIR/treasures~: $!";
403 print $fh $TRS;
404 }
405
406 {
407 while (my ($k, $v) = each %FACEINFO) {
408 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
409 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
410
411 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
412 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
413 }
414
293 open my $fh, ">:perlio", "$DATADIR/crossfire.0~" 415 open my $fh, ">:perlio", "$DATADIR/facedata~"
294 or die "$DATADIR/crossfire.0~: $!"; 416 or die "$DATADIR/facedata~: $!";
295 printf $fh "IMAGE %d %d %s\x0a%s", $_, (length $PNG[$_][1]), $PNG[$_][0], $PNG[$_][1]
296 for 0.. $#PNG;
297 }
298 417
299 rename "$DATADIR/archetypes~" , "$DATADIR/archetypes"; 418 $FACEINFO{""} = { version => 1};
300 rename "$DATADIR/crossfire.0~", "$DATADIR/crossfire.0"; 419 print $fh Storable::nfreeze \%FACEINFO;
301 rename "$DATADIR/animations~" , "$DATADIR/animations"; 420 }
302 421
303 die "--install-arch not fully implemented\n"; 422 for (qw(archetypes facedata animations treasures)) {
423 chmod 0644, "$DATADIR/$_~";
424 rename "$DATADIR/$_~", "$DATADIR/$_"
425 or die "$DATADIR/$_: $!";
426 }
427
428 print "archetype data installed successfully.\n";
304 } 429 }
305} 430}
306 431
307Getopt::Long::Configure ("bundling", "no_ignore_case"); 432Getopt::Long::Configure ("bundling", "no_ignore_case");
308GetOptions ( 433GetOptions (

Diff Legend

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