projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b7a2268
)
[dhm] Improve _VALID_URL and add test
author
Sergey M․
<dstftw@gmail.com>
Sat, 28 Mar 2015 17:55:15 +0000
(23:55 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 28 Mar 2015 17:55:15 +0000
(23:55 +0600)
youtube_dl/extractor/dhm.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/dhm.py
b/youtube_dl/extractor/dhm.py
index 80ee40018197d7ace7e9105d1535e6c17058f5c3..3ed1f1663d9130de0fd621cc33fedd8079ec34dc 100644
(file)
--- a/
youtube_dl/extractor/dhm.py
+++ b/
youtube_dl/extractor/dhm.py
@@
-9,9
+9,9
@@
from ..utils import (
class DHMIE(InfoExtractor):
IE_DESC = 'Filmarchiv - Deutsches Historisches Museum'
class DHMIE(InfoExtractor):
IE_DESC = 'Filmarchiv - Deutsches Historisches Museum'
- _VALID_URL = r'http
://www\.dhm\.de/filmarchiv/die-filme/
(?P<id>[^/]+)'
+ _VALID_URL = r'http
s?://(?:www\.)?dhm\.de/filmarchiv/(?:[^/]+/)+
(?P<id>[^/]+)'
- _TEST
=
{
+ _TEST
S = [
{
'url': 'http://www.dhm.de/filmarchiv/die-filme/the-marshallplan-at-work-in-west-germany/',
'md5': '11c475f670209bf6acca0b2b7ef51827',
'info_dict': {
'url': 'http://www.dhm.de/filmarchiv/die-filme/the-marshallplan-at-work-in-west-germany/',
'md5': '11c475f670209bf6acca0b2b7ef51827',
'info_dict': {
@@
-21,8
+21,17
@@
class DHMIE(InfoExtractor):
'description': 'md5:1fabd480c153f97b07add61c44407c82',
'duration': 660,
'thumbnail': 're:^https?://.*\.jpg$',
'description': 'md5:1fabd480c153f97b07add61c44407c82',
'duration': 660,
'thumbnail': 're:^https?://.*\.jpg$',
- }
- }
+ },
+ }, {
+ 'url': 'http://www.dhm.de/filmarchiv/02-mapping-the-wall/peter-g/rolle-1/',
+ 'md5': '09890226332476a3e3f6f2cb74734aa5',
+ 'info_dict': {
+ 'id': 'rolle-1',
+ 'ext': 'flv',
+ 'title': 'ROLLE 1',
+ 'thumbnail': 're:^https?://.*\.jpg$',
+ },
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)
def _real_extract(self, url):
video_id = self._match_id(url)
@@
-49,10
+58,10
@@
class DHMIE(InfoExtractor):
webpage, 'title').strip()
description = self._html_search_regex(
r'<p><strong>Description:</strong>(.+?)</p>',
webpage, 'title').strip()
description = self._html_search_regex(
r'<p><strong>Description:</strong>(.+?)</p>',
- webpage, 'description',
fatal=Fals
e)
+ webpage, 'description',
default=Non
e)
duration = parse_duration(self._search_regex(
r'<em>Length\s*</em>\s*:\s*</strong>([^<]+)',
duration = parse_duration(self._search_regex(
r'<em>Length\s*</em>\s*:\s*</strong>([^<]+)',
- webpage, 'duration',
fatal=Fals
e))
+ webpage, 'duration',
default=Non
e))
return {
'id': video_id,
return {
'id': video_id,