summary refs log tree commit diff
diff options
context:
space:
mode:
authortiktok <tiktok7@users.noreply.github.com>2015-03-23 23:16:50 +0100
committertiktok <tiktok7@users.noreply.github.com>2015-03-23 23:16:50 +0100
commit5d1f0e607b3dfe7b1adea09a1188011e57acf0fb (patch)
treee4a1e8eb0a7a81ad46625a67a3eab3875b9b42a2
parentc41a2ec4af9fa76b04b6d9f50d9a895d124ea14c (diff)
downloadyoutube-dl-5d1f0e607b3dfe7b1adea09a1188011e57acf0fb.tar.gz
youtube-dl-5d1f0e607b3dfe7b1adea09a1188011e57acf0fb.tar.xz
youtube-dl-5d1f0e607b3dfe7b1adea09a1188011e57acf0fb.zip
[MiomioTv] updated based on feedback to merge request:
    1) added comment to explain extra xml link download
    2) changed {} entries to {0}, {1} etc
    3) removed redundant language header (the others are required)
    4) checked out the old version of the supported sites md (the change was
    not required)
-rw-r--r--docs/supportedsites.md1
-rw-r--r--youtube_dl/extractor/miomio_tv.py12
2 files changed, 8 insertions, 5 deletions
diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index 53d280677..062cb3d62 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -244,7 +244,6 @@
  - **Mgoon**
  - **Minhateca**
  - **MinistryGrid**
- - **Miomio.tv**
  - **mitele.es**
  - **mixcloud**
  - **MLB**
diff --git a/youtube_dl/extractor/miomio_tv.py b/youtube_dl/extractor/miomio_tv.py
index 355774f54..ae20a32fa 100644
--- a/youtube_dl/extractor/miomio_tv.py
+++ b/youtube_dl/extractor/miomio_tv.py
@@ -23,10 +23,15 @@ class MiomioTvIE(InfoExtractor):
 
         title = self._html_search_regex(r'<meta\s+name="description"\s+content="\s*([^"]*)\s*"', webpage, 'title')
         ref_path = self._search_regex(r'src="(/mioplayer/.*?)"', webpage, 'ref_path')
-        referer = 'http://www.miomio.tv{}'.format(ref_path)
+        referer = 'http://www.miomio.tv{0}'.format(ref_path)
         xml_config = self._search_regex(r'flashvars="type=sina&amp;(.*?)&amp;cid=', webpage, 'xml config')
-        self._request_webpage("http://www.miomio.tv/mioplayer/mioplayerconfigfiles/xml.php?id={}&r=cc{}".format(id, 945), video_id)
-        xml_url = 'http://www.miomio.tv/mioplayer/mioplayerconfigfiles/sina.php?{}'.format(xml_config)
+        
+        # skipping the following page causes lags and eventually connection drop-outs
+        # id is normally a rotating three digit value but a fixed value always appears to work
+        self._request_webpage("http://www.miomio.tv/mioplayer/mioplayerconfigfiles/xml.php?id={0}&r=cc{1}".format(id, 945), video_id)
+
+        # the following xml contains the actual configuration information on the video file(s)
+        xml_url = 'http://www.miomio.tv/mioplayer/mioplayerconfigfiles/sina.php?{0}'.format(xml_config)
         vidconfig = self._download_xml(xml_url, video_id)
 
         file_els = vidconfig.findall('.//durl')
@@ -48,7 +53,6 @@ class MiomioTvIE(InfoExtractor):
 
         http_headers = {
             'Referer': referer,
-            'Accept-Language': 'en,en-US;q=0.7,de;q=0.3',
             'Accept-Encoding': 'gzip, deflate',
             'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
         }