projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
96c4855
)
[4tube] Revert uploader regexes and make non fatal
author
Sergey M․
<dstftw@gmail.com>
Thu, 8 Oct 2015 14:22:08 +0000
(20:22 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 8 Oct 2015 15:05:35 +0000
(21:05 +0600)
youtube_dl/extractor/fourtube.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/fourtube.py
b/youtube_dl/extractor/fourtube.py
index 406387e574512fe49001eafe240ebc616ad0565f..cd7668f18006fbffff41234d9cbbc1e47c909e58 100644
(file)
--- 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(
'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(
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>',
categories_html = self._search_regex(
r'(?s)><i class="icon icon-tag"></i>\s*Categories / Tags\s*.*?<ul class="list">(.*?)</ul>',