projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9804446
)
[dhm] Use _extract_xspf_playlist
author
Sergey M․
<dstftw@gmail.com>
Sun, 9 Aug 2015 13:21:25 +0000
(19:21 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 9 Aug 2015 13:21:25 +0000
(19:21 +0600)
youtube_dl/extractor/dhm.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/dhm.py
b/youtube_dl/extractor/dhm.py
index 3ed1f1663d9130de0fd621cc33fedd8079ec34dc..127eb043971d41ac5ae8aeb6e902729a48e0dfef 100644
(file)
--- a/
youtube_dl/extractor/dhm.py
+++ b/
youtube_dl/extractor/dhm.py
@@
-34,24
+34,14
@@
class DHMIE(InfoExtractor):
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
-
video
_id = self._match_id(url)
+
playlist
_id = self._match_id(url)
- webpage = self._download_webpage(url,
video
_id)
+ webpage = self._download_webpage(url,
playlist
_id)
playlist_url = self._search_regex(
r"file\s*:\s*'([^']+)'", webpage, 'playlist url')
playlist_url = self._search_regex(
r"file\s*:\s*'([^']+)'", webpage, 'playlist url')
- playlist = self._download_xml(playlist_url, video_id)
-
- track = playlist.find(
- './{http://xspf.org/ns/0/}trackList/{http://xspf.org/ns/0/}track')
-
- video_url = xpath_text(
- track, './{http://xspf.org/ns/0/}location',
- 'video url', fatal=True)
- thumbnail = xpath_text(
- track, './{http://xspf.org/ns/0/}image',
- 'thumbnail')
+ entries = self._extract_xspf_playlist(playlist_url, playlist_id)
title = self._search_regex(
[r'dc:title="([^"]+)"', r'<title> »([^<]+)</title>'],
title = self._search_regex(
[r'dc:title="([^"]+)"', r'<title> »([^<]+)</title>'],
@@
-63,11
+53,10
@@
class DHMIE(InfoExtractor):
r'<em>Length\s*</em>\s*:\s*</strong>([^<]+)',
webpage, 'duration', default=None))
r'<em>Length\s*</em>\s*:\s*</strong>([^<]+)',
webpage, 'duration', default=None))
- return {
- 'id': video_id,
- 'url': video_url,
+ entries[0].update({
'title': title,
'description': description,
'duration': duration,
'title': title,
'description': description,
'duration': duration,
- 'thumbnail': thumbnail,
- }
+ })
+
+ return self.playlist_result(entries, playlist_id)