Browse Source

[crunchyroll] Use `enumerate`

totalwebcasting
Jaime Marquínez Ferrándiz 11 years ago
parent
commit
d0a72674c6
1 changed files with 2 additions and 4 deletions
  1. +2
    -4
      youtube_dl/extractor/crunchyroll.py

+ 2
- 4
youtube_dl/extractor/crunchyroll.py View File

@ -86,9 +86,8 @@ class CrunchyrollIE(InfoExtractor):
return zlib.decompress(decrypted_data) return zlib.decompress(decrypted_data)
def _convert_subtitles_to_srt(self, subtitles): def _convert_subtitles_to_srt(self, subtitles):
i = 1
output = '' output = ''
for start, end, text in re.findall(r'<event [^>]*?start="([^"]+)" [^>]*?end="([^"]+)" [^>]*?text="([^"]+)"[^>]*?>', subtitles):
for i, (start, end, text) in enumerate(re.findall(r'<event [^>]*?start="([^"]+)" [^>]*?end="([^"]+)" [^>]*?text="([^"]+)"[^>]*?>', subtitles), 1):
start = start.replace('.', ',') start = start.replace('.', ',')
end = end.replace('.', ',') end = end.replace('.', ',')
text = clean_html(text) text = clean_html(text)
@ -96,7 +95,6 @@ class CrunchyrollIE(InfoExtractor):
if not text: if not text:
continue continue
output += '%d\n%s --> %s\n%s\n\n' % (i, start, end, text) output += '%d\n%s --> %s\n%s\n\n' % (i, start, end, text)
i += 1
return output return output
def _real_extract(self,url): def _real_extract(self,url):
@ -187,4 +185,4 @@ class CrunchyrollIE(InfoExtractor):
'upload_date': video_upload_date, 'upload_date': video_upload_date,
'subtitles': subtitles, 'subtitles': subtitles,
'formats': formats, 'formats': formats,
}
}

Loading…
Cancel
Save