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.22 by root, Thu Apr 5 13:50:49 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;
89 our $TRS;
86 our $NFILE; 90 our $NFILE;
87 our %ANIM; 91 our %ANIM;
88 92
93 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
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 }
131 140
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 }
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/^.*\///;
136 186
137 if (($w > $T || $h > $T) && $face !~ /_S\./) { 187 if (($w > $T || $h > $T) && $face !~ /_S\./) {
138 # split 188 # split
139 my @tile; 189 my @tile;
140 for my $x (0 .. (int $w / $T) - 1) { 190 for my $x (0 .. (int $w / $T) - 1) {
… …
154 (map { 204 (map {
155 ( 205 (
156 "(", 206 "(",
157 "+clone", 207 "+clone",
158 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T), 208 -crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
209 "+repage",
210 -quality => "00",
159 -write => "png:$_->[2]~", 211 -write => "png32:$_->[2]~",
160 "+delete", 212 "+delete",
161 ")", 213 ")",
162 ) 214 )
163 } @todo), 215 } @todo),
164 "null:"; 216 "null:";
… …
168 close $convert; 220 close $convert;
169 221
170 # pass 2, optimise, and rename 222 # pass 2, optimise, and rename
171 for (@todo) { 223 for (@todo) {
172 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 224 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
225 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
173 rename "$_->[2]~", $_->[2]; 226 rename "$_->[2]~", $_->[2];
174 } 227 }
175 }; 228 };
176 } 229 }
177 230
… …
181 234
182 if (0 > aio_load $file, $tile) { 235 if (0 > aio_load $file, $tile) {
183 die "$path: unable to read tile +$x+$y, aborting.\n"; 236 die "$path: unable to read tile +$x+$y, aborting.\n";
184 } 237 }
185 IO::AIO::aio_unlink $file unless $CACHE; 238 IO::AIO::aio_unlink $file unless $CACHE;
186 commit_png $x|$y ? "$face+$x+$y" : $face, $tile; 239 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
187 } 240 }
188 } else { 241 } else {
189 # use as-is (either small, use smooth) 242 # use as-is (either small, use smooth)
190 commit_png $face, $png; 243 commit_png $face, $png, $T;
191 } 244 }
245
246 aio_unlink $path if $delete;
192 } 247 }
193 } 248 }
194 249
195 sub process_arc { 250 sub process_arc {
196 while (@arc) { 251 while (@arc) {
… …
200 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/ 255 aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
201 256
202 my $arc = read_arch "$dir/$file"; 257 my $arc = read_arch "$dir/$file";
203 for my $o (values %$arc) { 258 for my $o (values %$arc) {
204 push @ARC, $o; 259 push @ARC, $o;
260
261 $o->{editor_folder} = $dir;
205 262
206 my $visibility = delete $o->{visibility}; 263 my $visibility = delete $o->{visibility};
207 my $magicmap = delete $o->{magicmap}; 264 my $magicmap = delete $o->{magicmap};
208 265
209 # find upper left corner :/ 266 # find upper left corner :/
… …
218 my $x = $o->{x} - $dx; 275 my $x = $o->{x} - $dx;
219 my $y = $o->{y} - $dy; 276 my $y = $o->{y} - $dy;
220 277
221 my $ext = $x|$y ? "+$x+$y" : ""; 278 my $ext = $x|$y ? "+$x+$y" : "";
222 279
223 $o->{face} .= $ext; 280 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/;
224 281
225 my $visibility = delete $o->{visibility} if exists $o->{visibility}; 282 my $visibility = delete $o->{visibility} if exists $o->{visibility};
226 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap}; 283 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
227 284
228 my $anim = delete $o->{anim}; 285 my $anim = delete $o->{anim};
229 286
230 if ($anim) { 287 if ($anim) {
231 $o->{animation} = "$o->{_name}$ext"; 288 $o->{animation} = "$o->{_name}";
232 289
233 for (@$anim) { 290 for (@$anim) {
234 $_ .= $ext unless /^facings\s/; 291 $_ .= $ext unless /^facings\s|^blank.x11$|^empty.x11$/;
235 } 292 }
236 293
237 $ANIM{"$o->{_name}$ext"} = 294 $ANIM{"$o->{_name}$ext"} =
238 join "", map "$_\n", 295 join "", map "$_\n",
239 "anim $o->{_name}$ext", 296 "anim $o->{_name}",
240 @$anim, 297 @$anim,
241 "mina"; 298 "mina";
242 } 299 }
243 300
244 for my $face ($o->{face} || (), @{$anim || []}) { 301 for my $face ($o->{face} || (), @{$anim || []}) {
245 next if /^facings\s/; 302 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
246 303
247 my $info = $FACEINFO{$face} ||= {}; 304 my $info = $FACEINFO{$face} ||= {};
248 305
249 $info->{visibility} = $visibility if defined $visibility; 306 $info->{visibility} = $visibility if defined $visibility;
250 $info->{magicmap} = $magicmap if defined $magicmap; 307 $info->{magicmap} = $magicmap if defined $magicmap;
308 }
309
310 if (my $smooth = delete $o->{smoothface}) {
311 my ($face, $smooth) = split /\s+/, $smooth;
312 # skip empty_S.x11, it seems to server no purpose whatsoever
313 # but increases bandwidth demands and worse.
314 unless ($smooth eq "empty_S.x11") {
315 $FACEINFO{$face}{smooth} = $smooth;
316 }
251 } 317 }
252 } 318 }
253 } 319 }
254 } 320 }
255 } 321 }
256 322
257 sub process_trs { 323 sub process_trs {
258 while (@trs) { 324 while (@trs) {
259 my ($dir, $file) = @{pop @trs}; 325 my ($dir, $file) = @{pop @trs};
326 my $path = "$dir/$file";
327
328 my $trs;
329 if (0 > aio_load $path, $trs) {
330 warn "$path: $!, skipping.\n";
331 next;
332 }
333
334 $TRS .= $trs;
260 } 335 }
261 } 336 }
262 337
263 sub find_files; 338 sub find_files;
264 sub find_files { 339 sub find_files {
… …
271 find_files "$path/$_" 346 find_files "$path/$_"
272 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 347 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
273 348
274 for my $file (@$nondirs) { 349 for my $file (@$nondirs) {
275 if ($file =~ /\.png$/) { 350 if ($file =~ /\.png$/) {
276 push @png, "$path/$file"; 351 push @png, ["$path/$file", 0];
277 } elsif ($file =~ /\.trs$/) { 352 } elsif ($file =~ /\.trs$/) {
278 push @trs, [$path, $file]; 353 push @trs, [$path, $file];
279 } elsif ($file =~ /\.arc$/) { 354 } elsif ($file =~ /\.arc$/) {
280 push @arc, [$path, $file]; 355 push @arc, [$path, $file];
281 } else { 356 } else {
… …
286 } 361 }
287 362
288 sub inst_arch($) { 363 sub inst_arch($) {
289 my (undef, $path) = @_; 364 my (undef, $path) = @_;
290 365
291 print "installing '$path' to '$DATADIR'\n\n"; 366 print "installing '$path' to '$DATADIR'\n",
367 "(this can take a long time if you run this\n",
368 "for the first time or do not use --cache).\n";
292 369
293 if (!-d "$path/treasures") { 370 if (!-d "$path/treasures") {
294 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 371 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
295 exit 1 unless $FORCE; 372 exit 1 unless $FORCE;
296 } 373 }
297 374
298 find_files $path; 375 find_files $path;
299 IO::AIO::flush; 376 IO::AIO::flush;
300 377
301 $_->join for ( 378 $_->join for (
302 (async \&process_png), (async \&process_png), 379 # four png crunchers work fine for my 2x smp machine
380 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
303 (async \&process_trs), (async \&process_trs), 381 (async \&process_trs), (async \&process_trs),
304 (async \&process_arc), (async \&process_arc), 382 (async \&process_arc), (async \&process_arc),
305 ); 383 );
306 384
307 { 385 {
… …
311 } 389 }
312 390
313 { 391 {
314 open my $fh, ">:utf8", "$DATADIR/archetypes~" 392 open my $fh, ">:utf8", "$DATADIR/archetypes~"
315 or die "$DATADIR/archetypes~: $!"; 393 or die "$DATADIR/archetypes~: $!";
394 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
316 print $fh Crossfire::archlist_to_string \@ARC; 395 print $fh Crossfire::archlist_to_string \@ARC;
396 }
397
398 {
399 open my $fh, ">:utf8", "$DATADIR/treasures~"
400 or die "$DATADIR/treasures~: $!";
401 print $fh $TRS;
317 } 402 }
318 403
319 { 404 {
320 while (my ($k, $v) = each %FACEINFO) { 405 while (my ($k, $v) = each %FACEINFO) {
321 $v->{data32} ||= delete $PNG32{$k}; 406 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"; 407 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
408
409 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
410 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
326 411
327 $v->{chksum32} = Digest::MD5::md5 $v->{data32}; 412 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
413 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
328 } 414 }
329 415
330 open my $fh, ">:perlio", "$DATADIR/faces~" 416 open my $fh, ">:perlio", "$DATADIR/facedata~"
331 or die "$DATADIR/faces~: $!"; 417 or die "$DATADIR/facedata~: $!";
332 418
419 $FACEINFO{""} = { version => 1};
333 print $fh Storable::nfreeze \%FACEINFO; 420 print $fh Storable::nfreeze \%FACEINFO;
334
335 #use PApp::Util; warn PApp::Util::dumpval \%FACEINFO;
336 } 421 }
337 422
338 for (qw(archetypes faces animations)) { 423 for (qw(archetypes facedata animations treasures)) {
339 chmod 0644, "$DATADIR/$_~"; 424 chmod 0644, "$DATADIR/$_~";
340 rename "$DATADIR/$_~", "$DATADIR/$_"; 425 rename "$DATADIR/$_~", "$DATADIR/$_"
426 or die "$DATADIR/$_: $!";
341 } 427 }
342 428
343 die "--install-arch not fully implemented\n"; 429 print "archetype data installed successfully.\n";
344 } 430 }
345} 431}
346 432
347Getopt::Long::Configure ("bundling", "no_ignore_case"); 433Getopt::Long::Configure ("bundling", "no_ignore_case");
348GetOptions ( 434GetOptions (

Diff Legend

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