]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
bbcnews: Switch to parse_duration, revert change to docs/supportedsites.md
authorfnord <fnord@fnord.mobi>
Fri, 19 Jun 2015 11:25:50 +0000 (06:25 -0500)
committerfnord <fnord@fnord.mobi>
Fri, 19 Jun 2015 11:25:50 +0000 (06:25 -0500)
docs/supportedsites.md
youtube_dl/extractor/bbcnews.py

index d4ccbbd3a63dd87a20be57cf803abc4cd8861157..220e52b988ace1314ec866f59a8ef34562f1b583 100644 (file)
@@ -50,7 +50,6 @@
  - **Bandcamp**
  - **Bandcamp:album**
  - **bbc.co.uk**: BBC iPlayer
- - **bbc.com**: BBC news videos
  - **BeatportPro**
  - **Beeg**
  - **BehindKink**
index 9bb8d42e6e5f5936e4cecfa18c2a3c52d0283e81..fd4a5e38fbecec2842be0f372890c7eec7848cbd 100644 (file)
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 from .common import InfoExtractor
 from ..utils import (
     ExtractorError,
+    parse_duration,
     int_or_none,
 )
 from ..compat import compat_HTTPError
@@ -45,22 +46,6 @@ class BBCNewsIE(BBCCoUkIE):
         }
     }]
 
-    def _duration_str2int(self, str):
-        if not str:
-            return None
-        ret = re.match(r'^\d+$', str)
-        if ret:
-            return int(ret.group(0))
-        ret = re.match(r'PT((?P<h>\d+)H)?((?P<m>\d+)M)?(?P<s>\d+)S$', str)
-        if ret:
-            total=int(ret.group('s'))
-            if ret.group('m'):
-                total+=(int(ret.group('m'))*60)
-            if ret.group('h'):
-                total+=(int(ret.group('h'))*3600)
-            return total
-        return None
-
     def _real_extract(self, url):
         list_id = self._match_id(url)
         webpage = self._download_webpage(url, list_id)
@@ -88,7 +73,7 @@ class BBCNewsIE(BBCCoUkIE):
             xml_url = jent.get('href', None)
 
             title = jent['caption']
-            duration = self._duration_str2int(jent.get('duration',None))
+            duration = parse_duration(jent.get('duration',None))
             description = list_title + ' - ' + jent.get('caption','')
             thumbnail = None
             if jent.has_key('image'):