R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed issues of --playlist-items option

Browse Source
This commit is contained in:
Enam Mijbah Noor 2014-04-03 04:00:05 +06:00
parent aac67bc576
commit 5f465e5a07
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
youtube_dl/YoutubeDL.py
View File

@ -113,7 +113,7 @@ class YoutubeDL(object):
nooverwrites: Prevent overwriting files.
playliststart: Playlist item to start at.
playlistend: Playlist item to end at.
playlistitems: Specific items of playlist to download.
playlistitems: Specific indices of playlist to download.
matchtitle: Download only matching titles.
rejecttitle: Reject downloads for matching titles.
logger: Log messages to a logging.Logger instance.
@ -604,23 +604,24 @@ class YoutubeDL(object):
if playlistend == -1:
playlistend = None
print ie_result['entries']
playlistitems = self.params.get('playlistitems', None)
if playlistitems:
if bool(re.compile(r'[^0-9,-]').search(playlistitems)):
raise ValueError('Invalid charecters in --playlist-items argument.')
_playlistitems = playlistitems.split(',')
playlistitems = []
for item in _playlistitems:
if '-' in item:
start, end = item.split('-')
playlistitems.extend(list(range(int(start), int(end) + 1)))
else:
playlistitems.append(int(item))
def iter_playlistitems(format):
for string_segment in format.split(','):
if '-' in string_segment:
start, end = string_segment.split('-')
for item in range(int(start), int(end) + 1):
yield int(item)
else:
yield int(string_segment)
playlistitems = iter_playlistitems(playlistitems)
if isinstance(ie_result['entries'], list):
n_all_entries = len(ie_result['entries'])
if playlistitems:
entries = [e for i, e in enumerate(ie_result['entries'], 1) if i in playlistitems]
entries = [ie_result['entries'][i-1] for i in playlistitems]
print entries
else:
entries = ie_result['entries'][playliststart:playlistend]
n_entries = len(entries)

2
youtube_dl/__init__.py
View File

@ -280,7 +280,7 @@ def parseOpts(overrideArguments=None):
selection.add_option(
'--playlist-items',
dest='playlistitems', metavar='FORMAT', default=None,
help='playlist video items to download. Specify items seperated by commas like: "--playlist-items 1,2,5,8". You can specify range: "--playlist-items 1-4,7,10,12-15,20".')
help='playlist video items to download. Specify indices of the videos in the playlist seperated by commas like: "--playlist-items 1,2,5,8" if you want to download videos indexed 1, 2, 5, 8 in the playlist. You can specify range: "--playlist-items 1-3,7,10-13", it will download the videos at index 1, 2, 3, 7, 10, 11, 12 and 13.')
selection.add_option('--match-title', dest='matchtitle', metavar='REGEX',help='download only matching titles (regex or caseless sub-string)')
selection.add_option('--reject-title', dest='rejecttitle', metavar='REGEX',help='skip download for matching titles (regex or caseless sub-string)')
selection.add_option('--max-downloads', metavar='NUMBER',