Tidy up the changelog.

[youtubedl] / youtube_dl / extractor / fc2.py

diff --git a/youtube_dl/extractor/fc2.py b/youtube_dl/extractor/fc2.py
index 18f91efac450d1ec697652570b6366b1709553d0..a406945e8b2f648a36483d7477362137024da7aa 100644 (file)
--- a/youtube_dl/extractor/fc2.py
+++ b/youtube_dl/extractor/fc2.py
@@ -1,21 +1,25 @@
 #! -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
 #! -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 

-import re

 import hashlib
 
 from .common import InfoExtractor
 import hashlib
 
 from .common import InfoExtractor

-from ..utils import (
-    ExtractorError,
+from ..compat import (
+    compat_urllib_parse,

     compat_urllib_request,
     compat_urlparse,
 )
     compat_urllib_request,
     compat_urlparse,
 )

+from ..utils import (
+    encode_dict,
+    ExtractorError,
+)

 
 
 class FC2IE(InfoExtractor):
 
 
 class FC2IE(InfoExtractor):

-    _VALID_URL = r'^http://video\.fc2\.com/((?P<lang>[^/]+)/)?content/(?P<id>[^/]+)'
+    _VALID_URL = r'^http://video\.fc2\.com/(?:[^/]+/)*content/(?P<id>[^/]+)'

     IE_NAME = 'fc2'
     IE_NAME = 'fc2'

-    _TEST = {
+    _NETRC_MACHINE = 'fc2'
+    _TESTS = [{

         'url': 'http://video.fc2.com/en/content/20121103kUan1KHs',
         'md5': 'a6ebe8ebe0396518689d963774a54eb7',
         'info_dict': {
         'url': 'http://video.fc2.com/en/content/20121103kUan1KHs',
         'md5': 'a6ebe8ebe0396518689d963774a54eb7',
         'info_dict': {


@@ -23,37 +27,88 @@ class FC2IE(InfoExtractor):
             'ext': 'flv',
             'title': 'Boxing again with Puff',
         },
             'ext': 'flv',
             'title': 'Boxing again with Puff',
         },

-    }
+    }, {
+        'url': 'http://video.fc2.com/en/content/20150125cEva0hDn/',
+        'info_dict': {
+            'id': '20150125cEva0hDn',
+            'ext': 'mp4',
+        },
+        'params': {
+            'username': 'ytdl@yt-dl.org',
+            'password': '(snip)',
+            'skip': 'requires actual password'
+        }
+    }, {
+        'url': 'http://video.fc2.com/en/a/content/20130926eZpARwsF',
+        'only_matching': True,
+    }]

 
 

-    def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+    def _login(self):
+        (username, password) = self._get_login_info()
+        if username is None or password is None:
+            return False

 
 

+        # Log in
+        login_form_strs = {
+            'email': username,
+            'password': password,
+            'done': 'video',
+            'Submit': ' Login ',
+        }
+
+        login_data = compat_urllib_parse.urlencode(encode_dict(login_form_strs)).encode('utf-8')
+        request = compat_urllib_request.Request(
+            'https://secure.id.fc2.com/index.php?mode=login&switch_language=en', login_data)
+
+        login_results = self._download_webpage(request, None, note='Logging in', errnote='Unable to log in')
+        if 'mode=redirect&login=done' not in login_results:
+            self.report_warning('unable to log in: bad username or password')
+            return False
+
+        # this is also needed
+        login_redir = compat_urllib_request.Request('http://id.fc2.com/?mode=redirect&login=done')
+        self._download_webpage(
+            login_redir, None, note='Login redirect', errnote='Login redirect failed')
+
+        return True
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+        self._login()

         webpage = self._download_webpage(url, video_id)
         self._downloader.cookiejar.clear_session_cookies()  # must clear
         webpage = self._download_webpage(url, video_id)
         self._downloader.cookiejar.clear_session_cookies()  # must clear

+        self._login()

 
         title = self._og_search_title(webpage)
         thumbnail = self._og_search_thumbnail(webpage)
 
         title = self._og_search_title(webpage)
         thumbnail = self._og_search_thumbnail(webpage)

-        refer = url.replace('/content/', '/a/content/')
+        refer = url.replace('/content/', '/a/content/') if '/a/content/' not in url else url

 
         mimi = hashlib.md5((video_id + '_gGddgPfeaf_gzyr').encode('utf-8')).hexdigest()
 
         info_url = (
             "http://video.fc2.com/ginfo.php?mimi={1:s}&href={2:s}&v={0:s}&fversion=WIN%2011%2C6%2C602%2C180&from=2&otag=0&upid={0:s}&tk=null&".
 
         mimi = hashlib.md5((video_id + '_gGddgPfeaf_gzyr').encode('utf-8')).hexdigest()
 
         info_url = (
             "http://video.fc2.com/ginfo.php?mimi={1:s}&href={2:s}&v={0:s}&fversion=WIN%2011%2C6%2C602%2C180&from=2&otag=0&upid={0:s}&tk=null&".

-            format(video_id, mimi, compat_urllib_request.quote(refer, safe='').replace('.','%2E')))
+            format(video_id, mimi, compat_urllib_request.quote(refer, safe=b'').replace('.', '%2E')))

 
         info_webpage = self._download_webpage(
             info_url, video_id, note='Downloading info page')
         info = compat_urlparse.parse_qs(info_webpage)
 
         if 'err_code' in info:
 
         info_webpage = self._download_webpage(
             info_url, video_id, note='Downloading info page')
         info = compat_urlparse.parse_qs(info_webpage)
 
         if 'err_code' in info:

-            raise ExtractorError('Error code: %s' % info['err_code'][0])
+            # most of the time we can still download wideo even if err_code is 403 or 602
+            self.report_warning(
+                'Error code was: %s... but still trying' % info['err_code'][0])
+
+        if 'filepath' not in info:
+            raise ExtractorError('Cannot download file. Are you logged in?')

 
         video_url = info['filepath'][0] + '?mid=' + info['mid'][0]
 
         video_url = info['filepath'][0] + '?mid=' + info['mid'][0]

+        title_info = info.get('title')
+        if title_info:
+            title = title_info[0]

 
         return {
             'id': video_id,
 
         return {
             'id': video_id,

-            'title': info['title'][0],
+            'title': title,

             'url': video_url,
             'ext': 'flv',
             'thumbnail': thumbnail,
             'url': video_url,
             'ext': 'flv',
             'thumbnail': thumbnail,