aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-10-08 20:22:08 +0600
committerSergey M․ <dstftw@gmail.com>2015-10-08 21:05:35 +0600
commitc677e49bd11c3dfada05de9fc1d4de04a577d70e (patch)
tree7f292c723e510dcf5f7122709c97bee0efe970f4 /youtube_dl
parent96c48553317cf28ea92d7feaa5701e3ebd93ea25 (diff)
[4tube] Revert uploader regexes and make non fatal
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/fourtube.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/youtube_dl/extractor/fourtube.py b/youtube_dl/extractor/fourtube.py
index 406387e57..cd7668f18 100644
--- a/youtube_dl/extractor/fourtube.py
+++ b/youtube_dl/extractor/fourtube.py
@@ -45,9 +45,11 @@ class FourTubeIE(InfoExtractor):
'uploadDate', webpage))
thumbnail = self._html_search_meta('thumbnailUrl', webpage)
uploader_id = self._html_search_regex(
- r'<a class="img-avatar" href="[^"]+/users/([^/"]+)" title="Go to [^"]+ page">', webpage, 'uploader id')
+ r'<a class="img-avatar" href="[^"]+/channels/([^/"]+)" title="Go to [^"]+ page">',
+ webpage, 'uploader id', fatal=False)
uploader = self._html_search_regex(
- r'<a class="img-avatar" href="[^"]+/users/[^/"]+" title="Go to ([^"]+) page">', webpage, 'uploader')
+ r'<a class="img-avatar" href="[^"]+/channels/[^/"]+" title="Go to ([^"]+) page">',
+ webpage, 'uploader', fatal=False)
categories_html = self._search_regex(
r'(?s)><i class="icon icon-tag"></i>\s*Categories / Tags\s*.*?<ul class="list">(.*?)</ul>',