projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[youtube-dl]
/
youtube_dl
/
extractor
/
iconosquare.py
diff --git
a/youtube_dl/extractor/iconosquare.py
b/youtube_dl/extractor/iconosquare.py
index 1d5a10a3b6349d95387aee00d4be5e6deac618b8..370e86e5ac7ce497c8b3c658805374246fb9690a 100644
(file)
--- a/
youtube_dl/extractor/iconosquare.py
+++ b/
youtube_dl/extractor/iconosquare.py
@@
-1,7
+1,5
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-import re
-
from .common import InfoExtractor
from .common import InfoExtractor
@@
-20,13
+18,11
@@
class IconosquareIE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
webpage = self._download_webpage(url, video_id)
-
html_
title = self._html_search_regex(
- r'<title>(.+?)</title>',
+ title = self._html_search_regex(
+ r'<title>(.+?)
(?: *\(Videos?\))? \| (?:Iconosquare|Statigram)
</title>',
webpage, 'title')
webpage, 'title')
- title = re.sub(r'(?: *\(Videos?\))? \| (?:Iconosquare|Statigram)$', '', html_title)
uploader_id = self._html_search_regex(
r'@([^ ]+)', title, 'uploader name', fatal=False)
uploader_id = self._html_search_regex(
r'@([^ ]+)', title, 'uploader name', fatal=False)