aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-09-01 16:58:16 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-09-01 16:58:16 +0800
commit05d4612947d6dbfaedb8f2a00daa5f29d85f73df (patch)
tree56f6142438e6c569148a9707dfb665fbdad1be50
parent746a695b362cb602625ed7357294bb18de133883 (diff)
[movingimage] Adapt to the new domain name and fix extraction
Closes #10466
-rw-r--r--ChangeLog6
-rw-r--r--youtube_dl/extractor/extractors.py2
-rw-r--r--youtube_dl/extractor/movingimage.py (renamed from youtube_dl/extractor/ssa.py)26
3 files changed, 17 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f8076d96..877e8112e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+version <unreleased>
+
+Extractors
+* [movingimage] Fix for the new site name (#10466)
+
+
version 2016.08.31
Extractors
diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 21efa96b2..8d0688f53 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -486,6 +486,7 @@ from .motherless import MotherlessIE
from .motorsport import MotorsportIE
from .movieclips import MovieClipsIE
from .moviezine import MoviezineIE
+from .movingimage import MovingImageIE
from .msn import MSNIE
from .mtv import (
MTVIE,
@@ -806,7 +807,6 @@ from .srgssr import (
SRGSSRPlayIE,
)
from .srmediathek import SRMediathekIE
-from .ssa import SSAIE
from .stanfordoc import StanfordOpenClassroomIE
from .steam import SteamIE
from .streamable import StreamableIE
diff --git a/youtube_dl/extractor/ssa.py b/youtube_dl/extractor/movingimage.py
index 54d1843f2..bb789c32e 100644
--- a/youtube_dl/extractor/ssa.py
+++ b/youtube_dl/extractor/movingimage.py
@@ -7,22 +7,19 @@ from ..utils import (
)
-class SSAIE(InfoExtractor):
- _VALID_URL = r'https?://ssa\.nls\.uk/film/(?P<id>\d+)'
+class MovingImageIE(InfoExtractor):
+ _VALID_URL = r'https?://movingimage\.nls\.uk/film/(?P<id>\d+)'
_TEST = {
- 'url': 'http://ssa.nls.uk/film/3561',
+ 'url': 'http://movingimage.nls.uk/film/3561',
+ 'md5': '4caa05c2b38453e6f862197571a7be2f',
'info_dict': {
'id': '3561',
- 'ext': 'flv',
+ 'ext': 'mp4',
'title': 'SHETLAND WOOL',
'description': 'md5:c5afca6871ad59b4271e7704fe50ab04',
'duration': 900,
'thumbnail': 're:^https?://.*\.jpg$',
},
- 'params': {
- # rtmp download
- 'skip_download': True,
- },
}
def _real_extract(self, url):
@@ -30,10 +27,9 @@ class SSAIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
- streamer = self._search_regex(
- r"'streamer'\s*,\S*'(rtmp[^']+)'", webpage, 'streamer')
- play_path = self._search_regex(
- r"'file'\s*,\s*'([^']+)'", webpage, 'file').rpartition('.')[0]
+ formats = self._extract_m3u8_formats(
+ self._html_search_regex(r'file\s*:\s*"([^"]+)"', webpage, 'm3u8 manifest URL'),
+ video_id, ext='mp4', entry_protocol='m3u8_native')
def search_field(field_name, fatal=False):
return self._search_regex(
@@ -44,13 +40,11 @@ class SSAIE(InfoExtractor):
description = unescapeHTML(search_field('Description'))
duration = parse_duration(search_field('Running time'))
thumbnail = self._search_regex(
- r"'image'\s*,\s*'([^']+)'", webpage, 'thumbnails', fatal=False)
+ r"image\s*:\s*'([^']+)'", webpage, 'thumbnail', fatal=False)
return {
'id': video_id,
- 'url': streamer,
- 'play_path': play_path,
- 'ext': 'flv',
+ 'formats': formats,
'title': title,
'description': description,
'duration': duration,