Merge branch 'master' into openload-phantomjs-method
authorTithen-Firion <Tithen-Firion@users.noreply.github.com>
Thu, 4 May 2017 09:00:06 +0000 (11:00 +0200)
committerGitHub <noreply@github.com>
Thu, 4 May 2017 09:00:06 +0000 (11:00 +0200)
1  2 
youtube_dl/extractor/common.py
youtube_dl/utils.py

index e54adc9f03cd81a2cdbd78d2fb28173daa382596,9541e5b424bd3828374c2e3a99e052971b5995f3..76b5378e97620137c286cf156b6e2ac790f04a8a
@@@ -245,6 -245,10 +245,10 @@@ class InfoExtractor(object)
                      specified in the URL.
      end_time:       Time in seconds where the reproduction should end, as
                      specified in the URL.
+     chapters:       A list of dictionaries, with the following entries:
+                         * "start_time" - The start time of the chapter in seconds
+                         * "end_time" - The end time of the chapter in seconds
+                         * "title" (optional, string)
  
      The following fields should only be used when the video belongs to some logical
      chapter or section:
              return info
          if isinstance(json_ld, dict):
              json_ld = [json_ld]
+         def extract_video_object(e):
+             assert e['@type'] == 'VideoObject'
+             info.update({
+                 'url': e.get('contentUrl'),
+                 'title': unescapeHTML(e.get('name')),
+                 'description': unescapeHTML(e.get('description')),
+                 'thumbnail': e.get('thumbnailUrl') or e.get('thumbnailURL'),
+                 'duration': parse_duration(e.get('duration')),
+                 'timestamp': unified_timestamp(e.get('uploadDate')),
+                 'filesize': float_or_none(e.get('contentSize')),
+                 'tbr': int_or_none(e.get('bitrate')),
+                 'width': int_or_none(e.get('width')),
+                 'height': int_or_none(e.get('height')),
+                 'view_count': int_or_none(e.get('interactionCount')),
+             })
          for e in json_ld:
              if e.get('@context') == 'http://schema.org':
                  item_type = e.get('@type')
                          'description': unescapeHTML(e.get('articleBody')),
                      })
                  elif item_type == 'VideoObject':
-                     info.update({
-                         'url': e.get('contentUrl'),
-                         'title': unescapeHTML(e.get('name')),
-                         'description': unescapeHTML(e.get('description')),
-                         'thumbnail': e.get('thumbnailUrl') or e.get('thumbnailURL'),
-                         'duration': parse_duration(e.get('duration')),
-                         'timestamp': unified_timestamp(e.get('uploadDate')),
-                         'filesize': float_or_none(e.get('contentSize')),
-                         'tbr': int_or_none(e.get('bitrate')),
-                         'width': int_or_none(e.get('width')),
-                         'height': int_or_none(e.get('height')),
-                     })
+                     extract_video_object(e)
+                 elif item_type == 'WebPage':
+                     video = e.get('video')
+                     if isinstance(video, dict) and video.get('@type') == 'VideoObject':
+                         extract_video_object(video)
                  break
          return dict((k, v) for k, v in info.items() if v is not None)
  
                                entry_protocol='m3u8', preference=None,
                                m3u8_id=None, note=None, errnote=None,
                                fatal=True, live=False):
          res = self._download_webpage_handle(
              m3u8_url, video_id,
              note=note or 'Downloading m3u8 information',
              errnote=errnote or 'Failed to download m3u8 information',
              fatal=fatal)
          if res is False:
              return []
          m3u8_doc, urlh = res
          m3u8_url = urlh.geturl()
  
+         return self._parse_m3u8_formats(
+             m3u8_doc, m3u8_url, ext=ext, entry_protocol=entry_protocol,
+             preference=preference, m3u8_id=m3u8_id, live=live)
+     def _parse_m3u8_formats(self, m3u8_doc, m3u8_url, ext=None,
+                             entry_protocol='m3u8', preference=None,
+                             m3u8_id=None, live=False):
          if '#EXT-X-FAXS-CM:' in m3u8_doc:  # Adobe Flash Access
              return []
  
-         formats = [self._m3u8_meta_format(m3u8_url, ext, preference, m3u8_id)]
+         formats = []
  
          format_url = lambda u: (
              u
              if re.match(r'^https?://', u)
              else compat_urlparse.urljoin(m3u8_url, u))
  
