Merge 332aac3975 into d65d89183f

youtube_dl/extractor/videofyme.py

@@ -1,52 +1,56 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-from ..utils import (
-    int_or_none,
-    parse_iso8601,
-)
 
 
 class VideofyMeIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.videofy\.me/.+?|p\.videofy\.me/v)/(?P<id>\d+)(&|#|$)'
     IE_NAME = 'videofy.me'
 
-    _TEST = {
-        'url': 'http://www.videofy.me/thisisvideofyme/1100701',
-        'md5': 'c77d700bdc16ae2e9f3c26019bd96143',
+    _TESTS = [{
+        'url': 'https://www.videofy.me/v/24582',
+        'md5': '1e46140bacdae8959827903cecd054d9',
         'info_dict': {
-            'id': '1100701',
+            'id': '24582',
             'ext': 'mp4',
-            'title': 'This is VideofyMe',
-            'description': '',
-            'upload_date': '20130326',
-            'timestamp': 1364288959,
-            'uploader': 'VideofyMe',
-            'uploader_id': 'thisisvideofyme',
+            'title': 'The VideofyMe app demo!',
+            'description': 'This is VideofyMe.',
+            'upload_date': '20120607',
+            'timestamp': 1339070671,
+            'uploader': 'oskarglauser',
+            'uploader_id': 7010,
             'view_count': int,
-            'likes': int,
-            'comment_count': int,
         },
-    }
+    }, {
+        'url': 'https://www.videofy.me/v/2975905',
+        'md5': '79ad4498ab14dec72e815a8f85c7641c',
+        'info_dict': {
+            'id': '2975905',
+            'ext': 'mp4',
+            'title': 'But',
+            'description': '',
+            'upload_date': '20180126',
+            'timestamp': 1516931131,
+            'uploader': 'iamatlien',
+            'uploader_id': 1798214,
+            'view_count': int,
+        },
+    }]
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
-        config = self._download_json('http://vf-player-info-loader.herokuapp.com/%s.json' % video_id, video_id)['videoinfo']
+        page = self._download_webpage(url, video_id)
 
-        video = config.get('video')
-        blog = config.get('blog', {})
+        video_info = self._search_json_ld(page, video_id)
 
-        return {
-            'id': video_id,
-            'title': video['title'],
-            'url': video['sources']['source']['url'],
-            'thumbnail': video.get('thumb'),
-            'description': video.get('description'),
-            'timestamp': parse_iso8601(video.get('date')),
-            'uploader': blog.get('name'),
-            'uploader_id': blog.get('identifier'),
-            'view_count': int_or_none(self._search_regex(r'([0-9]+)', video.get('views'), 'view count', fatal=False)),
-            'likes': int_or_none(video.get('likes')),
-            'comment_count': int_or_none(video.get('nrOfComments')),
-        }
+        uploader_id = self._download_json('https://www.videofy.me/wp-json/wp/v2/poss/%s' % video_id, video_id, fatal=False)
+        uploader_id = uploader_id.get('author') if uploader_id is not False else None
+        uploader_name = self._download_json('https://www.videofy.me/wp-json/wp/v2/users/%s' % uploader_id, uploader_id, fatal=False)
+        uploader_name = uploader_name.get('name') if uploader_name is not False else None
+
+        video_info['id'] = video_id
+        video_info['uploader_id'] = uploader_id
+        video_info['uploader'] = uploader_name
+
+        return video_info