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

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

Diff Legend

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

Comparing deliantra/server/utils/cfutil.in (file contents): Revision 1.32 by root, Thu Apr 26 00:41:32 2007 UTC vs. Revision 1.86 by root, Tue Oct 5 22:33:10 2010 UTC

Diff Legend

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.32 by root, Thu Apr 26 00:41:32 2007 UTC vs.
Revision 1.86 by root, Tue Oct 5 22:33:10 2010 UTC