Annotate changelog bug being closed.

[youtubedl] / youtube_dl / extractor / anitube.py

diff --git a/youtube_dl/extractor/anitube.py b/youtube_dl/extractor/anitube.py
index 2b019daa997ab3bb5dd15cdf5c2df489e181d177..31f0d417ce420de69f9e06ac0498242dc913bf73 100644 (file)
--- a/youtube_dl/extractor/anitube.py
+++ b/youtube_dl/extractor/anitube.py
@@ -1,22 +1,24 @@
+from __future__ import unicode_literals
+

 import re
 
 from .common import InfoExtractor
 
 
 class AnitubeIE(InfoExtractor):
 import re
 
 from .common import InfoExtractor
 
 
 class AnitubeIE(InfoExtractor):

-    IE_NAME = u'anitube.se'
+    IE_NAME = 'anitube.se'

     _VALID_URL = r'https?://(?:www\.)?anitube\.se/video/(?P<id>\d+)'
 
     _TEST = {
     _VALID_URL = r'https?://(?:www\.)?anitube\.se/video/(?P<id>\d+)'
 
     _TEST = {

-        u'url': u'http://www.anitube.se/video/36621',
-        u'md5': u'59d0eeae28ea0bc8c05e7af429998d43',
-        u'file': u'36621.mp4',
-        u'info_dict': {
-            u'id': u'36621',
-            u'ext': u'mp4',
-            u'title': u'Recorder to Randoseru 01',
+        'url': 'http://www.anitube.se/video/36621',
+        'md5': '59d0eeae28ea0bc8c05e7af429998d43',
+        'info_dict': {
+            'id': '36621',
+            'ext': 'mp4',
+            'title': 'Recorder to Randoseru 01',
+            'duration': 180.19,

         },
         },

-        u'skip': u'Blocked in the US',
+        'skip': 'Blocked in the US',

     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):


@@ -24,13 +26,15 @@ class AnitubeIE(InfoExtractor):
         video_id = mobj.group('id')
 
         webpage = self._download_webpage(url, video_id)
         video_id = mobj.group('id')
 
         webpage = self._download_webpage(url, video_id)

-        key = self._html_search_regex(r'http://www\.anitube\.se/embed/([A-Za-z0-9_-]*)',
-                                      webpage, u'key')
+        key = self._html_search_regex(
+            r'http://www\.anitube\.se/embed/([A-Za-z0-9_-]*)', webpage, 'key')

 
 

-        config_xml = self._download_xml('http://www.anitube.se/nuevo/econfig.php?key=%s' % key,
-                                                key)
+        config_xml = self._download_xml(
+            'http://www.anitube.se/nuevo/econfig.php?key=%s' % key, key)

 
         video_title = config_xml.find('title').text
 
         video_title = config_xml.find('title').text

+        thumbnail = config_xml.find('image').text
+        duration = float(config_xml.find('duration').text)

 
         formats = []
         video_url = config_xml.find('file')
 
         formats = []
         video_url = config_xml.find('file')


@@ -49,5 +53,7 @@ class AnitubeIE(InfoExtractor):
         return {
             'id': video_id,
             'title': video_title,
         return {
             'id': video_id,
             'title': video_title,

+            'thumbnail': thumbnail,
+            'duration': duration,

             'formats': formats
         }
             'formats': formats
         }