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

Diff Legend

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