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.9 by root, Sun Mar 11 22:36:53 2007 UTC vs.
Revision 1.28 by root, Wed Apr 18 09:26:46 2007 UTC

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

Diff Legend

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