Merge pull request #5076 from Ftornik/Lynda-subtitles-hotfix
authorSergey M. <dstftw@gmail.com>
Fri, 27 Feb 2015 14:56:54 +0000 (20:56 +0600)
committerSergey M. <dstftw@gmail.com>
Fri, 27 Feb 2015 14:56:54 +0000 (20:56 +0600)
[lynda] Fixed subtitles broken file

1  2 
youtube_dl/extractor/lynda.py

index e7e9d80def03eb5dcc9258d89658af0420630759,8bb21ee1d710d8ecd2b942e29a64fc57d07fde76..bfd9b73d250c0b90c50a5579d0e5283471e381c1
@@@ -18,7 -18,7 +18,7 @@@ from ..utils import 
  class LyndaIE(InfoExtractor):
      IE_NAME = 'lynda'
      IE_DESC = 'lynda.com videos'
 -    _VALID_URL = r'https?://www\.lynda\.com/[^/]+/[^/]+/\d+/(\d+)-\d\.html'
 +    _VALID_URL = r'https?://www\.lynda\.com/(?:[^/]+/[^/]+/\d+|player/embed)/(\d+)'
      _LOGIN_URL = 'https://www.lynda.com/login/login.aspx'
      _NETRC_MACHINE = 'lynda'
  
@@@ -27,7 -27,7 +27,7 @@@
  
      ACCOUNT_CREDENTIALS_HINT = 'Use --username and --password options to provide lynda.com account credentials.'
  
 -    _TEST = {
 +    _TESTS = [{
          'url': 'http://www.lynda.com/Bootstrap-tutorials/Using-exercise-files/110885/114408-4.html',
          'md5': 'ecfc6862da89489161fb9cd5f5a6fac1',
          'info_dict': {
              'title': 'Using the exercise files',
              'duration': 68
          }
 -    }
 +    }, {
 +        'url': 'https://www.lynda.com/player/embed/133770?tr=foo=1;bar=g;fizz=rt&fs=0',
 +        'only_matching': True,
 +    }]
  
      def _real_initialize(self):
          self._login()
                  continue
              appear_time = m_current.group('timecode')
              disappear_time = m_next.group('timecode')
-             text = seq_current['Caption']
+             text = seq_current['Caption'].strip()
              srt += '%s\r\n%s --> %s\r\n%s' % (str(pos), appear_time, disappear_time, text)
          if srt:
              return srt