-         # We should try extracting formats only from master playlists [1], i.e.
-         # playlists that describe available qualities. On the other hand media
-         # playlists [2] should be returned as is since they contain just the media
-         # without qualities renditions.
+         # References:
+         # 1. https://tools.ietf.org/html/draft-pantos-http-live-streaming-21
+         # 2. https://github.com/rg3/youtube-dl/issues/12211
+         # We should try extracting formats only from master playlists [1, 4.3.4],
+         # i.e. playlists that describe available qualities. On the other hand
+         # media playlists [1, 4.3.3] should be returned as is since they contain
+         # just the media without qualities renditions.
          # Fortunately, master playlist can be easily distinguished from media
-         # playlist based on particular tags availability. As of [1, 2] master
-         # playlist tags MUST NOT appear in a media playist and vice versa.
-         # As of [3] #EXT-X-TARGETDURATION tag is REQUIRED for every media playlist
-         # and MUST NOT appear in master playlist thus we can clearly detect media
-         # playlist with this criterion.
-         # 1. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.4
-         # 2. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.3
-         # 3. https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.3.1
+         # playlist based on particular tags availability. As of [1, 4.3.3, 4.3.4]
+         # master playlist tags MUST NOT appear in a media playist and vice versa.
+         # As of [1, 4.3.3.1] #EXT-X-TARGETDURATION tag is REQUIRED for every
+         # media playlist and MUST NOT appear in master playlist thus we can
+         # clearly detect media playlist with this criterion.
          if '#EXT-X-TARGETDURATION' in m3u8_doc:  # media playlist, return as is
              return [{
                  'url': m3u8_url,
                  'protocol': entry_protocol,
                  'preference': preference,
              }]
-         audio_in_video_stream = {}
-         last_info = {}
-         last_media = {}
+         groups = {}
+         last_stream_inf = {}
+         def extract_media(x_media_line):
+             media = parse_m3u8_attributes(x_media_line)
+             # As per [1, 4.3.4.1] TYPE, GROUP-ID and NAME are REQUIRED
+             media_type, group_id, name = media.get('TYPE'), media.get('GROUP-ID'), media.get('NAME')
+             if not (media_type and group_id and name):
+                 return
+             groups.setdefault(group_id, []).append(media)
+             if media_type not in ('VIDEO', 'AUDIO'):
+                 return
+             media_url = media.get('URI')
+             if media_url:
+                 format_id = []
+                 for v in (group_id, name):
+                     if v:
+                         format_id.append(v)
+                 f = {
+                     'format_id': '-'.join(format_id),
+                     'url': format_url(media_url),
+                     'manifest_url': m3u8_url,
+                     'language': media.get('LANGUAGE'),
+                     'ext': ext,
+                     'protocol': entry_protocol,
+                     'preference': preference,
+                 }
+                 if media_type == 'AUDIO':
+                     f['vcodec'] = 'none'
+                 formats.append(f)
+         def build_stream_name():
+             # Despite specification does not mention NAME attribute for
+             # EXT-X-STREAM-INF tag it still sometimes may be present (see [1]
+             # or vidio test in TestInfoExtractor.test_parse_m3u8_formats)
+             # 1. http://www.vidio.com/watch/165683-dj_ambred-booyah-live-2015
+             stream_name = last_stream_inf.get('NAME')
+             if stream_name:
+                 return stream_name
+             # If there is no NAME in EXT-X-STREAM-INF it will be obtained
+             # from corresponding rendition group
+             stream_group_id = last_stream_inf.get('VIDEO')
+             if not stream_group_id:
+                 return
+             stream_group = groups.get(stream_group_id)
+             if not stream_group:
+                 return stream_group_id
+             rendition = stream_group[0]
+             return rendition.get('NAME') or stream_group_id
          for line in m3u8_doc.splitlines():
              if line.startswith('#EXT-X-STREAM-INF:'):
-                 last_info = parse_m3u8_attributes(line)
+                 last_stream_inf = parse_m3u8_attributes(line)
              elif line.startswith('#EXT-X-MEDIA:'):
