From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 9 Dec 2013 03:42:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'dstftw/smotri.com-broadcast'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=693b8b2d310e119417787e7b06d1e1832d16f05d;p=youtube-dl

Merge remote-tracking branch 'dstftw/smotri.com-broadcast'

Conflicts:
	youtube_dl/FileDownloader.py
	youtube_dl/extractor/smotri.py
---

693b8b2d310e119417787e7b06d1e1832d16f05d
diff --cc youtube_dl/FileDownloader.py
index 8f9577512,de1dc66bb..47124932f
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@@ -234,20 -218,30 +234,29 @@@ class FileDownloader(object)
          else:
              percent_str = 'Unknown %'
          speed_str = self.format_speed(speed)
 -        if self.params.get('progress_with_newline', False):
 -            self.to_screen(u'[download] %s of %s at %s ETA %s' %
 -                (percent_str, data_len_str, speed_str, eta_str))
 -        else:
 -            self.to_screen(u'\r%s[download] %s of %s at %s ETA %s' %
 -                (clear_line, percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
 -        self.to_console_title(u'youtube-dl - %s of %s at %s ETA %s' %
 -                (percent_str.strip(), data_len_str.strip(), speed_str.strip(), eta_str.strip()))
 -        
 +
 +        msg = (u'%s of %s at %s ETA %s' %
 +               (percent_str, data_len_str, speed_str, eta_str))
 +        self._report_progress_status(msg)
 +
+     def report_progress_live_stream(self, downloaded_data_len, speed, elapsed):
+         if self.params.get('noprogress', False):
+             return
 -        clear_line = (u'\x1b[K' if sys.stderr.isatty() and os.name != 'nt' else u'')
+         downloaded_str = format_bytes(downloaded_data_len)
+         speed_str = self.format_speed(speed)
+         elapsed_str = FileDownloader.format_seconds(elapsed)
 -        if self.params.get('progress_with_newline', False):
 -            self.to_screen(u'[download] %s at %s' %
 -                (downloaded_str, speed_str))
++        msg = u'%s at %s (%s)' % (downloaded_str, speed_str, elapsed_str)
++        self._report_progress_status(msg)
++
 +    def report_finish(self, data_len_str, tot_time):
 +        """Report download finished."""
 +        if self.params.get('noprogress', False):
 +            self.to_screen(u'[download] Download completed')
          else:
 -            self.to_screen(u'\r%s[download] %s at %s ET %s' %
 -                (clear_line, downloaded_str, speed_str, elapsed_str), skip_eol=True)
 -        self.to_console_title(u'youtube-dl - %s at %s ET %s' %
 -                (downloaded_str.strip(), speed_str.strip(), elapsed_str.strip())) 
 +            self._report_progress_status(
 +                (u'100%% of %s in %s' %
 +                 (data_len_str, self.format_seconds(tot_time))),
 +                is_last_line=True)
  
      def report_resuming_byte(self, resume_len):
          """Report attempt to resume at given byte."""
@@@ -268,7 -262,16 +277,7 @@@
          """Report it was impossible to resume download."""
          self.to_screen(u'[download] Unable to resume')
  
-     def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path, tc_url, live):
 -    def report_finish(self, data_len_str, tot_time):
 -        """Report download finished."""
 -        if self.params.get('noprogress', False):
 -            self.to_screen(u'[download] Download completed')
 -        else:
 -            clear_line = (u'\x1b[K' if sys.stderr.isatty() and os.name != 'nt' else u'')
 -            self.to_screen(u'\r%s[download] 100%% of %s in %s' %
 -                (clear_line, data_len_str, self.format_seconds(tot_time)))
 -
+     def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path, tc_url, live, conn):
          def run_rtmpdump(args):
              start = time.time()
              resume_percent = None
diff --cc youtube_dl/extractor/smotri.py
index 5a28bc820,ff539ea0c..4ea89bf85
--- a/youtube_dl/extractor/smotri.py
+++ b/youtube_dl/extractor/smotri.py
@@@ -6,7 -7,9 +7,9 @@@ import uui
  
  from .common import InfoExtractor
  from ..utils import (
-     ExtractorError
+     compat_urllib_parse,
+     compat_urllib_request,
 -    ExtractorError
++    ExtractorError,
  )
  
  
@@@ -249,3 -252,105 +252,105 @@@ class SmotriUserIE(InfoExtractor)
              u'user nickname')
  
          return self.playlist_result(entries, user_id, user_nickname)
