[ViewVC] Diff of: cvs/deliantra/server/utils/cfutil.in

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.14 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.96 by root, Wed Oct 6 00:28:15 2010 UTC

…		…
1	#!@PERL@	1	#!@PERL@
2		2
3	use strict;	3	#
		4	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
		5	#
		6	# Copyright (©) 2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
		7	#
		8	# Deliantra is free software: you can redistribute it and/or modify it under
		9	# the terms of the Affero GNU General Public License as published by the
		10	# Free Software Foundation, either version 3 of the License, or (at your
		11	# option) any later version.
		12	#
		13	# This program is distributed in the hope that it will be useful,
		14	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		15	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		16	# GNU General Public License for more details.
		17	#
		18	# You should have received a copy of the Affero GNU General Public License
		19	# and the GNU General Public License along with this program. If not, see
		20	# <http://www.gnu.org/licenses/>.
		21	#
		22	# The authors can be reached via e-mail to <support@deliantra.net>
		23	#
		24
		25	use common::sense;
4		26
5	my $prefix = "@prefix@";	27	my $prefix = "@prefix@";
6	my $exec_prefix = "@exec_prefix@";	28	my $exec_prefix = "@exec_prefix@";
7	my $datarootdir = "@datarootdir@";	29	my $datarootdir = "@datarootdir@";
8	my $DATADIR = "@datadir@/@PACKAGE@";	30	my $DATADIR = "@datadir@/@PACKAGE@";
9		31
10	my $CONVERT = "@CONVERT@";	32	my $CONVERT = "@CONVERT@";
11	my $IDENTIFY = "@IDENTIFY@";	33	#my $IDENTIFY = "@IDENTIFY@";
12	my $OPTIPNG = "@OPTIPNG@";	34	my $OPTIPNG = "@OPTIPNG@";
13	my $RSYNC = "@RSYNC@";	35	my $RSYNC = "@RSYNC@";
		36	my $PNGNQ = "@PNGNQ@";
14		37
15	use Getopt::Long;	38	use Getopt::Long;
		39	use File::Temp;
		40	use POSIX ();
		41	use Carp;
		42
16	use Coro::Event;	43	use Coro::EV;
17	use AnyEvent;	44	use AnyEvent;
		45	use YAML::XS ();
		46	use JSON::XS ();
18	use IO::AIO ();	47	use IO::AIO ();
19	use File::Temp;	48	use Digest::MD5 ();
20	use Crossfire;	49
21	use Coro;	50	use Coro 5.12;
22	use Coro::AIO;	51	use Coro::AIO;
23	use POSIX ();	52	use Coro::Util;
24	use Digest::MD5;	53	use Coro::Channel;
		54	use Coro::Storable; $Storable::canonical = 1;
		55
		56	use Deliantra;
		57
		58	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