-                 media = parse_m3u8_attributes(line)
-                 media_type = media.get('TYPE')
-                 if media_type in ('VIDEO', 'AUDIO'):
-                     group_id = media.get('GROUP-ID')
-                     media_url = media.get('URI')
-                     if media_url:
-                         format_id = []
-                         for v in (group_id, media.get('NAME')):
-                             if v:
-                                 format_id.append(v)
-                         f = {
-                             'format_id': '-'.join(format_id),
-                             'url': format_url(media_url),
-                             'language': media.get('LANGUAGE'),
-                             'ext': ext,
-                             'protocol': entry_protocol,
-                             'preference': preference,
-                         }
-                         if media_type == 'AUDIO':
-                             f['vcodec'] = 'none'
-                             if group_id and not audio_in_video_stream.get(group_id):
-                                 audio_in_video_stream[group_id] = False
-                         formats.append(f)
-                     else:
-                         # When there is no URI in EXT-X-MEDIA let this tag's
-                         # data be used by regular URI lines below
-                         last_media = media
-                         if media_type == 'AUDIO' and group_id:
-                             audio_in_video_stream[group_id] = True
+                 extract_media(line)
              elif line.startswith('#') or not line.strip():
                  continue
              else:
-                 tbr = int_or_none(last_info.get('AVERAGE-BANDWIDTH') or last_info.get('BANDWIDTH'), scale=1000)
+                 tbr = float_or_none(
+                     last_stream_inf.get('AVERAGE-BANDWIDTH') or
+                     last_stream_inf.get('BANDWIDTH'), scale=1000)
                  format_id = []
                  if m3u8_id:
                      format_id.append(m3u8_id)
-                 # Despite specification does not mention NAME attribute for
-                 # EXT-X-STREAM-INF it still sometimes may be present
-                 stream_name = last_info.get('NAME') or last_media.get('NAME')
+                 stream_name = build_stream_name()
                  # Bandwidth of live streams may differ over time thus making
                  # format_id unpredictable. So it's better to keep provided
                  # format_id intact.
                  f = {
                      'format_id': '-'.join(format_id),
                      'url': manifest_url,
-                     'manifest_url': manifest_url,
+                     'manifest_url': m3u8_url,
                      'tbr': tbr,
                      'ext': ext,
-                     'fps': float_or_none(last_info.get('FRAME-RATE')),
+                     'fps': float_or_none(last_stream_inf.get('FRAME-RATE')),
                      'protocol': entry_protocol,
                      'preference': preference,
                  }
-                 resolution = last_info.get('RESOLUTION')
+                 resolution = last_stream_inf.get('RESOLUTION')
                  if resolution:
                      mobj = re.search(r'(?P<width>\d+)[xX](?P<height>\d+)', resolution)
                      if mobj:
                          'vbr': vbr,
                          'abr': abr,
                      })
-                 f.update(parse_codecs(last_info.get('CODECS')))
-                 if audio_in_video_stream.get(last_info.get('AUDIO')) is False and f['vcodec'] != 'none':
-                     # TODO: update acodec for audio only formats with the same GROUP-ID
-                     f['acodec'] = 'none'
+                 codecs = parse_codecs(last_stream_inf.get('CODECS'))
+                 f.update(codecs)
+                 audio_group_id = last_stream_inf.get('AUDIO')
+                 # As per [1, 4.3.4.1.1] any EXT-X-STREAM-INF tag which
+                 # references a rendition group MUST have a CODECS attribute.
+                 # However, this is not always respected, for example, [2]
+                 # contains EXT-X-STREAM-INF tag which references AUDIO
+                 # rendition group but does not have CODECS and despite
+                 # referencing audio group an audio group, it represents
+                 # a complete (with audio and video) format. So, for such cases
+                 # we will ignore references to rendition groups and treat them
+                 # as complete formats.
+                 if audio_group_id and codecs and f.get('vcodec') != 'none':
+                     audio_group = groups.get(audio_group_id)
+                     if audio_group and audio_group[0].get('URI'):
+                         # TODO: update acodec for audio only formats with
+                         # the same GROUP-ID
+                         f['acodec'] = 'none'
                  formats.append(f)
-                 last_info = {}
-                 last_media = {}
+                 last_stream_inf = {}
          return formats
  
      @staticmethod
                              'ext': mimetype2ext(mime_type),
                              'width': int_or_none(representation_attrib.get('width')),
                              'height': int_or_none(representation_attrib.get('height')),
