Voomra/yandex-music-download
0
Fork 0
Code Activity

Multiple volume albums and https proxy support fix

Browse Source
This commit is contained in:
Kaimi
2015-03-19 19:40:41 +03:00
parent aa041b612e
commit b89fc5a78c
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ya.pl
View File

@@ -73,11 +73,11 @@ my ($opt, $usage) = Getopt::Long::Descriptive::describe_options
['kind|k:s', 'playlist kind (eg. ya-playlist, music-blog, music-partners, etc.)'], ['kind|k:s', 'playlist kind (eg. ya-playlist, music-blog, music-partners, etc.)'],
['album|a:i', 'album to download'], ['album|a:i', 'album to download'],
['track|t:i', 'track to download (album id must be specified)'], ['track|t:i', 'track to download (album id must be specified)'],
['dir|d:s', 'download path (current direcotry will be used by default)', {default => '.'}], ['dir|d:s', 'download path (current direcotry will be used by default)', {default => '.'}],
['proxy=s', 'HTTP-proxy (format: 1.2.3.4:8888)'], ['proxy=s', 'HTTP-proxy (format: 1.2.3.4:8888)'],
[], [],
['debug', 'print debug info during work'], ['debug', 'print debug info during work'],
['help', 'print usage'], ['help', 'print usage'],
[], [],
['Example: '], ['Example: '],
["\t".basename(__FILE__).' -p 123 -k ya-playlist'], ["\t".basename(__FILE__).' -p 123 -k ya-playlist'],
@@ -104,7 +104,7 @@ $json_decoder->allow_singlequote(1);
if($opt->proxy) if($opt->proxy)
{ {
$ua->proxy(['http'], 'http://'.$opt->proxy.'/'); $ua->proxy(['http', 'https'], 'http://'.$opt->proxy.'/');
} }
if($opt->album || ($opt->playlist && $opt->kind)) if($opt->album || ($opt->playlist && $opt->kind))
@@ -114,9 +114,9 @@ if($opt->album || ($opt->playlist && $opt->kind))
if($opt->album) if($opt->album)
{ {
info(INFO, 'Fetching album info: '.$opt->album); info(INFO, 'Fetching album info: '.$opt->album);
@track_list_info = get_album_tracks_info($opt->album); @track_list_info = get_album_tracks_info($opt->album);
if($opt->track) if($opt->track)
{ {
info(INFO, 'Filtering single track: '.$opt->track.' ['.$opt->album.']'); info(INFO, 'Filtering single track: '.$opt->track.' ['.$opt->album.']');
@@ -311,13 +311,19 @@ sub get_album_tracks_info
info(INFO, 'Album title: '.$title); info(INFO, 'Album title: '.$title);
info(INFO, 'Tracks total: '. $json->{pageData}->{trackCount}); info(INFO, 'Tracks total: '. $json->{pageData}->{trackCount});
my @volumes = ();
for my $vol(@{$json->{pageData}->{volumes}})
{
push @volumes, @{$vol};
}
return map return map
{ {
{ {
dir => $_->{storageDir}, dir => $_->{storageDir},
title=> $_->{artists}->[0]->{name} . ARTIST_TITLE_DELIM . $_->{title} title=> $_->{artists}->[0]->{name} . ARTIST_TITLE_DELIM . $_->{title}
} }
} @{ $json->{pageData}->{volumes}->[0] }; } @volumes;
} }
sub get_playlist_tracks_info sub get_playlist_tracks_info