Imported Upstream version 2014.02.17

[youtubedl] / youtube_dl / extractor / naver.py

diff --git a/youtube_dl/extractor/naver.py b/youtube_dl/extractor/naver.py
index 9df236d69850bdc8e97fcb595e81b675c970ad1b..4cab30631956b903682fc2de7aa5dd551bcdd4a3 100644 (file)
--- a/youtube_dl/extractor/naver.py
+++ b/youtube_dl/extractor/naver.py
@@ -1,6 +1,5 @@
 # encoding: utf-8
 import re
 # encoding: utf-8
 import re

-import xml.etree.ElementTree

 
 from .common import InfoExtractor
 from ..utils import (
 
 from .common import InfoExtractor
 from ..utils import (


@@ -10,7 +9,7 @@ from ..utils import (
 
 
 class NaverIE(InfoExtractor):
 
 
 class NaverIE(InfoExtractor):

-    _VALID_URL = r'https?://tvcast\.naver\.com/v/(?P<id>\d+)'
+    _VALID_URL = r'https?://(?:m\.)?tvcast\.naver\.com/v/(?P<id>\d+)'

 
     _TEST = {
         u'url': u'http://tvcast.naver.com/v/81652',
 
     _TEST = {
         u'url': u'http://tvcast.naver.com/v/81652',


@@ -38,14 +37,12 @@ class NaverIE(InfoExtractor):
             'protocol': 'p2p',
             'inKey': key,
         })
             'protocol': 'p2p',
             'inKey': key,
         })

-        info_xml = self._download_webpage(
+        info = self._download_xml(

             'http://serviceapi.rmcnmv.naver.com/flash/videoInfo.nhn?' + query,
             video_id, u'Downloading video info')
             'http://serviceapi.rmcnmv.naver.com/flash/videoInfo.nhn?' + query,
             video_id, u'Downloading video info')

-        urls_xml = self._download_webpage(
+        urls = self._download_xml(

             'http://serviceapi.rmcnmv.naver.com/flash/playableEncodingOption.nhn?' + query_urls,
             video_id, u'Downloading video formats info')
             'http://serviceapi.rmcnmv.naver.com/flash/playableEncodingOption.nhn?' + query_urls,
             video_id, u'Downloading video formats info')

-        info = xml.etree.ElementTree.fromstring(info_xml.encode('utf-8'))
-        urls = xml.etree.ElementTree.fromstring(urls_xml.encode('utf-8'))

 
         formats = []
         for format_el in urls.findall('EncodingOptions/EncodingOption'):
 
         formats = []
         for format_el in urls.findall('EncodingOptions/EncodingOption'):


@@ -59,7 +56,7 @@ class NaverIE(InfoExtractor):
                 'height': int(format_el.find('height').text),
             })
 
                 'height': int(format_el.find('height').text),
             })
 

-        info = {
+        return {

             'id': video_id,
             'title': info.find('Subject').text,
             'formats': formats,
             'id': video_id,
             'title': info.find('Subject').text,
             'formats': formats,


@@ -68,6 +65,3 @@ class NaverIE(InfoExtractor):
             'upload_date': info.find('WriteDate').text.replace('.', ''),
             'view_count': int(info.find('PlayCount').text),
         }
             'upload_date': info.find('WriteDate').text.replace('.', ''),
             'view_count': int(info.find('PlayCount').text),
         }

-        # TODO: Remove when #980 has been merged
-        info.update(formats[-1])
-        return info