-                             'tbr': int_or_none(bandwidth, 1000),
+                             'tbr': float_or_none(bandwidth, 1000),
                              'asr': int_or_none(representation_attrib.get('audioSamplingRate')),
                              'fps': int_or_none(representation_attrib.get('frameRate')),
                              'language': lang if lang not in ('mul', 'und', 'zxx', 'mis') else None,
  
      def _find_jwplayer_data(self, webpage, video_id=None, transform_source=js_to_json):
          mobj = re.search(
-             r'jwplayer\((?P<quote>[\'"])[^\'" ]+(?P=quote)\)\.setup\s*\((?P<options>[^)]+)\)',
+             r'(?s)jwplayer\((?P<quote>[\'"])[^\'" ]+(?P=quote)\)(?!</script>).*?\.setup\s*\((?P<options>[^)]+)\)',
              webpage)
          if mobj:
              try:
  
      def _parse_jwplayer_formats(self, jwplayer_sources_data, video_id=None,
                                  m3u8_id=None, mpd_id=None, rtmp_params=None, base_url=None):
+         urls = []
          formats = []
          for source in jwplayer_sources_data:
-             source_url = self._proto_relative_url(source['file'])
+             source_url = self._proto_relative_url(source.get('file'))
+             if not source_url:
+                 continue
              if base_url:
                  source_url = compat_urlparse.urljoin(base_url, source_url)
+             if source_url in urls:
+                 continue
+             urls.append(source_url)
              source_type = source.get('type') or ''
              ext = mimetype2ext(source_type) or determine_ext(source_url)
              if source_type == 'hls' or ext == 'm3u8':
                  self._downloader.report_warning(msg)
          return res
  
 -    def _set_cookie(self, domain, name, value, expire_time=None):
 +    def _set_cookie(self, domain, name, value, expire_time=None, port=None,
 +                    path='/', secure=False, discard=False, rest={}, **kwargs):
          cookie = compat_cookiejar.Cookie(
 -            0, name, value, None, None, domain, None,
 -            None, '/', True, False, expire_time, '', None, None, None)
 +            0, name, value, port, not port is None, domain, True,
 +            domain.startswith('.'), path, True, secure, expire_time,
 +            discard, None, None, rest)
          self._downloader.cookiejar.set_cookie(cookie)
  
      def _get_cookies(self, url):
diff --combined youtube_dl/utils.py
index 84aaac6643a2a9df59bfbeee941ad33faf53eec8,25bd228ab159d345d878c00191bfc7f05bd5e227..c67f95ac96901bdbd83d7c290fb98ecf3fb4e944
@@@ -11,6 -11,7 +11,7 @@@ import contextli
  import ctypes
  import datetime
  import email.utils
+ import email.header
  import errno
  import functools
  import gzip
@@@ -421,8 -422,8 +422,8 @@@ def clean_html(html)
  
      # Newline vs <br />
      html = html.replace('\n', ' ')
-     html = re.sub(r'\s*<\s*br\s*/?\s*>\s*', '\n', html)
-     html = re.sub(r'<\s*/\s*p\s*>\s*<\s*p[^>]*>', '\n', html)
+     html = re.sub(r'(?u)\s*<\s*br\s*/?\s*>\s*', '\n', html)
+     html = re.sub(r'(?u)<\s*/\s*p\s*>\s*<\s*p[^>]*>', '\n', html)
      # Strip html tags
      html = re.sub('<.*?>', '', html)
      # Replace html entities