25		59
26	sub usage {	60	sub usage {
27	warn <<EOF;	61	warn <<EOF;
28	Usage: cfutil [-v] [-q] [--force] [--cache]	62	Usage: cfutil [-v] [-q] [--force] [--cache]
29	[--install-arch path]	63	[--install-arch path]
40	my $VERBOSE = 1;	74	my $VERBOSE = 1;
41	my $CACHE = 0;	75	my $CACHE = 0;
42	my $FORCE;	76	my $FORCE;
43	my $TMPDIR = "/tmp/cfutil$$~";	77	my $TMPDIR = "/tmp/cfutil$$~";
44	my $TMPFILE = "aaaa0";	78	my $TMPFILE = "aaaa0";
		79	my @COMMIT;
		80
		81	our %COLOR = (
		82	black => 0,
		83	white => 1,
		84	navy => 2,
		85	red => 3,
		86	orange => 4,
		87	blue => 5,
		88	darkorange => 6,
		89	green => 7,
		90	lightgreen => 8,
		91	grey => 9,
		92	brown => 10,
		93	gold => 11,
		94	tan => 12,
		95	);
45		96
46	END { system "rm", "-rf", $TMPDIR }	97	END { system "rm", "-rf", $TMPDIR }
47		98
48	Event->signal (signal => "INT", cb => sub { exit 1 });	99	my $s_INT = EV::signal INT => sub { exit 1 };
49	Event->signal (signal => "TERM", cb => sub { exit 1 });	100	my $s_TERM = EV::signal TERM => sub { exit 1 };
		101
		102	our %hash;
		103
		104	# here we could try to avoid collisions and reduce chksum size further
		105	sub make_hash($\$\$;$) {
		106	my ($id, $dataref, $hashref, $clen) = @_;
		107
		108	my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen \|\| 4;
		109
		110	if (exists $hash{$hash}) {
		111	# hash collision, but some files are simply identical
		112	if (${$hash{$hash}[1]} ne $$dataref) {
		113	warn "hash collision $hash{$hash}[0] vs. $id\n";
		114	exit 1;
		115	} else {
		116	print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
		117	}
		118	}
		119	$hash{$hash} = [$id, $dataref, $hashref];
		120
		121	$$hashref = $hash;
		122	}
50		123
51	mkdir $TMPDIR, 0700	124	mkdir $TMPDIR, 0700
52	or die "$TMPDIR: $!";	125	or die "$TMPDIR: $!";
53		126
54	sub fork_sub(&) {	127	sub fork_sub(&) {
…		…
67	}	140	}
68		141
69	sub inst_maps($) {	142	sub inst_maps($) {
70	my (undef, $path) = @_;	143	my (undef, $path) = @_;
71		144
72	print "installing '$path' to '$DATADIR/maps'\n";	145	print "\nInstalling '$path' to '$DATADIR/maps'\n\n";
73		146
74	if (!-f "$path/regions") {	147	if (!-f "$path/regions") {
75	warn "'$path' does not look like a maps directory ('regions' file is missing).\n";	148	warn "'$path' does not look like a maps directory ('regions' file is missing).\n";
76	exit 1 unless $FORCE;	149	exit 1 unless $FORCE;
77	}	150	}
78		151
79	system $RSYNC, "-av", "$path/.", "$DATADIR/maps/.", "--delete", "--exclude", "CVS", "--delete-excluded"	152	system $RSYNC, "-av", "--chmod=u=rwX,go=rX",
		153	"$path/.", "$DATADIR/maps/.",
		154	"--exclude", "CVS", "--exclude", "/world-precomposed",
		155	"--delete", "--delete-excluded"
80	or die "map installation failed.\n";	156	and die "map installation failed.\n";
81		157
82	print "maps installed successfully.\n";	158	print "maps installed successfully.\n";
83	}	159	}
84		160
		161	our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
		162
		163	sub autoglyph {
		164	my ($stem, $face) = @_;
		165
		166	if ($stem =~ /^wall\/\|Nimwall/) {
		167	return $WALL_SUFFIX[hex $1]
		168	if $stem =~ /(_[0-9A-F]).x11/;
		169
		170	"+"
		171
		172	} elsif ($stem =~ /^monster.*\/(.)/) {
		173	$1
		174
		175	} elsif ($stem =~ /^floor\/\|^ground\/\|Nimfloor/) {
		176	"."
		177
		178	} elsif ($stem =~ /^player\//) {
		179	"\@"
		180
		181	} else {
		182	substr $stem, 0, 1
		183	}
		184	}
		185
85	{	186	{
86	our %PNG32;	187	our %ANIMINFO;
87	our %FACEINFO;	188	our %FACEINFO;
		189	our %RESOURCE;
88	our @ARC;	190	our @ARC;
		191	our %ARC;
89	our $TRS;	192	our $TRS;
90	our $NFILE;	193	our $NFILE;
91	our %ANIM;	194	our $PATH;
92		195
93	our (@png, @trs, @arc); # files we are interested in	196	our $QUANTIZE = "+dither -colorspace RGB -colors 256";
94		197
		198	our $c_arc = new Coro::Channel;
		199	our $c_trs = new Coro::Channel;
		200	our $c_res = new Coro::Channel;
		201
		202	our @c_png;
		203
95	sub commit_png {	204	sub commit_png($$$$) {
96	my ($name, $data) = @_;	205	my ($stem, $name, $data, $T) = @_;
97		206
98	$PNG32{$name} = $data;	207	$FACEINFO{$name}{"stem"} = substr $stem, 1 + length $PATH;
99	$FACEINFO{$name} \|\|= {};	208	$FACEINFO{$name}{"data$T"} = $data;
100	}	209	}
101		210
102	sub process_png {	211	sub process_png {
103	while (@png) {	212	while (@c_png) {
104	my $path = pop @png;	213	my ($path, $delete) = @{pop @c_png};
105		214
106	my $png;	215	my $png;
107	aio_lstat $path;	216	aio_lstat $path;
108	my ($size, $mtime) = (stat _)[7,9];	217	my ($size, $mtime) = (stat _)[7,9];
109		218
110	if (0 > aio_load $path, $png) {	219	if (0 > aio_load $path, $png) {
111	warn "$path: $!, skipping.\n";	220	warn "$path: $!, skipping.\n";
112	next;	221	next;
113	}	222	}
114		223
		224	my $stem = $path;
		225	my $T;
		226
		227	if ($stem =~ s/\.32x32\.png~?$//) {
		228	$T = 32;
		229	} elsif ($stem =~ s/\.64x64\.png~?$//) {
		230	$T = 64;
		231	} else {
		232	warn "$path: weird filename, skipping.\n";
		233	next;
		234	}
		235
115	# quickly extract width and height of the (necessarily PNG) image	236	# quickly extract width and height of the (necessarily PNG) image
116	unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {	237	unless ($png =~ /^\x89PNG\x0d\x0a\x1a\x0a....IHDR(........)/s) {
117	warn "$path: not a recongized png file, skipping.\n";	238	warn "$path: not a recognized png file, skipping.\n";
118	next;	239	next;
119	}	240	}
120		241
121	my ($w, $h) = unpack "NN", $1;	242	my ($w, $h) = unpack "NN", $1;
122
123	(my $face = $path) =~ s/^.*\///;
124	my $T = 32;
125
126	unless ($face =~ s/\.base\.(...)\.png$/.$1/) {
127	warn "$path: weird filename, skipping.\n";
128	next;
129	}
130		243
131	if ($w < $T \|\| $h < $T) {	244	if ($w < $T \|\| $h < $T) {
132	warn "$path: too small ($w $h), skipping.\n";	245	warn "$path: too small ($w $h), skipping.\n";
133	next;	246	next;
134	}	247	}
…		…
136	if ($w % $T \|\| $h % $T) {	249	if ($w % $T \|\| $h % $T) {
137	warn "$path: weird png size ($w $h), skipping.\n";	250	warn "$path: weird png size ($w $h), skipping.\n";
138	next;	251	next;
139	}	252	}
140		253
		254	(my $base = $stem) =~ s/^.*\///;
		255
		256	my $fi = $FACEINFO{$base};
		257	unless ($fi) {
		258	#warn "$path: <$base> not referenced by any archetype, skipping.\n";
		259	#next;
		260	}
		261
		262	my $arc = $fi->{arc} \|\| { };
		263
		264	unless ($path =~ /~$/) {
		265	# possibly enlarge
		266	if (0 > aio_stat "$stem.64x64.png") {
		267	my $other = "$stem.64x64.png~";
		268
		269	if (0 > aio_lstat $other or (-M _) > (-M $path)) {
		270	fork_sub {
		271	my $CROP;
		272	my $SRC = "png:\Q$path\E";
		273
		274	my $is_floor = $arc->{is_floor};
		275	my $is_wall = 0;
		276
		277	my ($wall_pfx, $wall_dir, $wall_sfx);
		278
		279	if (
		280	!$is_floor
		281	&& !$arc->{alive}
		282	&& $arc->{move_block} eq "all"
		283	&& $path =~ /^(._)([0-9A-F])(\.x11.\.png)$/
		284	) {
		285	($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3);
		286
		287	unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) {
		288	$is_wall = 1;
		289	}
		290	}
		291
		292	if ($is_wall \|\| $is_floor) {
		293	# add a 4px border and add other images around it
		294	$CROP = "-shave 8x8 +repage";
		295
		296	$w += 8;
		297	$h += 8;
		298
		299	$SRC = "-size ${w}x${h} xc:transparent";
		300	$SRC .= " png:\Q$path\E -geometry +4+4 -composite";
		301
		302	# 8 surrounding images
		303	for (
		304	# x y b r0 r1
		305	[-1, -1, 0, 6],
		306	[ 0, -1, 1, 10, 14],
		307	[+1, -1, 0, 12],
		308
		309	[-1, 0, 8, 5, 7],
		310	#
		311	[+1, 0, 2, 5, 13],
		312
		313	[-1, +1, 0, 3],
		314	[ 0, +1, 4, 10, 11],
		315	[+1, +1, 0, 9],
		316	) {
		317	my ($x, $y, $d, $r0, $r1) = @$_;
		318
		319	my $tile = $is_floor ? $path
		320	: $is_wall ? sprintf "%s%X%s", $wall_pfx, ($wall_dir & $d) ? $r1 : $r0, $wall_sfx
		321	: die;
		322
		323	$SRC .= sprintf " png:%s -geometry %+d%+d -composite",
		324	"\Q$tile",
		325	$x * ($w - 8) + 4,
		326	$y * ($h - 8) + 4;
		327	}
		328	}
		329
		330	system "convert -depth 8 $SRC rgba:-"
		331	. "\| $exec_prefix/bin/cfhq2xa $w $h 0"
		332	. "\| convert -depth 8 -size ".($w * 2)."x".($h * 2)." rgba:- $CROP $QUANTIZE -quality 00 png32:\Q$other\E~"
		333	and die "convert/cfhq2xa pipeline error: status $? ($!)";
		334	system $OPTIPNG, "-i0", "-q", "$other~";
		335	die "$other~ has zero size, aborting." unless -s "$other~";
		336	rename "$other~", $other;
		337	};
		338	}
		339
		340	push @c_png, [$other, !$CACHE];
		341	}
		342
		343	# possibly scale down
		344	if (0 > aio_stat "$stem.32x32.png") {
		345	my $other = "$stem.32x32.png~";
		346
		347	if (0 > aio_lstat $other or (-M _) > (-M $path)) {
		348	fork_sub {
		349	system "convert png:\Q$path\E -geometry 50% -filter lanczos $QUANTIZE -quality 00 png32:\Q$other\E~";
		350	system $OPTIPNG, "-i0", "-q", "$other~";
		351
		352	# reduce smoothfaces >10000 bytes
		353	# obsolete, no longer required
		354	if (0 && $stem =~ /_S\./ && (-s "$other~") > 10000) {
		355	my $ncolor = 256;
		356	while () {
		357	system "<\Q$other~\E $PNGNQ -s1 -n$ncolor >\Q$other~~\E";
		358	system $OPTIPNG, "-i0", "-q", "$other~~";
		359	last if 10000 > -s "$other~~";
		360	$ncolor = int $ncolor * 0.9;
		361	$ncolor > 8 or die "cannot reduce filesize to < 10000 bytes";
		362	}
		363
		364	printf "reduced %s from %d to %d bytes using %d colours.\n",
		365	$other, -s "$other~", -s "$other~~", $ncolor
		366	if $VERBOSE >= 2;
		367	rename "$other~~", "$other~";
		368	}
		369
		370	die "$other~ has zero size, aborting." unless -s "$other~";
		371	rename "$other~", $other;
		372	};
		373	}
		374
		375	#warn "scaled down $path to $other\n";#d#
		376	push @c_png, [$other, !$CACHE];
		377	}
		378	}
		379
		380	(my $face = $stem) =~ s/^.*\///;
		381
		382	# split all bigfaces, but avoid smoothfaces (*_S)
141	if (($w > $T \|\| $h > $T) && $face !~ /_S\./) {	383	if (($w > $T \|\| $h > $T) && $face !~ /_S\./) {
142	# split	384	# split
143	my @tile;	385	my @tile;
144	for my $x (0 .. (int $w / $T) - 1) {	386	for my $x (0 .. (int $w / $T) - 1) {
145	for my $y (0 .. (int $h / $T) - 1) {	387	for my $y (0 .. (int $h / $T) - 1) {
…		…
159	(	401	(
160	"(",	402	"(",
161	"+clone",	403	"+clone",
162	-crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),	404	-crop => (sprintf "%dx%d+%d+%d", $T, $T, $_->[0] * $T, $_->[1] * $T),
163	"+repage",	405	"+repage",
		406	-quality => "00",
164	-write => "png:$_->[2]~",	407	-write => "png32:$_->[2]~",
165	"+delete",	408	"+delete",
166	")",	409	")",
167	)	410	)
168	} @todo),	411	} @todo),
169	"null:";	412	"null:";
…		…
173	close $convert;	416	close $convert;
174		417
175	# pass 2, optimise, and rename	418	# pass 2, optimise, and rename
176	for (@todo) {	419	for (@todo) {
177	system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";	420	system $OPTIPNG, "-o5", "-i0", "-q", "$_->[2]~";
		421	die "$_->[2]~ has zero size, aborting." unless -s "$_->[2]~";
178	rename "$_->[2]~", $_->[2];	422	rename "$_->[2]~", $_->[2];
179	}	423	}
180	};	424	};
181	}	425	}
182		426
…		…
186		430
187	if (0 > aio_load $file, $tile) {	431	if (0 > aio_load $file, $tile) {
188	die "$path: unable to read tile +$x+$y, aborting.\n";	432	die "$path: unable to read tile +$x+$y, aborting.\n";
189	}	433	}
190	IO::AIO::aio_unlink $file unless $CACHE;	434	IO::AIO::aio_unlink $file unless $CACHE;
191	commit_png $x\|$y ? "$face+$x+$y" : $face, $tile;	435	commit_png $stem, $x\|$y ? "$face+$x+$y" : $face, $tile, $T;
192	}	436	}
193	} else {	437	} else {
194	# use as-is (either small, use smooth)	438	# use as-is (either small, use smooth)
195	commit_png $face, $png;	439	commit_png $stem, $face, $png, $T;
196	}	440	}
		441
		442	aio_unlink $path if $delete;
