X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fabc.py;h=465249bbf6bdf92357944b065174076b60567295;hb=fc86d4eed0bf10f8f90326472811e5b4d4ad4bd9;hp=879ded88dd4cd3c5efde51d3a4ecb995812e3c74;hpb=55d119e2a10ccbfadc12b9af30c495f46874c2a3;p=youtube-dl.git

diff --git a/youtube_dl/extractor/abc.py b/youtube_dl/extractor/abc.py
index 879ded88d..465249bbf 100644
--- a/youtube_dl/extractor/abc.py
+++ b/youtube_dl/extractor/abc.py
@@ -7,14 +7,13 @@ from ..utils import (
     ExtractorError,
     js_to_json,
     int_or_none,
-    update_url_query,
     parse_iso8601,
 )
 
 
 class ABCIE(InfoExtractor):
     IE_NAME = 'abc.net.au'
-    _VALID_URL = r'https?://www\.abc\.net\.au/news/(?:[^/]+/){1,2}(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:www\.)?abc\.net\.au/news/(?:[^/]+/){1,2}(?P<id>\d+)'
 
     _TESTS = [{
         'url': 'http://www.abc.net.au/news/2014-11-05/australia-to-staff-ebola-treatment-centre-in-sierra-leone/5868334',
@@ -101,6 +100,7 @@ class ABCIViewIE(InfoExtractor):
     IE_NAME = 'abc.net.au:iview'
     _VALID_URL = r'https?://iview\.abc\.net\.au/programs/[^/]+/(?P<id>[^/?#]+)'
 
+    # ABC iview programs are normally available for 14 days only.
     _TESTS = [{
         'url': 'http://iview.abc.net.au/programs/gardening-australia/FA1505V024S00',
         'md5': '979d10b2939101f0d27a06b79edad536',
@@ -113,6 +113,7 @@ class ABCIViewIE(InfoExtractor):
             'uploader_id': 'abc1',
             'timestamp': 1471719600,
         },
+        'skip': 'Video gone',
     }]
 
     def _real_extract(self, url):
@@ -123,14 +124,7 @@ class ABCIViewIE(InfoExtractor):
         title = video_params['title']
         stream = next(s for s in video_params['playlist'] if s.get('type') == 'program')
 
-        formats = []
-        f4m_url = stream.get('hds-unmetered') or stream['hds-metered']
-        formats.extend(self._extract_f4m_formats(
-            update_url_query(f4m_url, {'hdcore': '3.7.0'}),
-            video_id, f4m_id='hds', fatal=False))
-        formats.extend(self._extract_m3u8_formats(f4m_url.replace(
-            'akamaihd.net/z/', 'akamaihd.net/i/').replace('/manifest.f4m', '/master.m3u8'),
-            video_id, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
+        formats = self._extract_akamai_formats(stream['hds-unmetered'], video_id)
         self._sort_formats(formats)
 
         subtitles = {}