+ 
+ 
+ class SmotriBroadcastIE(InfoExtractor):
+     IE_DESC = u'Smotri.com broadcasts'
+     IE_NAME = u'smotri:broadcast'
+     _VALID_URL = r'^https?://(?:www\.)?(?P<url>smotri\.com/live/(?P<broadcastid>[^/]+))/?.*'
+ 
+     def _real_extract(self, url):
+         mobj = re.match(self._VALID_URL, url)
+         broadcast_id = mobj.group('broadcastid')
+ 
+         broadcast_url = 'http://' + mobj.group('url')
+         broadcast_page = self._download_webpage(broadcast_url, broadcast_id, u'Downloading broadcast page')
+ 
+         if re.search(u'>Режиссер с логином <br/>"%s"<br/> <span>не существует<' % broadcast_id, broadcast_page) is not None:
+             raise ExtractorError(u'Broadcast %s does not exist' % broadcast_id, expected=True)
+ 
+         # Adult content
+         if re.search(u'EroConfirmText">', broadcast_page) is not None:
+ 
+             (username, password) = self._get_login_info()
+             if username is None:
+                 raise ExtractorError(u'Erotic broadcasts allowed only for registered users, '
+                     u'use --username and --password options to provide account credentials.', expected=True)
+ 
+             # Log in
+             login_form_strs = {
+                 u'login-hint53': '1',
+                 u'confirm_erotic': '1',
+                 u'login': username,
+                 u'password': password,
+             }
+             # Convert to UTF-8 *before* urlencode because Python 2.x's urlencode
+             # chokes on unicode
+             login_form = dict((k.encode('utf-8'), v.encode('utf-8')) for k,v in login_form_strs.items())
+             login_data = compat_urllib_parse.urlencode(login_form).encode('utf-8')
+             login_url = broadcast_url + '/?no_redirect=1'
+             request = compat_urllib_request.Request(login_url, login_data)
+             request.add_header('Content-Type', 'application/x-www-form-urlencoded')
+             broadcast_page = self._download_webpage(
+                 request, broadcast_id, note=u'Logging in and confirming age')
+ 
+             if re.search(u'>Неверный логин или пароль<', broadcast_page) is not None:
+                 raise ExtractorError(u'Unable to log in: bad username or password', expected=True)
+ 
+             adult_content = True
+         else:
+             adult_content = False
+ 
+         ticket = self._html_search_regex(
+             u'window\.broadcast_control\.addFlashVar\\(\'file\', \'([^\']+)\'\\);',
+             broadcast_page, u'broadcast ticket')
+ 
+         url = 'http://smotri.com/broadcast/view/url/?ticket=%s' % ticket
+ 
+         broadcast_password = self._downloader.params.get('videopassword', None)
+         if broadcast_password:
+             url += '&pass=%s' % hashlib.md5(broadcast_password.encode('utf-8')).hexdigest()
+ 
+         broadcast_json_page = self._download_webpage(url, broadcast_id, u'Downloading broadcast JSON')
+ 
+         try:
+             broadcast_json = json.loads(broadcast_json_page)
+ 
+             protected_broadcast = broadcast_json['_pass_protected'] == 1
+             if protected_broadcast and not broadcast_password:
+                 raise ExtractorError(u'This broadcast is protected by a password, use the --video-password option', expected=True)
+ 
+             broadcast_offline = broadcast_json['is_play'] == 0
+             if broadcast_offline:
+                 raise ExtractorError(u'Broadcast %s is offline' % broadcast_id, expected=True)
+ 
+             rtmp_url = broadcast_json['_server']
+             if not rtmp_url.startswith('rtmp://'):
+                 raise ExtractorError(u'Unexpected broadcast rtmp URL')
+ 
+             broadcast_playpath = broadcast_json['_streamName']
+             broadcast_thumbnail = broadcast_json['_imgURL']
+             broadcast_title = broadcast_json['title']
+             broadcast_description = broadcast_json['description']
+             broadcaster_nick = broadcast_json['nick']
+             broadcaster_login = broadcast_json['login']
+             rtmp_conn = 'S:%s' % uuid.uuid4().hex
+         except KeyError:
+             if protected_broadcast:
+                 raise ExtractorError(u'Bad broadcast password', expected=True)
+             raise ExtractorError(u'Unexpected broadcast JSON')
+ 
+         return {
+             'id': broadcast_id,
+             'url': rtmp_url,
+             'title': broadcast_title,
+             'thumbnail': broadcast_thumbnail,
+             'description': broadcast_description,
+             'uploader': broadcaster_nick,
+             'uploader_id': broadcaster_login,
+             'age_limit': 18 if adult_content else 0,
+             'ext': 'flv',
+             'play_path': broadcast_playpath,
+             'rtmp_live': True,
+             'rtmp_conn': rtmp_conn
 -        }
++        }