X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ftoypics.py;h=f705a06c95a7d04645d3ccb50784ff444cc6e934;hb=2f483bc1c389709623117079439708783122b5ec;hp=3cbfe2e7e6b0fc00016b06eb99f1f0d316ed11f1;hpb=74af99fc2fd5fd971dd04224e90cb799b6b4bb29;p=youtube-dl

diff --git a/youtube_dl/extractor/toypics.py b/youtube_dl/extractor/toypics.py
index 3cbfe2e7e..f705a06c9 100644
--- a/youtube_dl/extractor/toypics.py
+++ b/youtube_dl/extractor/toypics.py
@@ -1,55 +1,90 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
 from .common import InfoExtractor
-from math import ceil
 import re
 
+
 class ToypicsIE(InfoExtractor):
-    _VALID_URL = r'(?:http://)?videos\.toypics\.net/.*'
+    IE_DESC = 'Toypics video'
+    _VALID_URL = r'https?://videos\.toypics\.net/view/(?P<id>[0-9]+)'
     _TEST = {
         'url': 'http://videos.toypics.net/view/514/chancebulged,-2-1/',
-        #'md5': '8a8b546956bbd0e769dbe28f6e80abb3', == $head -c10K 12929646011616163504.mp4 |md5sum //no idea why it fails
+        'md5': '16e806ad6d6f58079d210fe30985e08b',
         'info_dict': {
             'id': '514',
             'ext': 'mp4',
-            'title': 'Chance-Bulge\'d, 2',
-            'age_limit': 18
+            'title': "Chance-Bulge'd, 2",
+            'age_limit': 18,
+            'uploader': 'kidsune',
         }
     }
-    PAGINATED=8
 
     def _real_extract(self, url):
-        mobj = re.match(r'(http://)?videos\.toypics\.net/(?P<username>[^/?]+)$', url)
-        if not mobj:
-            return self.extract_one(url)
-        return [self.extract_one(u) for u in self.process_paginated(url,
-            r'public/">Public Videos \((?P<videos_count>[0-9]+)\)</a></li>',
-            r'<p class="video-entry-title">\n\s*<a href="(http://videos.toypics.net/view/[^"]+)">'
-        )]
-
-    def process_paginated(self, profile_url, re_total, re_video_page):
-        profile_page = self._download_webpage(profile_url, 'profile' , 'getting profile page: '+profile_url)
-        videos_count = self._html_search_regex(re_total, profile_page, 'videos count')
-        lst = []
-        for n in xrange(1,int(ceil(float(videos_count)/self.PAGINATED)) +1):
-            lpage_url = profile_url +'/public/%d'%n
-            lpage = self._download_webpage(lpage_url, 'page %d'%n)
-            lst.extend(re.findall(re_video_page, lpage))
-        return lst
-
-    def extract_one(self,url):
-        mobj = re.match(r'(http://)?videos\.toypics\.net/view/(?P<videoid>[0-9]+)/.*', url)
-        video_id = mobj.group('videoid')
-        page = self._download_webpage(url, video_id, 'getting page: '+url)
-        video_url = self._html_search_regex(
-            r'src:\s+"(http://static[0-9]+\.toypics\.net/flvideo/[^"]+)"', page, 'video URL')
-        title = self._html_search_regex(
-            r'<title>Toypics - ([^<]+)</title>', page, 'title')
-        username = self._html_search_regex(
-            r'toypics.net/([^/"]+)" class="user-name">', page, 'username')
+        video_id = self._match_id(url)
+
+        webpage = self._download_webpage(url, video_id)
+
+        formats = self._parse_html5_media_entries(
+            url, webpage, video_id)[0]['formats']
+        title = self._html_search_regex([
+            r'<h1[^>]+class=["\']view-video-title[^>]+>([^<]+)</h',
+            r'<title>([^<]+) - Toypics</title>',
+        ], webpage, 'title')
+
+        uploader = self._html_search_regex(
+            r'More videos from <strong>([^<]+)</strong>', webpage, 'uploader',
+            fatal=False)
+
         return {
             'id': video_id,
-            'url': video_url,
-            'ext': video_url[-3:],
+            'formats': formats,
             'title': title,
-            'uploader': username,
-            'age_limit': 18
+            'uploader': uploader,
+            'age_limit': 18,
+        }
+
+
+class ToypicsUserIE(InfoExtractor):
+    IE_DESC = 'Toypics user profile'
+    _VALID_URL = r'https?://videos\.toypics\.net/(?!view)(?P<id>[^/?#&]+)'
+    _TEST = {
+        'url': 'http://videos.toypics.net/Mikey',
+        'info_dict': {
+            'id': 'Mikey',
+        },
+        'playlist_mincount': 19,
+    }
+
+    def _real_extract(self, url):
+        username = self._match_id(url)
+
+        profile_page = self._download_webpage(
+            url, username, note='Retrieving profile page')
+
+        video_count = int(self._search_regex(
+            r'public/">Public Videos \(([0-9]+)\)</a></li>', profile_page,
+            'video count'))
+
+        PAGE_SIZE = 8
+        urls = []
+        page_count = (video_count + PAGE_SIZE + 1) // PAGE_SIZE
+        for n in range(1, page_count + 1):
+            lpage_url = url + '/public/%d' % n
+            lpage = self._download_webpage(
+                lpage_url, username,
+                note='Downloading page %d/%d' % (n, page_count))
+            urls.extend(
+                re.findall(
+                    r'<div[^>]+class=["\']preview[^>]+>\s*<a[^>]+href="(https?://videos\.toypics\.net/view/[^"]+)"',
+                    lpage))
+
+        return {
+            '_type': 'playlist',
+            'id': username,
+            'entries': [{
+                '_type': 'url',
+                'url': eurl,
+                'ie_key': 'Toypics',
+            } for eurl in urls]
         }