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

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

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.18 by root, Sat Mar 17 19:57:02 2007 UTC vs. Revision 1.97 by root, Wed Oct 6 01:23:11 2010 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.18 by root, Sat Mar 17 19:57:02 2007 UTC vs.
Revision 1.97 by root, Wed Oct 6 01:23:11 2010 UTC