X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/00368b4c3a5d4e909e1b7ecfc4030bf28da020f3..d037080638e8dbb0ebb2ac9cf23b9671518340f9:/youtube_dl/extractor/newgrounds.py
diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dl/extractor/newgrounds.py
index 0e26f83..82e7cf5 100644
--- a/youtube_dl/extractor/newgrounds.py
+++ b/youtube_dl/extractor/newgrounds.py
@@ -87,19 +87,21 @@ class NewgroundsIE(InfoExtractor):
self._check_formats(formats, media_id)
self._sort_formats(formats)
- uploader = self._search_regex(
- r'(?:Author|Writer)\s*]+>([^<]+)', webpage, 'uploader',
+ uploader = self._html_search_regex(
+ (r'(?s)]*>(.+?)
.*?\s*Author\s*',
+ r'(?:Author|Writer)\s*]+>([^<]+)'), webpage, 'uploader',
fatal=False)
- timestamp = unified_timestamp(self._search_regex(
- r'Uploaded\s*([^<]+)', webpage, 'timestamp',
+ timestamp = unified_timestamp(self._html_search_regex(
+ (r'\s*Uploaded\s*\s*([^<]+\s*[^<]+)',
+ r'\s*Uploaded\s*\s*([^<]+)'), webpage, 'timestamp',
default=None))
duration = parse_duration(self._search_regex(
- r'Song\s*.+?([^<]+)', webpage, 'duration',
- default=None))
+ r'(?s)\s*Song\s*\s*.+?\s*([^<]+)', webpage,
+ 'duration', default=None))
filesize_approx = parse_filesize(self._html_search_regex(
- r'Song\s*(.+?)', webpage, 'filesize',
+ r'(?s)\s*Song\s*\s*(.+?)', webpage, 'filesize',
default=None))
if len(formats) == 1:
formats[0]['filesize_approx'] = filesize_approx