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.3 by root, Wed Mar 7 18:04:44 2007 UTC vs.
Revision 1.24 by root, Thu Apr 12 14:18:06 2007 UTC

… …
19use File::Temp; 19use File::Temp;
20use Crossfire; 20use Crossfire;
21use Coro; 21use Coro;
22use Coro::AIO; 22use Coro::AIO;
23use POSIX (); 23use POSIX ();
24use Digest::MD5;
25use Storable; $Storable::canonical = 1;
24 26
25sub usage { 27sub usage {
26 warn <<EOF; 28 warn <<EOF;
27Usage: cfutil [-v] [-q] [--force] [--cache] 29Usage: cfutil [-v] [-q] [--force] [--cache]
28 [--install-arch path] 30 [--install-arch path]
… …
66} 68}
67 69
68sub inst_maps($) { 70sub inst_maps($) {
69 my (undef, $path) = @_; 71 my (undef, $path) = @_;
70 72
71 print "installing '$path' to '$DATADIR/maps'\n\n"; 73 print "installing '$path' to '$DATADIR/maps'\n";
72 74
73 if (!-f "$path/regions") { 75 if (!-f "$path/regions") {
74 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";
75 exit 1 unless $FORCE; 77 exit 1 unless $FORCE;
76 } 78 }
77 79
78 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";
79} 84}
80 85
81{ 86{
82 our @PNG; 87 our %ANIMINFO;
88 our %FACEINFO;
83 our @ARC; 89 our @ARC;
90 our $TRS;
84 our $NFILE; 91 our $NFILE;
85 92
93 our $QUANTIZE = "+dither -colorspace RGB -colors 256";
94
86 our (@png, @trs, @arc); # files we are interested in 95 our (@png, @trs, @arc); # files we are interested in
87 96
88 sub commit_png { 97 sub commit_png($$$) {
89 my ($name, $data) = @_; 98 my ($name, $data, $T) = @_;
90 #warn "$name: commited\n"; 99
100 $FACEINFO{$name}{"data$T"} = $data;
91 } 101 }
92 102
93 sub process_png { 103 sub process_png {
94 while (@png) { 104 while (@png) {
95 my $path = pop @png; 105 my ($path, $delete) = @{pop @png};
96 106
97 my $png; 107 my $png;
98 aio_lstat $path; 108 aio_lstat $path;
99 my ($size, $mtime) = (stat _)[7,9]; 109 my ($size, $mtime) = (stat _)[7,9];
100 110
101 if (0 > aio_load $path, $png) { 111 if (0 > aio_load $path, $png) {
102 warn "$path: $!, skipping.\n"; 112 warn "$path: $!, skipping.\n";
103 return; 113 next;
104 } 114 }
105 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
106 # quickly extratc width and height of the (necessarily PNG) image 128 # quickly extract width and height of the (necessarily PNG) image
107 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) { 129 unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
108 warn "$path: not a recongized png file, skipping.\n"; 130 warn "$path: not a recognized png file, skipping.\n";
109 return; 131 next;
110 } 132 }
111 133
112 my ($w, $h) = unpack "NN", $1; 134 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 135
122 if ($w < $T || $h < $T) { 136 if ($w < $T || $h < $T) {
123 warn "$path: too small ($w $h), skipping.\n"; 137 warn "$path: too small ($w $h), skipping.\n";
124 return; 138 next;
125 } 139 }
126 140
127 if ($w % $T || $h % $T) { 141 if ($w % $T || $h % $T) {
128 warn "$path: weird png size ($w $h), skipping.\n"; 142 warn "$path: weird png size ($w $h), skipping.\n";
129 return; 143 next;
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];
130 } 165 }
131 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)
132 if (($w > $T || $h > $T) && $face !~ /_S\./) { 188 if (($w > $T || $h > $T) && $face !~ /_S\./) {
133 # split 189 # split
134 my @tile; 190 my @tile;
135 for my $x (0 .. (int $w / $T) - 1) { 191 for my $x (0 .. (int $w / $T) - 1) {
136 for my $y (0 .. (int $h / $T) - 1) { 192 for my $y (0 .. (int $h / $T) - 1) {
… …
149 (map { 205 (map {
150 ( 206 (
151 "(", 207 "(",
152 "+clone", 208 "+clone",
153 -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),
210 "+repage",
211 -quality => "00",
154 -write => "png:$_->[2]~", 212 -write => "png32:$_->[2]~",
155 "+delete", 213 "+delete",
156 ")", 214 ")",
157 ) 215 )
158 } @todo), 216 } @todo),
159 "null:"; 217 "null:";
… …
163 close $convert; 221 close $convert;
164 222
165 # pass 2, optimise, and rename 223 # pass 2, optimise, and rename
166 for (@todo) { 224 for (@todo) {
167 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~"; 225 system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
226 die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
168 rename "$_->[2]~", $_->[2]; 227 rename "$_->[2]~", $_->[2];
169 } 228 }
170 }; 229 };
171 } 230 }
172 231
… …
176 235
177 if (0 > aio_load $file, $tile) { 236 if (0 > aio_load $file, $tile) {
178 die "$path: unable to read tile +$x+$y, aborting.\n"; 237 die "$path: unable to read tile +$x+$y, aborting.\n";
179 } 238 }
180 IO::AIO::aio_unlink $file unless $CACHE; 239 IO::AIO::aio_unlink $file unless $CACHE;
181 commit_png $x|$y ? "$face+$x+$y" : $face, $tile; 240 commit_png $x|$y ? "$face+$x+$y" : $face, $tile, $T;
182 } 241 }
183 } else { 242 } else {
184 # use as-is (either small, use smooth) 243 # use as-is (either small, use smooth)
185 commit_png $face, $png; 244 commit_png $face, $png, $T;
186 } 245 }
246
247 aio_unlink $path if $delete;
187 } 248 }
188 } 249 }
189 250
190 sub process_arc { 251 sub process_arc {
191 while (@arc) { 252 while (@arc) {
192 my ($dir, $file) = @{pop @arc}; 253 my ($dir, $file) = @{pop @arc};
193 254
194 my $arc; 255 my $arc;
195 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 :/
257
196 my $arc = read_arch "$dir/$file"; 258 my $arc = read_arch "$dir/$file";
259 for my $o (values %$arc) {
260 push @ARC, $o;
261
262 $o->{editor_folder} = $dir;
263
264 my $visibility = delete $o->{visibility};
265 my $magicmap = delete $o->{magicmap};
266
267 # find upper left corner :/
268 # omg, this is sooo broken
269 my ($dx, $dy);
270 for (my $o = $o; $o; $o = $o->{more}) {
271 $dx = $o->{x} if $o->{x} < $dx;
272 $dy = $o->{y} if $o->{y} < $dy;
273 }
274
275 for (my $o = $o; $o; $o = $o->{more}) {
276 my $x = $o->{x} - $dx;
277 my $y = $o->{y} - $dy;
278
279 my $ext = $x|$y ? "+$x+$y" : "";
280
281 $o->{face} .= $ext unless /^blank.x11$|^empty.x11$/;
282
283 my $visibility = delete $o->{visibility} if exists $o->{visibility};
284 my $magicmap = delete $o->{magicmap} if exists $o->{magicmap};
285
286 my $anim = delete $o->{anim};
287
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.
292 $o->{animation} = "$o->{_name}";
293 my $facings = 1;
294 my @frames;
295
296 for (@$anim) {
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 }
304 }
305
306 $ANIMINFO{$o->{animation}} = {
307 facings => $facings,
308 frames => \@frames,
309 };
310 }
311
312 for my $face ($o->{face} || (), @{$anim || []}) {
313 next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/;
314
315 my $info = $FACEINFO{$face} ||= {};
316
317 $info->{visibility} = $visibility if defined $visibility;
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 }
328 }
329 }
330 }
197 } 331 }
198 } 332 }
199 333
200 sub process_trs { 334 sub process_trs {
201 while (@trs) { 335 while (@trs) {
202 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;
203 } 346 }
204 } 347 }
205 348
206 sub find_files; 349 sub find_files;
207 sub find_files { 350 sub find_files {
… …
214 find_files "$path/$_" 357 find_files "$path/$_"
215 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 358 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
216 359
217 for my $file (@$nondirs) { 360 for my $file (@$nondirs) {
218 if ($file =~ /\.png$/) { 361 if ($file =~ /\.png$/) {
219 push @png, "$path/$file"; 362 push @png, ["$path/$file", 0];
220 } elsif ($file =~ /\.trs$/) { 363 } elsif ($file =~ /\.trs$/) {
221 push @trs, [$path, $file]; 364 push @trs, [$path, $file];
222 } elsif ($file =~ /\.arc$/) { 365 } elsif ($file =~ /\.arc$/) {
223 push @arc, [$path, $file]; 366 push @arc, [$path, $file];
224 } else { 367 } else {
… …
229 } 372 }
230 373
231 sub inst_arch($) { 374 sub inst_arch($) {
232 my (undef, $path) = @_; 375 my (undef, $path) = @_;
233 376
234 print "installing '$path' to '$DATADIR'\n\n"; 377 print "installing '$path' to '$DATADIR'\n",
378 "(this can take a long time if you run this\n",
379 "for the first time or do not use --cache).\n";
235 380
236 if (!-d "$path/treasures") { 381 if (!-d "$path/treasures") {
237 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n"; 382 warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
238 exit 1 unless $FORCE; 383 exit 1 unless $FORCE;
239 } 384 }
240 385
241 find_files $path; 386 find_files $path;
242 IO::AIO::flush; 387 IO::AIO::flush;
243 388
244 $_->join for ( 389 $_->join for (
245 (async \&process_png), (async \&process_png), 390 # four png crunchers work fine for my 2x smp machine
391 (async \&process_png), (async \&process_png), (async \&process_png), (async \&process_png),
246 (async \&process_trs), (async \&process_trs), 392 (async \&process_trs), (async \&process_trs),
247 (async \&process_arc), (async \&process_arc), 393 (async \&process_arc), (async \&process_arc),
248 ); 394 );
249 395
250 die "--install-arch not yet implemented\n"; 396 {
397 open my $fh, ">:utf8", "$DATADIR/archetypes~"
398 or die "$DATADIR/archetypes~: $!";
399 substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;
400 print $fh Crossfire::archlist_to_string \@ARC;
401 }
402
403 {
404 open my $fh, ">:utf8", "$DATADIR/treasures~"
405 or die "$DATADIR/treasures~: $!";
406 print $fh $TRS;
407 }
408
409 {
410 while (my ($k, $v) = each %FACEINFO) {
411 length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
412 length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
413
414 length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
415 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
416
417 $v->{chksum32} = Digest::MD5::md5 $v->{data32};
418 $v->{chksum64} = Digest::MD5::md5 $v->{data64};
419 }
420
421 open my $fh, ">:perlio", "$DATADIR/facedata~"
422 or die "$DATADIR/facedata~: $!";
423
424 print $fh Storable::nfreeze {
425 version => 2,
426 faceinfo => \%FACEINFO,
427 animinfo => \%ANIMINFO,
428 };
429 }
430
431 for (qw(archetypes facedata treasures)) {
432 chmod 0644, "$DATADIR/$_~";
433 rename "$DATADIR/$_~", "$DATADIR/$_"
434 or die "$DATADIR/$_: $!";
435 }
436
437 print "archetype data installed successfully.\n";
251 } 438 }
252} 439}
253 440
254Getopt::Long::Configure ("bundling", "no_ignore_case"); 441Getopt::Long::Configure ("bundling", "no_ignore_case");
255GetOptions ( 442GetOptions (

Diff Legend

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