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.6 by root, Sun Mar 11 02:12:45 2007 UTC vs.
Revision 1.33 by root, Thu Apr 26 00:50:03 2007 UTC

9 9
10my $CONVERT = "@CONVERT@"; 10my $CONVERT = "@CONVERT@";
11my $IDENTIFY = "@IDENTIFY@"; 11my $IDENTIFY = "@IDENTIFY@";
12my $OPTIPNG = "@OPTIPNG@"; 12my $OPTIPNG = "@OPTIPNG@";
13my $RSYNC = "@RSYNC@"; 13my $RSYNC = "@RSYNC@";
14my $PNGNQ = "@PNGNQ@";
14 15
15use Getopt::Long; 16use Getopt::Long;
16use Coro::Event; 17use Coro::Event;
17use AnyEvent; 18use AnyEvent;
18use IO::AIO (); 19use IO::AIO ();
20use Crossfire; 21use Crossfire;
21use Coro; 22use Coro;
22use Coro::AIO; 23use Coro::AIO;
23use POSIX (); 24use POSIX ();
24use Digest::MD5; 25use Digest::MD5;
26use Coro::Storable; $Storable::canonical = 1;
25 27
26sub usage { 28sub usage {
27 warn <<EOF; 29 warn <<EOF;
28Usage: cfutil [-v] [-q] [--force] [--cache] 30Usage: cfutil [-v] [-q] [--force] [--cache]
29 [--install-arch path] 31 [--install-arch path]
67} 69}
68 70
69sub inst_maps($) { 71sub inst_maps($) {
70 my (undef, $path) = @_; 72 my (undef, $path) = @_;
71 73
72 print "installing '$path' to '$DATADIR/maps'\n\n"; 74 print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
73 75
74 if (!-f "$path/regions") { 76 if (!-f "$path/regions") {
75 warn "'$path' does not look like a maps directory ('regions' file is missing).\n"; 77 warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
76 exit 1 unless $FORCE; 78 exit 1 unless $FORCE;
77 } 79 }
78 80
79 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"; 81 system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"
82 and die "map installation failed.\n";
83
84 print "maps installed successfully.\n";
80} 85}
81 86
82{ 87{
83 our %PNG32; 88 our %ANIMINFO;
84 our %FACEINFO; 89 our %FACEINFO;
85 our @ARC; 90 our @ARC;
91 our %ARC;
92 our $TRS;
86 our $NFILE; 93 our $NFILE;
87 our %ANIM; 94
95 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
88 96
89 our (@png, @trs, @arc); # files we are interested in 97 our (@png, @trs, @arc); # files we are interested in
90 98
91 sub commit_png { 99 sub commit_png($$$) {
92 my ($name, $data) = @_; 100 my ($name, $data, $T) = @_;
93 101
94 $PNG32{$name} = $data; 102 $FACEINFO{$name}{"data$T"} = $data;
95 $FACEINFO{$name} ||= {};
96 } 103 }
97 104
98 sub process_png { 105 sub process_png {
99 while (@png) { 106 while (@png) {
100 my $path = pop @png; 107 my ($path, $delete) = @{pop @png};
101 108
102 my $png; 109 my $png;
103 aio_lstat $path; 110 aio_lstat $path;
104 my ($size, $mtime) = (stat _)[7,9]; 111 my ($size, $mtime) = (stat _)[7,9];
105 112
106 if (0 > aio_load $path, $png) { 113 if (0 > aio_load $path, $png) {
107 warn "$path: $!, skipping.\n"; 114 warn "$path: $!, skipping.\n";
108 next; 115 next;
109 } 116 }
110 117
118 my $stem = $path;
119 my $T;
120
121 if ($stem =~ s/\.32x32\.png~?$//) {
122 $T = 32;
123 } elsif ($stem =~ s/\.64x64\.png~?$//) {
124 $T = 64;
125 } else {
126 warn "$path: weird filename, skipping.\n";
127 next;
128 }
129
111 # quickly extract width and height of the (necessarily PNG) image 130 # quickly extract width and height of the (necessarily PNG) image
112 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 131 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
113 warn "$path: not a recongized png file, skipping.\n"; 132 warn "$path: not a recognized png file, skipping.\n";
114 next; 133 next;
115 } 134 }
116 135
117 my ($w, $h) = unpack "NN", $1; 136 my ($w, $h) = unpack "NN", $1;
118
119 (my $face = $path) =~ s/^.*\///;
120 my $T = 32;
121
122 unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
123 warn "$path: weird filename, skipping.\n";
124 next;
125 }
126 137
127 if ($w < $T || $h < $T) { 138 if ($w < $T || $h < $T) {
128 warn "$path: too small ($w $h), skipping.\n"; 139 warn "$path: too small ($w $h), skipping.\n";
129 next; 140 next;
130 } 141 }
132 if ($w % $T || $h % $T) { 143 if ($w % $T || $h % $T) {
133 warn "$path: weird png size ($w $h), skipping.\n"; 144 warn "$path: weird png size ($w $h), skipping.\n";
134 next; 145 next;
135 } 146 }
136 147
148 unless ($path =~ /~$/) {
149 # possibly enlarge
150 if (0 > aio_stat "$stem.64x64.png") {
151 my $other = "$stem.64x64.png~";
152
153 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
154 my $wrap = 0; # for the time being
155 fork_sub {
156 system "convert png:\Q$path\E -depth 8 rgba:-"
157 . "| $exec_prefix/bin/cfhq2xa $w $h $wrap"
158 . "| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $QUANTIZE -quality 00 png32:\Q$other\E~"
159 and die "convert/hq2xa pipeline error: status $? ($!)";
160 system $OPTIPNG, "-i0", "-q", "$other~";
161 die "$other~ has zero size, aborting." unless -s "$other~";
162 rename "$other~", $other;
163 };
164 }
165
166 push @png, [$other, !$CACHE];
167 }
168
169 # possibly scale down
170 if (0 > aio_stat "$stem.32x32.png") {
171 my $other = "$stem.32x32.png~";
172
173 if (0 > aio_lstat $other or (-M _) > (-M $path)) {
174 fork_sub {
175 system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
176 system $OPTIPNG, "-i0", "-q", "$other~";
177
178 # reduce smoothfaces >10000 bytes
179 if ($stem =~ /_S\./ && (-s "$other~") > 10000) {
180 my $ncolor = 256;
181 while () {
182 system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
183 system $OPTIPNG, "-i0", "-q", "$other~~";
184 last if 10000 > -s "$other~~";
185 $ncolor = int $ncolor * 0.9;
186 $ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
187 }
188
189 printf "reduced %s from %d to %d bytes using %d colours.\n",
190 $other, -s "$other~", -s "$other~~", $ncolor
191 if $VERBOSE >= 2;
192 rename "$other~~", "$other~";
193 }
194
195 die "$other~ has zero size, aborting." unless -s "$other~";
196 rename "$other~", $other;
197 };
198 }
199
200 #warn "scaled down $path to $other\n";#d#
201 push @png, [$other, !$CACHE];
202 }
203 }
204
205 (my $face = $stem) =~ s/^.*\///;
206
207 # split all bigfaces, but avoid smoothfaces (*_S)
137 if (($w > $T || $h > $T) && $face !~ /_S\./) { 208 if (($w > $T || $h > $T) && $face !~ /_S\./) {
138 # split 209 # split
139 my @tile; 210 my @tile;
140 for my $x (0 .. (int $w / $T) - 1) { 211 for my $x (0 .. (int $w / $T) - 1) {
141 for my $y (0 .. (int $h / $T) - 1) { 212 for my $y (0 .. (int $h / $T) - 1) {
154 (map { 225 (map {
155 ( 226 (
156 "(", 227 "(",
157 "+clone", 228 "+clone",
158 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), 229 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
230 "+repage",
231 -quality => "00",
159 -write => "png:$_->[2]~", 232 -write => "png32:$_->[2]~",
160 "+delete", 233 "+delete",
161 ")", 234 ")",
162 ) 235 )
163 } @todo), 236 } @todo),
164 "null:"; 237 "null:";
168 close $convert; 241 close $convert;
169 242
170 # pass 2, optimise, and rename 243 # pass 2, optimise, and rename
171 for (@todo) { 244 for (@todo) {
172 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 245 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
246 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
173 rename "$_->[2]~", $_->[2]; 247 rename "$_->[2]~", $_->[2];
174 } 248 }
175 }; 249 };
176 } 250 }
177 251
181 255
182 if (0 > aio_load $file, $tile) { 256 if (0 > aio_load $file, $tile) {
183 die "$path: unable to read tile +$x+$y, aborting.\n"; 257 die "$path: unable to read tile +$x+$y, aborting.\n";
184 } 258 }
185 IO::AIO::aio_unlink $file unless $CACHE; 259 IO::AIO::aio_unlink $file unless $CACHE;
186 commit_png $x|$y ? "$face+$x+$y" : $face, $tile; 260 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
187 } 261 }
188 } else { 262 } else {
189 # use as-is (either small, use smooth) 263 # use as-is (either small, use smooth)
190 commit_png $face, $png; 264 commit_png $face, $png, $T;
191 } 265 }
266
267 aio_unlink $path if $delete;
192 } 268 }
193 } 269 }
194 270
195 sub process_arc { 271 sub process_arc {
196 while (@arc) { 272 while (@arc) {
200 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 276 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
201 277
202 my $arc = read_arch "$dir/$file"; 278 my $arc = read_arch "$dir/$file";
203 for my $o (values %$arc) { 279 for my $o (values %$arc) {
204 push @ARC, $o; 280 push @ARC, $o;
281 for (my $m = $o; $m; $m = $m->{more}) {
282 $ARC{$m->{_name}} = $m;
283 }
284
285 $o->{editor_folder} = $dir;
205 286
206 my $visibility = delete $o->{visibility}; 287 my $visibility = delete $o->{visibility};
207 my $magicmap = delete $o->{magicmap}; 288 my $magicmap = delete $o->{magicmap};
208 289
209 # find upper left corner :/ 290 # find upper left corner :/
218 my $x = $o->{x} - $dx; 299 my $x = $o->{x} - $dx;
219 my $y = $o->{y} - $dy; 300 my $y = $o->{y} - $dy;
220 301
221 my $ext = $x|$y ? "+$x+$y" : ""; 302 my $ext = $x|$y ? "+$x+$y" : "";
222 303
223 $o->{face} .= $ext; 304 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/ || !$o->{face};
224 305
225 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 306 my $visibility = delete $o->{visibility} if exists $o->{visibility};
226 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 307 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
227 308
228 my $anim = delete $o->{anim}; 309 my $anim = delete $o->{anim};
229 310
230 if ($anim) { 311 if ($anim) {
312 # possibly add $ext to the animation name to avoid
313 # the need to specify archnames for all parts
314 # of a multipart archetype.
231 $o->{animation} = "$o->{_name}$ext"; 315 $o->{animation} = "$o->{_name}";
316 my $facings = 1;
317 my @frames;
232 318
233 for (@$anim) { 319 for (@$anim) {
234 $_ .= $ext unless /^facings\s/; 320 if (/^facings\s+(\d+)/) {
321 $facings = $1*1;
322 } elsif (/^blank.x11$|^empty.x11$/) {
323 push @frames, $_;
324 } else {
325 push @frames, "$_$ext";
326 }
235 } 327 }
236 328
237 $ANIM{"$o->{_name}$ext"} = 329 $ANIMINFO{$o->{animation}} = {
238 join "", map "$_\n", 330 facings => $facings,
239 "anim $o->{_name}$ext", 331 frames => \@frames,
240 @$anim, 332 };
241 "mina";
242 } 333 }
243 334
244 for my $face ($o->{face} || (), @{$anim || []}) { 335 for my $face ($o->{face} || (), @{$anim || []}) {
245 next if /^facings\s/; 336 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
246 337
247 my $info = $FACEINFO{$face} ||= {}; 338 my $info = $FACEINFO{$face} ||= {};
248 339
249 $info->{visibility} = $visibility if defined $visibility; 340 $info->{visibility} = $visibility if defined $visibility;
250 $info->{magicmap} = $magicmap if defined $magicmap; 341 $info->{magicmap} = $magicmap if defined $magicmap;
342 }
343
344 if (my $smooth = delete $o->{smoothface}) {
345 my %kv =split /\s+/, $smooth;
346 my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
347 while (my ($face, $smooth) = each %kv) {
348 $FACEINFO{$face}{smooth} = $smooth;
349 $FACEINFO{$face}{smoothlevel} = $level;
350 }
251 } 351 }
252 } 352 }
253 } 353 }
254 } 354 }
255 } 355 }
256 356
257 sub process_trs { 357 sub process_trs {
258 while (@trs) { 358 while (@trs) {
259 my ($dir, $file) = @{pop @trs}; 359 my ($dir, $file) = @{pop @trs};
360 my $path = "$dir/$file";
361
362 my $trs;
363 if (0 > aio_load $path, $trs) {
364 warn "$path: $!, skipping.\n";
365 next;
366 }
367
368 $TRS .= $trs;
260 } 369 }
261 } 370 }
262 371
263 sub find_files; 372 sub find_files;
264 sub find_files { 373 sub find_files {
271 find_files "$path/$_" 380 find_files "$path/$_"
272 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 381 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
273 382
274 for my $file (@$nondirs) { 383 for my $file (@$nondirs) {
275 if ($file =~ /\.png$/) { 384 if ($file =~ /\.png$/) {
276 push @png, "$path/$file"; 385 push @png, ["$path/$file", 0];
277 } elsif ($file =~ /\.trs$/) { 386 } elsif ($file =~ /\.trs$/) {
278 push @trs, [$path, $file]; 387 push @trs, [$path, $file];
279 } elsif ($file =~ /\.arc$/) { 388 } elsif ($file =~ /\.arc$/) {
280 push @arc, [$path, $file]; 389 push @arc, [$path, $file];
281 } else { 390 } else {
282 warn "ignoring $path/$file\n" if $VERBOSE >= 2; 391 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
283 } 392 }
284 } 393 }
285 }; 394 };
286 } 395 }
287 396
288 sub inst_arch($) { 397 sub inst_arch($) {
289 my (undef, $path) = @_; 398 my (undef, $path) = @_;
290 399
400 print "\n",
291 print "installing '$path' to '$DATADIR'\n\n"; 401 "Installing '$path' to '$DATADIR'\n",
402 "\n",
403 "This can take a long time if you run this\n",
404 "for the first time or do not use --cache.\n",
405 "\n",
406 "Unless you run verbosely, all following warning\n",
407 "or error messages indicate serious problems.\n",
408 "\n";
292 409
293 if (!-d "$path/treasures") { 410 if (!-d "$path/treasures") {
294 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 411 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
295 exit 1 unless $FORCE; 412 exit 1 unless $FORCE;
296 } 413 }
297 414
298 find_files $path; 415 find_files $path;
299 IO::AIO::flush; 416 IO::AIO::flush;
300 417
301 $_->join for ( 418 $_->join for (
302 (async \&process_png), (async \&process_png), 419 # four png crunchers work fine for my 2x smp machine
420 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
303 (async \&process_trs), (async \&process_trs), 421 (async \&process_trs), (async \&process_trs),
304 (async \&process_arc), (async \&process_arc), 422 (async \&process_arc), (async \&process_arc),
305 ); 423 );
306 424
307 { 425 {
308 open my $fh, ">:utf8", "$DATADIR/animations~" 426 # remove path prefix from editor_folder
309 or die "$DATADIR/animations~: $!"; 427 substr $_->{editor_folder}, 0, 1 + length $path, ""
310 print $fh join "", map $ANIM{$_}, sort keys %ANIM 428 for values %ARC;
429
430 # resolve inherit
431 while () {
432 my $progress;
433 my $loop;
434
435 for my $o (values %ARC) {
436 if (my $other = $o->{inherit}) {
437 if (my $s = $ARC{$other}) {
438 if ($s->{inherit}) {
439 $loop = $s;
440 } else {
441 delete $o->{inherit};
442 my %s = %$s;
443 delete @s{qw(_name more name name_pl)};
444 %$o = ( %s, %$o );
445 ++$progress;
446 }
447 } else {
448 warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
449 delete $ARC{$o->{_name}};
450 }
451 }
452 }
453
454 unless ($progress) {
455 die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
456 if $loop;
457
458 last;
459 }
311 } 460 }
312 461
313 {
314 open my $fh, ">:utf8", "$DATADIR/archetypes~" 462 open my $fh, ">:utf8", "$DATADIR/archetypes~"
315 or die "$DATADIR/archetypes~: $!"; 463 or die "$DATADIR/archetypes~: $!";
316 print $fh Crossfire::archlist_to_string \@ARC; 464 print $fh Crossfire::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
465 }
466
467 {
468 open my $fh, ">:utf8", "$DATADIR/treasures~"
469 or die "$DATADIR/treasures~: $!";
470 print $fh $TRS;
317 } 471 }
318 472
319 { 473 {
320 while (my ($k, $v) = each %FACEINFO) { 474 while (my ($k, $v) = each %FACEINFO) {
321 $v->{data32} ||= delete $PNG32{$k}; 475 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
322 }
323
324 while (my ($k, $v) = each %FACEINFO) {
325 exists $v->{data32} or warn "$k: face has no png32. this will crash the server.\n"; 476 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
477
478 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
479 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
326 480
327 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 481 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
482 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
328 } 483 }
329 484
330 open my $fh, ">:perlio", "$DATADIR/faces~" 485 open my $fh, ">:perlio", "$DATADIR/facedata~"
331 or die "$DATADIR/faces~: $!"; 486 or die "$DATADIR/facedata~: $!";
332 487
333 print $fh Storable::nfreeze \%FACEINFO; 488 print $fh freeze {
334 489 version => 2,
335 #use PApp::Util; warn PApp::Util::dumpval \%FACEINFO; 490 faceinfo => \%FACEINFO,
491 animinfo => \%ANIMINFO,
336 } 492 };
493 }
337 494
338 for (qw(archetypes faces animations)) { 495 for (qw(archetypes facedata treasures)) {
339 chmod 0644, "$DATADIR/$_~"; 496 chmod 0644, "$DATADIR/$_~";
340 rename "$DATADIR/$_~", "$DATADIR/$_"; 497 rename "$DATADIR/$_~", "$DATADIR/$_"
498 or die "$DATADIR/$_: $!";
341 } 499 }
342 500
343 die "--install-arch not fully implemented\n"; 501 print "archetype data installed successfully.\n";
344 } 502 }
345} 503}
346 504
347Getopt::Long::Configure ("bundling", "no_ignore_case"); 505Getopt::Long::Configure ("bundling", "no_ignore_case");
348GetOptions ( 506GetOptions (

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines