X-Git-Url: http://git.shiar.nl/wormy.git/blobdiff_plain/2ee2aec7f8c45810467927786d968afd51b38c38..HEAD:/parse-wormedit

diff --git a/parse-wormedit b/parse-wormedit
index cf1798d..06a261d 100755
--- a/parse-wormedit
+++ b/parse-wormedit
@@ -52,24 +52,31 @@ else {
 	die "Unrecognised file type\n";
 }
 
+my $format = $opt{format};  # override distinct from image fallback
 if ($opt{output}) {{
 	# derive format from file extension
-	if ($opt{output} =~ /\.(yaml|txt)$/) {
-		$opt{format} //= $1
+	$format //= $1 if $opt{output} =~ /\.([^.]+)$/;
+
+	if ($format ~~ [qw{ yaml json txt }]) {
+		# redirect standard output to given file
+		open my $output, '>', $opt{output}
+			or die "Cannot output to '$opt{output}': $!";
+		select $output;
 	}
 	else {
 		# images are written directly to file
-		last;
 	}
-
-	# redirect standard output to given file
-	open my $output, '>', $opt{output}
-		or die "Cannot output to '$opt{output}': $!";
-	select $output;
 }}
+else {
+	$format //= 'txt';
+}
 
 # output with user-preferred formatting
-given ($opt{format}) {
+given ($format) {
+when ('json') {
+	require JSON;
+	say JSON->new->encode($data);
+}
 when ('yaml') {
 	# full data in yaml (human-readable) formatting
 	require YAML;
@@ -154,21 +161,21 @@ default {
 		@request = $opt{levels} =~ /(\d+)/g;
 	}
 	else {
-		# default to all singleplayer levels
-		@request = 0 .. $data->{levelcount}->{single} - 1;
+		# default to all levels
+		@request = 0 .. $data->{levelcount}->{total} - 1;
 	}
 	@request or die "no levels found or specified\n";
 
 	my $img = Games::Wormy::Render->composite(
 		map { $data->{levels}->[$_] } @request
 	) or die "empty result for levels\n";
-	if ($opt{format} ~~ 'pbm') {
+	if ($format ~~ 'pbm') {
 		$img = $img->to_paletted({make_colors => 'mono'});
 		$opt{format} = 'pnm';
 	}
 	$img->write(
 		$opt{output} ? (file => $opt{output}) : (fh => \*STDOUT),
-		type => $opt{format} // 'pnm',
+		type => $opt{format},
 	) or die $img->errstr;
 }
 }
@@ -181,7 +188,7 @@ parse-wormedit - Wormy level data parser
 
 =head1 SYNOPSIS
 
- parse-wormedit [--format=<type>] [--levels=<number>] [--output=<file.ext>] <input.lvl>
+ parse-wormedit [--format=<type>] [--level=<number>] [--output=<file.ext>] <input.lvl>
 
 =head1 DESCRIPTION
 
@@ -201,6 +208,10 @@ Plain text summary of levelpack contents.
 
 All parsed data in YAML syntax.
 
+=item json
+
+Parsed data in JSON syntax.
+
 =item pnm, png, bmp, ...
 
 Image drawing of rendered levels.