197	}	443	}
198	}	444	}
199		445
200	sub process_arc {	446	sub process_arc {
201	while (@arc) {	447	while (my $job = $c_arc->get) {
202	my ($dir, $file) = @{pop @arc};	448	my ($dir, $file) = @$job;
203		449
204	my $arc;	450	my $arc;
205	aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/	451	aio_load "$dir/$file", $arc; # simply pre-cache, as read_arch wants a file :/
206		452
207	my $arc = read_arch "$dir/$file";	453	my $arc = read_arch "$dir/$file";
208	for my $o (values %$arc) {	454	for my $o (values %$arc) {
209	push @ARC, $o;	455	push @ARC, $o;
		456	for (my $m = $o; $m; $m = $m->{more}) {
		457	$ARC{$m->{_name}} = $m;
		458	}
210		459
211	$o->{editor_folder} = $dir;	460	$o->{editor_folder} \|\|= "\x00$dir"; # horrible kludge
212		461
213	my $visibility = delete $o->{visibility};	462	my $visibility = delete $o->{visibility};
214	my $magicmap = delete $o->{magicmap};	463	my $magicmap = delete $o->{magicmap};
		464	my $glyph = delete $o->{glyph};
215		465
216	# find upper left corner :/	466	# find upper left corner :/
217	# omg, this is sooo broken	467	# omg, this is sooo broken
218	my ($dx, $dy);	468	my ($dx, $dy);
219	for (my $o = $o; $o; $o = $o->{more}) {	469	for (my $o = $o; $o; $o = $o->{more}) {
…		…
225	my $x = $o->{x} - $dx;	475	my $x = $o->{x} - $dx;
226	my $y = $o->{y} - $dy;	476	my $y = $o->{y} - $dy;
227		477
228	my $ext = $x\|$y ? "+$x+$y" : "";	478	my $ext = $x\|$y ? "+$x+$y" : "";
229		479
230	$o->{face} .= $ext unless /^blank.x11$\|^empty.x11$/;	480	$o->{face} .= $ext unless /^blank.x11$\|^empty.x11$/ \|\| !$o->{face};
231		481
232	my $visibility = delete $o->{visibility} if exists $o->{visibility};	482	$visibility = delete $o->{visibility} if exists $o->{visibility};
233	my $magicmap = delete $o->{magicmap} if exists $o->{magicmap};	483	$magicmap = delete $o->{magicmap} if exists $o->{magicmap};
		484	$glyph = delete $o->{glyph} if exists $o->{glyph};
234		485
235	my $anim = delete $o->{anim};	486	my $anim = delete $o->{anim};
236		487
237	if ($anim) {	488	if ($anim) {
		489	# possibly add $ext to the animation name to avoid
		490	# the need to specify archnames for all parts
		491	# of a multipart archetype.
238	$o->{animation} = "$o->{_name}";	492	$o->{animation} = "$o->{_name}";
		493	my $facings = 1;
		494	my @frames;
239		495
240	for (@$anim) {	496	for (@$anim) {
241	$_ .= $ext unless /^facings\s\|^blank.x11$\|^empty.x11$/;	497	if (/^facings\s+(\d+)/) {
		498	$facings = $1*1;
		499	} elsif (/^blank.x11$\|^empty.x11$/) {
		500	push @frames, $_;
		501	} else {
		502	push @frames, "$_$ext";
		503	}
242	}	504	}
243		505
244	$ANIM{"$o->{_name}$ext"} =	506	$ANIMINFO{$o->{animation}} = {
245	join "", map "$_\n",	507	facings => $facings,
246	"anim $o->{_name}",	508	frames => \@frames,
247	@$anim,	509	};
248	"mina";
249	}	510	}
250		511
251	for my $face ($o->{face} \|\| (), @{$anim \|\| []}) {	512	for ($o->{face} \|\| (), @{$anim \|\| []}) {
252	next if $face =~ /^facings\s\|^blank.x11$\|^empty.x11$/;	513	next if /^facings\s/;
253		514
		515	my $face = $_;
		516	$face =~ s/\+\d+\+\d+$//; # remove tile offset coordinates
		517
254	my $info = $FACEINFO{$face} \|\|= {};	518	my $info = $FACEINFO{$face} \|\|= { };
		519	$info->{arc} = $o;
		520
		521	next if $face =~ /^blank.x11$\|^empty.x11$/;
255		522
256	$info->{visibility} = $visibility if defined $visibility;	523	$info->{visibility} = $visibility if defined $visibility;
257	$info->{magicmap} = $magicmap if defined $magicmap;	524	$info->{magicmap} = $magicmap if defined $magicmap;
		525	$info->{glyph} = $glyph if defined $glyph;
258	}	526	}
259		527
260	if (my $smooth = delete $o->{smoothface}) {	528	if (my $smooth = delete $o->{smoothface}) {
261	my ($face, $smooth) = split /\s+/, $smooth;	529	my %kv = split /\s+/, $smooth;
262	# skip empty_S.x11, it seems to server no purpose whatsoever	530	my $level = $o->{smoothlevel}; #TODO: delete from $o if !gcfclient-support
263	# but increases bandwidth demands and worse.	531	while (my ($face, $smooth) = each %kv) {
264	unless ($smooth eq "empty_S.x11") {	532	$FACEINFO{$smooth}{arc} = $o;
		533
265	$FACEINFO{$face}{smooth} = $smooth;	534	$FACEINFO{$face}{smooth} = $smooth;
		535	$FACEINFO{$face}{smoothlevel} = $level;
266	}	536	}
267	}	537	}
268	}	538	}
269	}	539	}
270	}	540	}
271	}	541	}
272		542
273	sub process_trs {	543	sub process_trs {
274	while (@trs) {	544	while (my $job = $c_trs->get) {
275	my ($dir, $file) = @{pop @trs};	545	my ($dir, $file) = @$job;
276	my $path = "$dir/$file";	546	my $path = "$dir/$file";
277		547
278	my $trs;	548	my $trs;
279	if (0 > aio_load $path, $trs) {	549	if (0 > aio_load $path, $trs) {
280	warn "$path: $!, skipping.\n";	550	warn "$path: $!, skipping.\n";
…		…
283		553
284	$TRS .= $trs;	554	$TRS .= $trs;
285	}	555	}
286	}	556	}
287		557
		558	my %FILECACHE;
		559
		560	sub load_cached($;$) {
		561	unless (exists $FILECACHE{$_[0]}) {
		562	my $data;
		563	if (0 < aio_load $_[0], $data) {
		564	if ($_[1]) {
		565	$data = eval { $_[1]->($data) };
		566	warn "$_[0]: $@" if $@;
		567	}
		568	}
		569
		570	$FILECACHE{$_[0]} = $data;
		571	}
		572
		573	$FILECACHE{$_[0]}
		574	}
		575
		576	sub process_res {
		577	while (my $job = $c_res->get) {
		578	my ($dir, $file, $type) = @$job;
		579
		580	my $data;
		581	aio_load "$dir/$file", $data;
		582
		583	my $meta = load_cached "$dir/meta", sub { JSON::XS->new->utf8->relaxed->decode (shift) };
		584
		585	utf8::decode $dir;
		586	utf8::decode $file;
		587
		588	# a meta file for resources is now mandatory
		589	unless (exists $meta->{$file}) {
		590	warn "skipping $dir/$file\n" if $VERBOSE >= 3;
		591	next;
		592	}
		593
		594	$meta = {
		595	%{ $meta->{"" } \|\| {} },
		596	%{ $meta->{$file} \|\| {} },
		597	};
		598
		599	if ($meta->{license} =~ s/^#//) {
		600	$meta->{license} = ({
		601	"pd" => "Public Domain",
		602	"gpl" => "GNU General Public License, version 3.0 or any later",
		603	"cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
		604	"cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",
		605	"cc/by/2.5" => "Licensed under Creative Commons Attribution 2.5 http://creativecommons.org/licenses/by/2.5/",
		606	"cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
		607	})->{$meta->{license}}
		608	\|\| warn "$dir/$file: license tag '$meta->{license}' not found.";
		609	}
		610
		611	if (!exists $meta->{author} && $meta->{source} =~ m%^http://www.jamendo.com/en/artist/(.*)$%) {
		612	($meta->{author} = $1) =~ s/_/ /g;
		613	}
		614
		615	$file =~ s/\.res$//;
		616	$file =~ s/\.(ogg\|wav\|jpg\|png)$//;
		617
		618	substr $dir, 0, 1 + length $PATH, "";
		619
		620	if (my $filter = $meta->{cfutil_filter}) {
		621	if ($filter eq "yaml2json") {
		622	$data = JSON::XS::encode_json YAML::XS::Load $data;
		623	} elsif ($filter eq "json2json") {
		624	$data = JSON::XS::encode_json JSON::XS->relaxed->utf8->decode ($data);
		625	} elsif ($filter eq "perl2json") {
		626	$data = eval $data; die if $@;
		627	$data = JSON::XS::encode_json $data;
		628	} else {
		629	warn "$dir/$file: unknown filter $filter, skipping\n";
		630	}
		631	}
		632
		633	$RESOURCE{"$dir/$file"} = {
		634	type => (exists $meta->{type} ? delete $meta->{type} : $type),
		635	data => $data,
		636	%$meta ? (meta => $meta) : (),
		637	};
		638	}
		639	}
		640
288	sub find_files;	641	sub find_files;
289	sub find_files {	642	sub find_files {
290	my ($path) = @_;	643	my ($path) = @_;
291		644
292	IO::AIO::aioreq_pri 4;	645	IO::AIO::aioreq_pri 4;
293	IO::AIO::aio_scandir $path, 4, sub {	646	IO::AIO::aio_scandir $path, 4, sub {
294	my ($dirs, $nondirs) = @_;	647	my ($dirs, $nondirs) = @_;
295		648
296	find_files "$path/$_"	649	find_files "$path/$_"
297	for grep $_ !~ /^(?:CVS\|dev)$/, @$dirs;	650	for grep $_ !~ /^(?:CVS\|dev\|\..*)$/, @$dirs;
		651
		652	my $dir = $path;
		653	substr $dir, 0, 1 + length $PATH, "";
298		654
299	for my $file (@$nondirs) {	655	for my $file (@$nondirs) {
		656	if ($dir =~ /^music(?:\/\|$)/) {
		657	$c_res->put ([$path, $file, 3]) # FT_MUSIC
		658	if $file =~ /\.(ogg)$/;
		659
		660	} elsif ($dir =~ /^sound(?:\/\|$)/) {
		661	$c_res->put ([$path, $file, 5]) # FT_SOUND
		662	if $file =~ /\.(wav\|ogg)$/;
		663
		664	} elsif ($dir =~ /^res(?:\/\|$)/) {
		665	if ($file =~ /\.(jpg\|png)$/) {
		666	$c_res->put ([$path, $file, 0]) # FT_FACE
		667	} elsif ($file =~ /\.(res)$/) {
		668	$c_res->put ([$path, $file, 6]) # FT_RSRC
		669	} else {
		670	$c_res->put ([$path, $file, undef]);
		671	}
		672
300	if ($file =~ /\.png$/) {	673	} elsif ($file =~ /\.png$/) {
301	push @png, "$path/$file";	674	push @c_png, ["$path/$file", 0];
		675
302	} elsif ($file =~ /\.trs$/) {	676	} elsif ($file =~ /\.trs$/) {
303	push @trs, [$path, $file];	677	$c_trs->put ([$path, $file]);
		678
304	} elsif ($file =~ /\.arc$/) {	679	} elsif ($file =~ /\.arc$/) {
305	push @arc, [$path, $file];	680	$c_arc->put ([$path, $file]);
		681
306	} else {	682	} else {
307	warn "ignoring $path/$file\n" if $VERBOSE >= 2;	683	warn "ignoring $path/$file\n" if $VERBOSE >= 3;
308	}	684	}
309	}	685	}
310	};	686	};
		687	}
		688
		689	sub generate_plurals {
		690	# use Lingua::EN::Inflect ();
		691	# Lingua::EN::Inflect::classical;
		692	# Lingua::EN::Inflect::def_noun '(.*)staff' => '$1staves'; # policy
		693	# Lingua::EN::Inflect::def_noun '(.*)boots' => '$1boots'; # hack
		694	#
		695	# for my $a (@ARC) {
		696	# my $name = $a->{name} \|\| $a->{_name};
		697	#
		698	# next unless $a->{name_pl};
		699	# next if $a->{invisible};
		700	# next if $a->{is_floor};
		701	# next if $a->{no_pick};
		702	#
		703	# my $test = Lingua::EN::Inflect::PL_N_eq $name, Lingua::EN::Inflect::PL $name;
		704	# my $pl = $test =~ /^(?:eq\|p:.)$/
		705	# ? $name
		706	# : Lingua::EN::Inflect::PL $name;
		707	#
		708	# if ($pl ne $a->{name_pl}) {
		709	# warn "$a->{_name}: plural differs, $pl vs $a->{name_pl}\n";
		710	# }
		711	# }
311	}	712	}
312		713
313	sub inst_arch($) {	714	sub inst_arch($) {
314	my (undef, $path) = @_;	715	my (undef, $path) = @_;
315		716
		717	$PATH = $path;
		718
		719	print "\n",
316	print "installing '$path' to '$DATADIR'\n";	720	"Installing '$path' to '$DATADIR'\n",
		721	"\n",
		722	"This can take a long time if you run this\n",
		723	"for the first time or do not use --cache.\n",
		724	"\n",
		725	"Unless you run verbosely, all following warning\n",
		726	"or error messages indicate serious problems.\n",
		727	"\n";
317		728
318	if (!-d "$path/treasures") {	729	if (!-d "$path/treasures") {
319	warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";	730	warn "'$path' does not look like an arch directory ('treasures' directory is missing).\n";
320	exit 1 unless $FORCE;	731	exit 1 unless $FORCE;
321	}	732	}
322		733
		734	print "scanning files...\n" if $VERBOSE;
		735
323	find_files $path;	736	find_files $path;
		737
		738	my @a_arc = map +(async \&process_arc), 1..2;
		739	my @a_res = map +(async \&process_res), 1..2;
		740	my @a_trs = map +(async \&process_trs), 1..2;
		741
324	IO::AIO::flush;	742	IO::AIO::flush;
325		743
326	$_->join for (	744	$c_res->shutdown;
327	(async \&process_png), (async \&process_png),	745	$c_arc->shutdown;
328	(async \&process_trs), (async \&process_trs),	746	$c_trs->shutdown;
329	(async \&process_arc), (async \&process_arc),
330	);
331		747
		748	print "start file scan, arc, res processing...\n" if $VERBOSE;
		749
		750	$_->join for @a_arc; # need to parse all archetypes before png processing
		751
		752	print "end arc, start png processing...\n" if $VERBOSE;
		753
		754	# eight png crunchers work fine for my 4x smp machine
		755	my @a_png = map +(async \&process_png), 1..8;
		756
		757	$_->join for (@a_trs, @a_res, @a_png);
		758
		759	print "scanning done, processing results...\n" if $VERBOSE;
332	{	760	{
333	open my $fh, ">:utf8", "$DATADIR/animations~"	761	# remove path prefix from editor_folder
334	or die "$DATADIR/animations~: $!";	762	$_->{editor_folder} =~ /^\x00/
335	print $fh join "", map $ANIM{$_}, sort keys %ANIM	763	and substr $_->{editor_folder}, 0, 2 + length $path, ""
		764	for values %ARC;
		765
		766	print "resolving inheritance tree...\n" if $VERBOSE;
		767	# resolve inherit
		768	while () {
		769	my $progress;
		770	my $loop;
		771
		772	for my $o (values %ARC) {
		773	for my $other (split /,/, $o->{inherit}) {
		774	if (my $s = $ARC{$other}) {
		775	if ($s->{inherit}) {
		776	$loop = $s;
		777	} else {
		778	delete $o->{inherit};
		779	my %s = %$s;
		780	delete @s{qw(_name more name name_pl)};
		781	%$o = ( %s, %$o );
		782	++$progress;
		783	}
		784	} else {
		785	warn "'$o->{_name}' tries to inherit from undefined archetype '$other', skipping.\n";
		786	delete $ARC{$o->{_name}};
		787	}
		788	}
		789	}
		790
		791	unless ($progress) {
		792	die "inheritance loop detected starting at archetype '$loop->{_name}', aborting.\n"
		793	if $loop;
		794
		795	last;
		796	}
336	}	797	}
337		798
338	{	799	# remove base classes (by naming scheme, should use something like "baseclass xxx" to inherit
		800	@ARC = grep $_->{_name} !~ /^(?:type\|class)_/, @ARC;
		801
		802	print "generating plurals...\n" if $VERBOSE;
		803	generate_plurals;
		804
		805	printf "writing %d archetypes...\n", scalar @ARC if $VERBOSE;
339	open my $fh, ">:utf8", "$DATADIR/archetypes~"	806	open my $fh, ">:utf8", "$DATADIR/archetypes~"
340	or die "$DATADIR/archetypes~: $!";	807	or die "$DATADIR/archetypes~: $!";
341	substr $_->{editor_folder}, 0, 1 + length $path, "" for @ARC;	808	print $fh Deliantra::archlist_to_string [sort { $a->{_name} cmp $b->{_name} } @ARC];
342	print $fh Crossfire::archlist_to_string \@ARC;
343	}	809	}
344		810
345	{	811	{
		812	printf "writing treasures (%d octets)...\n", length $TRS if $VERBOSE;
346	open my $fh, ">:utf8", "$DATADIR/treasures~"	813	open my $fh, ">:utf8", "$DATADIR/treasures~"
347	or die "$DATADIR/treasures~: $!";	814	or die "$DATADIR/treasures~: $!";
348	print $fh $TRS;	815	print $fh $TRS;
349	}	816	}
350		817
351	{	818	{
352	while (my ($k, $v) = each %FACEINFO) {	819	print "processing facedata...\n" if $VERBOSE;
353	$v->{data32} \|\|= delete $PNG32{$k};
354	}
355
356	while (my ($k, $v) = each %FACEINFO) {	820	while (my ($k, $v) = each %FACEINFO) {
357	length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";	821	length $v->{data32} or warn "$k: face has no png32. this will not work (shoddy gcfclient will crash of course).\n";
		822	length $v->{data64} or warn "$k: face has no png64. this will not work very well.\n";
358		823
359	$v->{chksum32} = Digest::MD5::md5 $v->{data32};	824	make_hash $k, $v->{data32}, $v->{hash32};
		825	make_hash $k, $v->{data64}, $v->{hash64};
		826
		827	#length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
		828	#length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
		829
		830	if (my $magicmap = $v->{magicmap}) {
		831	$magicmap =~ y/A-Z_\-/a-z/d;
		832	$v->{magicmap} = $COLOR{$magicmap};
360	}	833	}
361		834
		835	my $stem = delete $v->{stem};
		836	$v->{glyph} //= autoglyph $stem, $v;
		837	utf8::encode $v->{glyph};
		838	$v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
		839
		840	delete $v->{arc};
		841	}
		842
		843	print "processing resources...\n" if $VERBOSE;
		844	my $enc = JSON::XS->new->utf8->canonical->relaxed;
		845	while (my ($k, $v) = each %RESOURCE) {
		846
		847	if ($v->{meta} && $v->{meta}{datadir}) {
		848	delete $RESOURCE{$k};
		849
		850	$k =~ s/^res\/// or die "$k: datadir files must be in res/";
		851
		852	printf "writing $k (%d octets)...\n", length $v->{data} if $VERBOSE;
		853	open my $fh, ">:raw", "$DATADIR/$k~"
		854	or die "$DATADIR/$k~: $!";
		855	syswrite $fh, $v->{data};
		856	push @COMMIT, $k;
		857
		858	} else {
		859	if ($v->{type} & 1) {
		860	# prepend meta info
		861
		862	my $meta = $enc->encode ({
		863	name => $k,
		864	%{ $v->{meta} \|\| {} },
		865	});
		866
		867	$v->{data} = pack "(w/a)", $meta, $v->{data};
		868	}
		869
		870	make_hash $k, $v->{data}, $v->{hash}, 6; # 6 for the benefit of existing clients
		871	}
		872	}
		873
		874	printf "writing facedata (%d faces, %d anims, %d resources)...\n",
		875	scalar keys %FACEINFO,
		876	scalar keys %ANIMINFO,
		877	scalar keys %RESOURCE
		878	if $VERBOSE;
		879
362	open my $fh, ">:perlio", "$DATADIR/faces~"	880	open my $fh, ">:perlio", "$DATADIR/facedata~"
363	or die "$DATADIR/faces~: $!";	881	or die "$DATADIR/facedata~: $!";
364		882
365	print $fh Storable::nfreeze \%FACEINFO;	883	print $fh nfreeze {
		884	version => 2,
		885	faceinfo => \%FACEINFO,
		886	animinfo => \%ANIMINFO,
		887	resource => \%RESOURCE,
366	}	888	};
367		889
		890	}
		891
		892	print "committing files...\n" if $VERBOSE;
		893
368	for (qw(archetypes faces animations treasures)) {	894	for (qw(archetypes facedata treasures), @COMMIT) {
369	chmod 0644, "$DATADIR/$_~";	895	chmod 0644, "$DATADIR/$_~";
370	rename "$DATADIR/$_~", "$DATADIR/$_"	896	rename "$DATADIR/$_~", "$DATADIR/$_"
371	or die "$DATADIR/$_: $!";	897	or die "$DATADIR/$_: $!";
372	}	898	}
373		899

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.14 by root, Wed Mar 14 00:04:59 2007 UTC vs. Revision 1.96 by root, Wed Oct 6 00:28:15 2010 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.14 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.96 by root, Wed Oct 6 00:28:15 2010 UTC