@@@ -1194,6 -1195,11 +1195,11 @@@ def unified_timestamp(date_str, day_fir
      # Remove AM/PM + timezone
      date_str = re.sub(r'(?i)\s*(?:AM|PM)(?:\s+[A-Z]+)?', '', date_str)
  
+     # Remove unrecognized timezones from ISO 8601 alike timestamps
+     m = re.search(r'\d{1,2}:\d{1,2}(?:\.\d+)?(?P<tz>\s*[A-Z]+)$', date_str)
+     if m:
+         date_str = date_str[:-len(m.group('tz'))]
      for expression in date_formats(day_first):
          try:
              dt = datetime.datetime.strptime(date_str, expression) - timezone + datetime.timedelta(hours=pm_delta)
@@@ -2092,6 -2098,58 +2098,58 @@@ def update_Request(req, url=None, data=
      return new_req
  
  
+ def try_multipart_encode(data, boundary):
+     content_type = 'multipart/form-data; boundary=%s' % boundary
+     out = b''
+     for k, v in data.items():
+         out += b'--' + boundary.encode('ascii') + b'\r\n'
+         if isinstance(k, compat_str):
+             k = k.encode('utf-8')
+         if isinstance(v, compat_str):
+             v = v.encode('utf-8')
+         # RFC 2047 requires non-ASCII field names to be encoded, while RFC 7578
+         # suggests sending UTF-8 directly. Firefox sends UTF-8, too
+         content = b'Content-Disposition: form-data; name="%s"\r\n\r\n' % k + v + b'\r\n'
+         if boundary.encode('ascii') in content:
+             raise ValueError('Boundary overlaps with data')
+         out += content
+     out += b'--' + boundary.encode('ascii') + b'--\r\n'
+     return out, content_type
+ def multipart_encode(data, boundary=None):
+     '''
+     Encode a dict to RFC 7578-compliant form-data
+     data:
+         A dict where keys and values can be either Unicode or bytes-like
+         objects.
+     boundary:
+         If specified a Unicode object, it's used as the boundary. Otherwise
+         a random boundary is generated.
+     Reference: https://tools.ietf.org/html/rfc7578
+     '''
+     has_specified_boundary = boundary is not None
+     while True:
+         if boundary is None:
+             boundary = '---------------' + str(random.randrange(0x0fffffff, 0xffffffff))
+         try:
+             out, content_type = try_multipart_encode(data, boundary)
+             break
+         except ValueError:
+             if has_specified_boundary:
+                 raise
+             boundary = None
+     return out, content_type
  def dict_get(d, key_or_keys, default=None, skip_false_values=True):
      if isinstance(key_or_keys, (list, tuple)):
          for key in key_or_keys:
  
  
  def try_get(src, getter, expected_type=None):
-     try:
-         v = getter(src)
-     except (AttributeError, KeyError, TypeError, IndexError):
-         pass
-     else:
-         if expected_type is None or isinstance(v, expected_type):
-             return v
+     if not isinstance(getter, (list, tuple)):
+         getter = [getter]
+     for get in getter:
+         try:
+             v = get(src)
+         except (AttributeError, KeyError, TypeError, IndexError):
+             pass
+         else:
+             if expected_type is None or isinstance(v, expected_type):
+                 return v
  
  
  def encode_compat_str(string, encoding=preferredencoding(), errors='strict'):
@@@ -2270,10 -2331,8 +2331,8 @@@ def mimetype2ext(mt)
      return {
          '3gpp': '3gp',
          'smptett+xml': 'tt',
-         'srt': 'srt',
          'ttaf+xml': 'dfxp',
          'ttml+xml': 'ttml',
-         'vtt': 'vtt',
          'x-flv': 'flv',
          'x-mp4-fragmented': 'mp4',
          'x-ms-wmv': 'wmv',
          'x-mpegurl': 'm3u8',
          'vnd.apple.mpegurl': 'm3u8',
          'dash+xml': 'mpd',
-         'f4m': 'f4m',
          'f4m+xml': 'f4m',
          'hds+xml': 'f4m',
          'vnd.ms-sstr+xml': 'ism',
          'quicktime': 'mov',
+         'mp2t': 'ts',
      }.get(res, res)
  
  
@@@ -2508,27 -2567,97 +2567,97 @@@ def srt_subtitles_timecode(seconds)
  
  
  def dfxp2srt(dfxp_data):
+     LEGACY_NAMESPACES = (
+         ('http://www.w3.org/ns/ttml', [
+             'http://www.w3.org/2004/11/ttaf1',
+             'http://www.w3.org/2006/04/ttaf1',
+             'http://www.w3.org/2006/10/ttaf1',
+         ]),
+         ('http://www.w3.org/ns/ttml#styling', [
+             'http://www.w3.org/ns/ttml#style',
+         ]),
+     )
+     SUPPORTED_STYLING = [
+         'color',
+         'fontFamily',
+         'fontSize',
+         'fontStyle',
+         'fontWeight',
+         'textDecoration'
+     ]
      _x = functools.partial(xpath_with_ns, ns_map={
          'ttml': 'http://www.w3.org/ns/ttml',
-         'ttaf1': 'http://www.w3.org/2006/10/ttaf1',
-         'ttaf1_0604': 'http://www.w3.org/2006/04/ttaf1',
+         'tts': 'http://www.w3.org/ns/ttml#styling',
      })
  
+     styles = {}
+     default_style = {}
      class TTMLPElementParser(object):
-         out = ''
+         _out = ''
+         _unclosed_elements = []
+         _applied_styles = []
  
          def start(self, tag, attrib):
-             if tag in (_x('ttml:br'), _x('ttaf1:br'), 'br'):
-                 self.out += '\n'
+             if tag in (_x('ttml:br'), 'br'):
+                 self._out += '\n'
+             else:
+                 unclosed_elements = []
+                 style = {}
+                 element_style_id = attrib.get('style')
+                 if default_style:
+                     style.update(default_style)
+                 if element_style_id:
+                     style.update(styles.get(element_style_id, {}))
+                 for prop in SUPPORTED_STYLING:
+                     prop_val = attrib.get(_x('tts:' + prop))
+                     if prop_val:
+                         style[prop] = prop_val
+                 if style:
+                     font = ''
+                     for k, v in sorted(style.items()):
+                         if self._applied_styles and self._applied_styles[-1].get(k) == v:
+                             continue
+                         if k == 'color':
+                             font += ' color="%s"' % v
+                         elif k == 'fontSize':
+                             font += ' size="%s"' % v
+                         elif k == 'fontFamily':
+                             font += ' face="%s"' % v
+                         elif k == 'fontWeight' and v == 'bold':
+                             self._out += '<b>'
+                             unclosed_elements.append('b')
+                         elif k == 'fontStyle' and v == 'italic':
+                             self._out += '<i>'
+                             unclosed_elements.append('i')
+                         elif k == 'textDecoration' and v == 'underline':
+                             self._out += '<u>'
+                             unclosed_elements.append('u')
+                     if font:
+                         self._out += '<font' + font + '>'
+                         unclosed_elements.append('font')
+                     applied_style = {}
+                     if self._applied_styles:
+                         applied_style.update(self._applied_styles[-1])
+                     applied_style.update(style)
+                     self._applied_styles.append(applied_style)
+                 self._unclosed_elements.append(unclosed_elements)
  
          def end(self, tag):
-             pass
+             if tag not in (_x('ttml:br'), 'br'):
+                 unclosed_elements = self._unclosed_elements.pop()
+                 for element in reversed(unclosed_elements):
+                     self._out += '</%s>' % element
+                 if unclosed_elements and self._applied_styles:
+                     self._applied_styles.pop()
  
          def data(self, data):
-             self.out += data
+             self._out += data
  
          def close(self):
-             return self.out.strip()
+             return self._out.strip()
  
      def parse_node(node):
          target = TTMLPElementParser()
          parser.feed(xml.etree.ElementTree.tostring(node))
          return parser.close()
  
+     for k, v in LEGACY_NAMESPACES:
+         for ns in v:
+             dfxp_data = dfxp_data.replace(ns, k)
      dfxp = compat_etree_fromstring(dfxp_data.encode('utf-8'))
      out = []
-     paras = dfxp.findall(_x('.//ttml:p')) or dfxp.findall(_x('.//ttaf1:p')) or dfxp.findall(_x('.//ttaf1_0604:p')) or dfxp.findall('.//p')
+     paras = dfxp.findall(_x('.//ttml:p')) or dfxp.findall('.//p')
  
      if not paras:
          raise ValueError('Invalid dfxp/TTML subtitle')
  
+     repeat = False
+     while True:
+         for style in dfxp.findall(_x('.//ttml:style')):
+             style_id = style.get('id')
+             parent_style_id = style.get('style')
+             if parent_style_id:
+                 if parent_style_id not in styles:
+                     repeat = True
+                     continue
+                 styles[style_id] = styles[parent_style_id].copy()
+             for prop in SUPPORTED_STYLING:
+                 prop_val = style.get(_x('tts:' + prop))
+                 if prop_val:
+                     styles.setdefault(style_id, {})[prop] = prop_val
+         if repeat:
+             repeat = False
+         else:
+             break
+     for p in ('body', 'div'):
+         ele = xpath_element(dfxp, [_x('.//ttml:' + p), './/' + p])
+         if ele is None:
+             continue
+         style = styles.get(ele.get('style'))
+         if not style:
+             continue
+         default_style.update(style)
      for para, index in zip(paras, itertools.count(1)):
          begin_time = parse_dfxp_time_expr(para.attrib.get('begin'))
          end_time = parse_dfxp_time_expr(para.attrib.get('end'))
@@@ -3654,211 -3815,9 +3815,218 @@@ def write_xattr(path, key, value)
                          "or the 'xattr' binary.")
  
  
 +def cookie_to_dict(cookie):
 +    cookie_dict = {
 +        'name': cookie.name,
 +        'value': cookie.value,
 +    };
 +    if cookie.port_specified:
 +        cookie_dict['port'] = cookie.port
 +    if cookie.domain_specified:
 +        cookie_dict['domain'] = cookie.domain
 +    if cookie.path_specified:
 +        cookie_dict['path'] = cookie.path
 +    if not cookie.expires is None:
 +        cookie_dict['expires'] = cookie.expires
 +    if not cookie.secure is None:
 +        cookie_dict['secure'] = cookie.secure
 +    if not cookie.discard is None:
 +        cookie_dict['discard'] = cookie.discard
 +    try:
 +        if (cookie.has_nonstandard_attr('httpOnly') or
 +            cookie.has_nonstandard_attr('httponly') or
 +            cookie.has_nonstandard_attr('HttpOnly')):
 +            cookie_dict['httponly'] = True
 +    except TypeError:
 +        pass
 +    return cookie_dict
 +
 +
 +def cookie_jar_to_list(cookie_jar):
 +    return [cookie_to_dict(cookie) for cookie in cookie_jar]
 +
 +
 +class PhantomJSwrapper(object):
 +    """PhantomJS wrapper class"""
 +
 +    _TEMPLATE = r'''
 +        phantom.onError = function(msg, trace) {{
 +          var msgStack = ['PHANTOM ERROR: ' + msg];
 +          if(trace && trace.length) {{
 +            msgStack.push('TRACE:');
 +            trace.forEach(function(t) {{
 +              msgStack.push(' -> ' + (t.file || t.sourceURL) + ': ' + t.line
 +                + (t.function ? ' (in function ' + t.function +')' : ''));
 +            }});
 +          }}
 +          console.error(msgStack.join('\n'));
 +          phantom.exit(1);
 +        }};
 +        var page = require('webpage').create();
 +        var fs = require('fs');
 +        var read = {{ mode: 'r', charset: 'utf-8' }};
 +        var write = {{ mode: 'w', charset: 'utf-8' }};
 +        JSON.parse(fs.read("{cookies}", read)).forEach(function(x) {{
 +          phantom.addCookie(x);
 +        }});
 +        page.settings.resourceTimeout = {timeout};
 +        page.settings.userAgent = "{ua}";
 +        page.onLoadStarted = function() {{
 +          page.evaluate(function() {{
 +            delete window._phantom;
 +            delete window.callPhantom;
 +          }});
 +        }};
 +        var saveAndExit = function() {{
 +          fs.write("{html}", page.content, write);
 +          fs.write("{cookies}", JSON.stringify(phantom.cookies), write);
 +          phantom.exit();
 +        }};
 +        page.onLoadFinished = function(status) {{
 +          if(page.url === "") {{
 +            page.setContent(fs.read("{html}", read), "{url}");
 +          }}
 +          else {{
 +            {jscode}
 +          }}
 +        }};
 +        page.open("");
 +    '''
 +
 +    _TMP_FILE_NAMES = ['script', 'html', 'cookies']
 +
 +    def __init__(self, extractor, required_version=None, timeout=10000):
 +        self.exe = check_executable('phantomjs', ['-v'])
 +        if not self.exe:
 +            raise ExtractorError('PhantomJS executable not found in PATH, '
 +                                 'download it from http://phantomjs.org',
 +                                 expected=True)
 +
 +        self.extractor = extractor
 +
 +        if required_version:
 +            version = get_exe_version(self.exe, version_re=r'([0-9.]+)')
 +            if is_outdated_version(version, required_version):
 +                self.extractor._downloader.report_warning(
 +                    'Your copy of PhantomJS is outdated, update it to version '
 +                    '%s or newer if you encounter any errors.' % required_version)
 +
 +        self.options = {
 +            'timeout': timeout,
 +        }
 +        self._TMP_FILES = {}
 +        for name in self._TMP_FILE_NAMES:
 +            tmp = tempfile.NamedTemporaryFile(delete=False)
 +            tmp.close()
 +            self._TMP_FILES[name] = tmp
 +
 +    def __del__(self):
 +        for name in self._TMP_FILE_NAMES:
 +            try:
 +                os.remove(self._TMP_FILES[name].name)
 +            except:
 +                pass
 +
 +    def _save_cookies(self, url):
 +        cookies = cookie_jar_to_list(self.extractor._downloader.cookiejar)
 +        for cookie in cookies:
 +            if 'path' not in cookie:
 +                cookie['path'] = '/'
 +            if 'domain' not in cookie:
 +                cookie['domain'] = compat_urlparse.urlparse(url).netloc
 +        with open(self._TMP_FILES['cookies'].name, 'wb') as f:
 +            f.write(json.dumps(cookies).encode('utf-8'))
 +
 +    def _load_cookies(self):
 +        with open(self._TMP_FILES['cookies'].name, 'rb') as f:
 +            cookies = json.loads(f.read().decode('utf-8'))
 +        for cookie in cookies:
 +            if cookie['httponly'] is True:
 +                cookie['rest'] = { 'httpOnly': None }
 +            if 'expiry' in cookie:
 +                cookie['expire_time'] = cookie['expiry']
 +            self.extractor._set_cookie(**cookie)
 +
 +    def get(self, url, html=None, video_id=None, note=None, note2='Executing JS on webpage', headers={}, jscode='saveAndExit();'):
 +        """
 +        Downloads webpage (if needed) and executes JS
 +        
 +        Params:
 +            url: website url
 +            html: optional, html code of website
 +            video_id: video id
 +            note: optional, displayed when downloading webpage
 +            note2: optional, displayed when executing JS
 +            headers: custom http headers
 +            jscode: code to be executed when page is loaded
 +        
 +        Returns tuple with:
 +            * downloaded website (after JS execution)
 +            * anything you print with `console.log` (but not inside `page.execute`!)
 +        
 +        In most cases you don't need to add any `jscode`.
 +        It is executed in `page.onLoadFinished`.
 +        `saveAndExit();` is mandatory, use it instead of `phantom.exit()`
 +        It is possible to wait for some element on the webpage, for example:
 +            var check = function() {
 +              var elementFound = page.evaluate(function() {
 +                return document.querySelector('#b.done') !== null;
 +              });
 +              if(elementFound)
 +                saveAndExit();
 +              else
 +                window.setTimeout(check, 500);
 +            }
 +            
 +            page.evaluate(function(){
 +              document.querySelector('#a').click();
 +            });
 +            check();
 +        """
 +        if 'saveAndExit();' not in jscode:
 +            raise ExtractorError('`saveAndExit();` not found in `jscode`')
 +        if not html:
 +            html = self.extractor._download_webpage(url, video_id, note=note, headers=headers)
 +        with open(self._TMP_FILES['html'].name, 'wb') as f:
 +            f.write(html.encode('utf-8'))
 +
 +        self._save_cookies(url)
 +
 +        replaces = self.options
 +        replaces['url'] = url
 +        user_agent = headers.get('User-Agent') or std_headers['User-Agent']
 +        replaces['ua'] = user_agent.replace('"', '\\"')
 +        replaces['jscode'] = jscode
 +
 +        for x in self._TMP_FILE_NAMES:
 +            replaces[x] = self._TMP_FILES[x].name.replace('\\', '\\\\').replace('"', '\\"')
 +
 +        with open(self._TMP_FILES['script'].name, 'wb') as f:
 +            f.write(self._TEMPLATE.format(**replaces).encode('utf-8'))
 +
 +        if video_id is None:
 +            self.extractor.to_screen('%s' % (note2,))
 +        else:
 +            self.extractor.to_screen('%s: %s' % (video_id, note2))
 +
 +        p = subprocess.Popen([self.exe, '--ssl-protocol=any',
 +            self._TMP_FILES['script'].name], stdout=subprocess.PIPE,
 +            stderr=subprocess.PIPE)
 +        out, err = p.communicate()
 +        if p.returncode != 0:
 +            raise ExtractorError('Executing JS failed\n:'
 +                                 + encodeArgument(err))
 +        with open(self._TMP_FILES['html'].name, 'rb') as f:
 +            html = f.read().decode('utf-8')
 +
 +        self._load_cookies()
 +
 +        return (html, encodeArgument(out))
 +
++
+ def random_birthday(year_field, month_field, day_field):
+     return {
+         year_field: str(random.randint(1950, 1995)),
+         month_field: str(random.randint(1, 12)),
+         day_field: str(random.randint(1, 31)),
+     }