From 08ea2cfea0ac18953bd3572cd28120456471d629 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Mon, 14 Oct 2013 12:28:06 -0400
Subject: Use track number from API response.

Also, replace all "/" characters in the track name.
---
(limited to 'jamaldo.pl')

diff --git a/jamaldo.pl b/jamaldo.pl
index 2d00663..7d9e8f2 100755
--- a/jamaldo.pl
+++ b/jamaldo.pl
@@ -105,14 +105,14 @@ sub get_album
 	for $track (@{$res_data->{"results"}}) {
 		printf("    Downloading track %d of %d...\n", ++$i,
 			$res_data->{"headers"}->{"results_count"});
-		get_track($track, $i, $audioformat, $dir, $control_fh);
+		get_track($track, $audioformat, $dir, $control_fh);
 	}
 	close($control_fh);
 }
 
 sub get_track
 {
-	my ($track, $track_number, $audioformat, $dir, $control_fh) = @_;
+	my ($track, $audioformat, $dir, $control_fh) = @_;
 	my $name;
 	my $req;
 	my $res;
@@ -120,8 +120,8 @@ sub get_track
 	$name = $track->{"name"};
 	printf("        Title: %s\n", $name);
 
-	$name =~ s|/|-|;
-	$name = sprintf("%s/%02d - %s.%s", $dir, $track_number, $name,
+	$name =~ s|/|-|g;
+	$name = sprintf("%s/%02d - %s.%s", $dir, $track->{"position"}, $name,
 		$audioformat);
 	$req = HTTP::Request->new("GET", $track->{"audio"});
 	$res = $ua->request($req, $name);
@@ -136,7 +136,7 @@ sub get_track
 
 	printf($control_fh "Title:        %s\n", $track->{"name"});
 	printf($control_fh "Album:        %s\n", $track->{"album_name"});
-	printf($control_fh "Track number: %d\n", $track_number);
+	printf($control_fh "Track number: %d\n", $track->{"position"});
 	printf($control_fh "Artist:       %s\n", $track->{"artist_name"});
 	printf($control_fh "License:      %s\n", $track->{"license_ccurl"});
 	printf($control_fh "Date:         %s\n", $track->{"releasedate"});
--
cgit v0.9.1