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.12 by root, Mon Mar 12 17:26:41 2007 UTC vs.
Revision 1.19 by root, Sun Apr 1 00:36:35 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 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;
84 our %FACEINFO; 87 our %FACEINFO;
85 our @ARC; 88 our @ARC;
86 our $TRS; 89 our $TRS;
87 our $NFILE; 90 our $NFILE;
88 our %ANIM; 91 our %ANIM;
89 our $SMOOTH; 92
93 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
90 94
91 our (@png, @trs, @arc); # files we are interested in 95 our (@png, @trs, @arc); # files we are interested in
92 96
93 sub commit_png { 97 sub commit_png($$$) {
94 my ($name, $data) = @_; 98 my ($name, $data, $T) = @_;
95 99
96 $PNG32{$name} = $data; 100 $FACEINFO{$name}{"data$T"} = $data;
97 $FACEINFO{$name} ||= {};
98 } 101 }
99 102
100 sub process_png { 103 sub process_png {
101 while (@png) { 104 while (@png) {
102 my $path = pop @png; 105 my ($path, $delete) = @{pop @png};
103 106
104 my $png; 107 my $png;
105 aio_lstat $path; 108 aio_lstat $path;
106 my ($size, $mtime) = (stat _)[7,9]; 109 my ($size, $mtime) = (stat _)[7,9];
107 110
108 if (0 > aio_load $path, $png) { 111 if (0 > aio_load $path, $png) {
109 warn "$path: $!, skipping.\n"; 112 warn "$path: $!, skipping.\n";
110 next; 113 next;
111 } 114 }
112 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
113 # quickly extract width and height of the (necessarily PNG) image 128 # quickly extract width and height of the (necessarily PNG) image
114 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 129 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
115 warn "$path: not a recongized png file, skipping.\n"; 130 warn "$path: not a recognized png file, skipping.\n";
116 next; 131 next;
117 } 132 }
118 133
119 my ($w, $h) = unpack "NN", $1; 134 my ($w, $h) = unpack "NN", $1;
120
121 (my $face = $path) =~ s/^.*\///;
122 my $T = 32;
123
124 unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
125 warn "$path: weird filename, skipping.\n";
126 next;
127 }
128 135
129 if ($w < $T || $h < $T) { 136 if ($w < $T || $h < $T) {
130 warn "$path: too small ($w $h), skipping.\n"; 137 warn "$path: too small ($w $h), skipping.\n";
131 next; 138 next;
132 } 139 }
133 140
134 if ($w % $T || $h % $T) { 141 if ($w % $T || $h % $T) {
135 warn "$path: weird png size ($w $h), skipping.\n"; 142 warn "$path: weird png size ($w $h), skipping.\n";
136 next; 143 next;
137 } 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/^.*\///;
138 188
139 if (($w > $T || $h > $T) && $face !~ /_S\./) { 189 if (($w > $T || $h > $T) && $face !~ /_S\./) {
140 # split 190 # split
141 my @tile; 191 my @tile;
142 for my $x (0 .. (int $w / $T) - 1) { 192 for my $x (0 .. (int $w / $T) - 1) {
157 ( 207 (
158 "(", 208 "(",
159 "+clone", 209 "+clone",
160 -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),
161 "+repage", 211 "+repage",
212 -quality => "00",
162 -write => "png:$_->[2]~", 213 -write => "png32:$_->[2]~",
163 "+delete", 214 "+delete",
164 ")", 215 ")",
165 ) 216 )
166 } @todo), 217 } @todo),
167 "null:"; 218 "null:";
171 close $convert; 222 close $convert;
172 223
173 # pass 2, optimise, and rename 224 # pass 2, optimise, and rename
174 for (@todo) { 225 for (@todo) {
175 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 226 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
227 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
176 rename "$_->[2]~", $_->[2]; 228 rename "$_->[2]~", $_->[2];
177 } 229 }
178 }; 230 };
179 } 231 }
180 232
184 236
185 if (0 > aio_load $file, $tile) { 237 if (0 > aio_load $file, $tile) {
186 die "$path: unable to read tile +$x+$y, aborting.\n"; 238 die "$path: unable to read tile +$x+$y, aborting.\n";
187 } 239 }
188 IO::AIO::aio_unlink $file unless $CACHE; 240 IO::AIO::aio_unlink $file unless $CACHE;
189 commit_png $x|$y ? "$face+$x+$y" : $face, $tile; 241 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
190 } 242 }
191 } else { 243 } else {
192 # use as-is (either small, use smooth) 244 # use as-is (either small, use smooth)
193 commit_png $face, $png; 245 commit_png $face, $png, $T;
194 } 246 }
247
248 aio_unlink $path if $delete;
195 } 249 }
196 } 250 }
197 251
198 sub process_arc { 252 sub process_arc {
199 while (@arc) { 253 while (@arc) {
254 $info->{visibility} = $visibility if defined $visibility; 308 $info->{visibility} = $visibility if defined $visibility;
255 $info->{magicmap} = $magicmap if defined $magicmap; 309 $info->{magicmap} = $magicmap if defined $magicmap;
256 } 310 }
257 311
258 if (my $smooth = delete $o->{smoothface}) { 312 if (my $smooth = delete $o->{smoothface}) {
259 $SMOOTH .= "$smooth\n"; 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 }
260 } 319 }
261 } 320 }
262 } 321 }
263 } 322 }
264 } 323 }
289 find_files "$path/$_" 348 find_files "$path/$_"
290 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 349 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
291 350
292 for my $file (@$nondirs) { 351 for my $file (@$nondirs) {
293 if ($file =~ /\.png$/) { 352 if ($file =~ /\.png$/) {
294 push @png, "$path/$file"; 353 push @png, ["$path/$file", 0];
295 } elsif ($file =~ /\.trs$/) { 354 } elsif ($file =~ /\.trs$/) {
296 push @trs, [$path, $file]; 355 push @trs, [$path, $file];
297 } elsif ($file =~ /\.arc$/) { 356 } elsif ($file =~ /\.arc$/) {
298 push @arc, [$path, $file]; 357 push @arc, [$path, $file];
299 } else { 358 } else {
304 } 363 }
305 364
306 sub inst_arch($) { 365 sub inst_arch($) {
307 my (undef, $path) = @_; 366 my (undef, $path) = @_;
308 367
309 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";
310 371
311 if (!-d "$path/treasures") { 372 if (!-d "$path/treasures") {
312 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";
313 exit 1 unless $FORCE; 374 exit 1 unless $FORCE;
314 } 375 }
315 376
316 find_files $path; 377 find_files $path;
317 IO::AIO::flush; 378 IO::AIO::flush;
318 379
319 $_->join for ( 380 $_->join for (
320 (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),
321 (async \&process_trs), (async \&process_trs), 383 (async \&process_trs), (async \&process_trs),
322 (async \&process_arc), (async \&process_arc), 384 (async \&process_arc), (async \&process_arc),
323 ); 385 );
324 386
325 { 387 {
334 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC; 396 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
335 print $fh Crossfire::archlist_to_string \@ARC; 397 print $fh Crossfire::archlist_to_string \@ARC;
336 } 398 }
337 399
338 { 400 {
339 open my $fh, ">:utf8", "$DATADIR/smooth~"
340 or die "$DATADIR/smooth~: $!";
341 print $fh $SMOOTH;
342 }
343
344 {
345 open my $fh, ">:utf8", "$DATADIR/treasures~" 401 open my $fh, ">:utf8", "$DATADIR/treasures~"
346 or die "$DATADIR/treasures~: $!"; 402 or die "$DATADIR/treasures~: $!";
347 print $fh $TRS; 403 print $fh $TRS;
348 } 404 }
349 405
350 { 406 {
351 while (my ($k, $v) = each %FACEINFO) { 407 while (my ($k, $v) = each %FACEINFO) {
352 $v->{data32} ||= delete $PNG32{$k};
353 }
354
355 while (my ($k, $v) = each %FACEINFO) {
356 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n"; 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";
357 410
358 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 411 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
412 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
359 } 413 }
360 414
361 open my $fh, ">:perlio", "$DATADIR/faces~" 415 open my $fh, ">:perlio", "$DATADIR/facedata~"
362 or die "$DATADIR/faces~: $!"; 416 or die "$DATADIR/facedata~: $!";
363 417
418 $FACEINFO{""} = { version => 1};
364 print $fh Storable::nfreeze \%FACEINFO; 419 print $fh Storable::nfreeze \%FACEINFO;
365 } 420 }
366 421
367 for (qw(archetypes faces animations treasures smooth)) { 422 for (qw(archetypes facedata animations treasures)) {
368 chmod 0644, "$DATADIR/$_~"; 423 chmod 0644, "$DATADIR/$_~";
369 rename "$DATADIR/$_~", "$DATADIR/$_"; 424 rename "$DATADIR/$_~", "$DATADIR/$_"
425 or die "$DATADIR/$_: $!";
370 } 426 }
427
428 print "archetype data installed successfully.\n";
371 } 429 }
372} 430}
373 431
374Getopt::Long::Configure ("bundling", "no_ignore_case"); 432Getopt::Long::Configure ("bundling", "no_ignore_case");
375GetOptions ( 433GetOptions (

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines