Merge Juniper compatibility, Py3, and Chrome browser fixes from Raccoon Gang, Edly, and UCSD forks

CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.10.1] - 2018-02-13
+
+## Added
+
+- Multiple transcripts downloading;
+- Error handling during Brightcove video re-transcode job submitting;
+
+## Fixed
+
+- Safari `empty transcripts` issue;
+- Studio editor improvements:
+    - transcripts accordion switch;
+    - re-transcode button styling;
+
 ## [0.10.0] - 2018-01-24
 
 ## Added
@@ -282,4 +296,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 [0.9.3]: https://github.com/raccoongang/xblock-video/compare/v0.9.2...v0.9.3
 [0.9.4]: https://github.com/raccoongang/xblock-video/compare/v0.9.3...v0.9.4
 [0.10.0]: https://github.com/raccoongang/xblock-video/compare/v0.9.4...v0.10.0
-[Unreleased]: https://github.com/raccoongang/xblock-video/compare/v0.10.0...HEAD
+[0.10.1]: https://github.com/raccoongang/xblock-video/compare/v0.10.0...v0.10.1
+[Unreleased]: https://github.com/raccoongang/xblock-video/compare/v0.10.1...HEAD

Makefile

@@ -55,6 +55,7 @@ dev-install:
 	pip install --process-dependency-links -e .
 
 deps-test: ## Install dependencies required to run tests
+	pip install -Ur requirements.txt
 	pip install -Ur test_requirements.txt
 	pip install -r $(VIRTUAL_ENV)/src/xblock-sdk/requirements/base.txt
 

requirements.txt

@@ -0,0 +1,6 @@
+pycaption>=1.0.6,<2
+requests>=2.9.1,<3.0.0
+babelfish>=0.5.5,<0.6.0
+XBlock>=0.4.10,<2.0.0
+xblock-utils>2,<=2.1.1
+

setup.py

@@ -48,16 +48,13 @@ def package_data(pkg, roots):
         'video_xblock',
     ],
     dependency_links=[
-        # At the moment of writing PyPI hosts outdated version of xblock-utils, hence git
-        # Replace dependency links with numbered versions when it's released on PyPI
-        'git+https://github.com/edx/[email protected]#egg=xblock-utils-1.0.5',
     ],
     install_requires=[
-        'XBlock>=0.4.10,<2.0.0',
-        'xblock-utils>=1.0.2,<=1.0.5',
-        'pycaption>=0.7.1,<1.0',  # The latest Python 2.7 compatible version
+        'pycaption>=1.0.6,<2',  # Py3, Juniper compat BeautifulSoup4>=4.9.1
         'requests>=2.9.1,<3.0.0',
         'babelfish>=0.5.5,<0.6.0',
+        'XBlock>=0.4.10,<2.0.0',
+        'xblock-utils>2,<=2.1.1'
     ],
     entry_points={
         'xblock.v1': [

video_xblock/__init__.py

@@ -2,7 +2,7 @@
 Video xblock module.
 """
 
-__version__ = '0.10.0'
+__version__ = '0.10.1'
 
 # pylint: disable=wildcard-import
 from .video_xblock import *  # nopep8

video_xblock/backends/base.py

@@ -413,7 +413,7 @@ def clean_default_transcripts(default_transcripts):
         default_transcripts.sort(key=get_values)
         distinct_transcripts = []
         for _key, group in itertools.groupby(default_transcripts, get_values):
-            distinct_transcripts.append(group.next())
+            distinct_transcripts.append(next(group))
         return distinct_transcripts
 
     def filter_default_transcripts(self, default_transcripts, transcripts):
@@ -423,6 +423,6 @@ def filter_default_transcripts(self, default_transcripts, transcripts):
         enabled_languages_codes = [t[u'lang'] for t in transcripts]
         default_transcripts = [
             dt for dt in default_transcripts
-            if (unicode(dt.get('lang')) not in enabled_languages_codes) and default_transcripts
+            if (dt.get('lang') not in enabled_languages_codes) and default_transcripts
         ]
         return default_transcripts

video_xblock/backends/brightcove.py

@@ -6,7 +6,7 @@
 import base64
 from datetime import datetime
 import json
-import httplib
+import http.client as httplib
 import logging
 import re
 
@@ -105,10 +105,14 @@ def _refresh_access_token(self):
             "Content-Type": "application/x-www-form-urlencoded",
             "Authorization": "Basic " + auth_string
         }
-        resp = requests.post(url, headers=headers, data=params)
-        if resp.status_code == httplib.OK:
-            result = resp.json()
-            return result['access_token']
+        try:
+            resp = requests.post(url, headers=headers, data=params)
+            if resp.status_code == httplib.OK:
+                result = resp.json()
+                return result['access_token']
+        except IOError:
+            log.exception(_("Connection issue. Couldn't refresh API access token."))
+            return None
 
     def get(self, url, headers=None, can_retry=True):
         """
@@ -153,13 +157,21 @@ def post(self, url, payload, headers=None, can_retry=True):
             headers_.update(headers)
 
         resp = requests.post(url, data=payload, headers=headers_)
+        log.debug("BC response status: {}".format(resp.status_code))
         if resp.status_code in (httplib.OK, httplib.CREATED):
             return resp.json()
         elif resp.status_code == httplib.UNAUTHORIZED and can_retry:
             self.access_token = self._refresh_access_token()
             return self.post(url, payload, headers, can_retry=False)
-        else:
-            raise BrightcoveApiClientError
+
+        try:
+            resp_dict = resp.json()[0]
+            log.warn("API error code: %s - %s", resp_dict.get(u'error_code'), resp_dict.get(u'message'))
+        except (ValueError, IndexError):
+            message = _("Can't parse unexpected response during POST request to Brightcove API!")
+            log.exception(message)
+            resp_dict = {"message": message}
+        return resp_dict
 
 
 class BrightcoveHlsMixin(object):
@@ -169,6 +181,8 @@ class BrightcoveHlsMixin(object):
     These features are:
     1. Video playback autoquality. i.e. adjusting video bitrate depending on client's bandwidth.
     2. Video content encryption using short-living keys.
+
+    NOTE(wowkalucky): Dynamic Ingest is the legacy ingest system. New Video Cloud accounts use Dynamic Delivery.
     """
 
     DI_PROFILES = {
@@ -240,6 +254,7 @@ def submit_retranscode_job(self, account_id, video_id, profile_type):
             - default - re-transcode using default DI profile;
             - autoquality - re-transcode using HLS only profile;
             - encryption - re-transcode using HLS with encryption profile;
+        ref: https://support.brightcove.com/dynamic-ingest-api
         """
         url = 'https://ingest.api.brightcove.com/v1/accounts/{account_id}/videos/{video_id}/ingest-requests'.format(
             account_id=account_id, video_id=video_id
@@ -255,9 +270,18 @@ def submit_retranscode_job(self, account_id, video_id, profile_type):
         if profile_type != 'default':
             retranscode_params['profile'] = self.DI_PROFILES[profile_type]['name']
         res = self.api_client.post(url, json.dumps(retranscode_params))
-        self.xblock.metadata['retranscode-status'] = (
-            'ReTranscode request submitted {:%Y-%m-%d %H:%M} UTC using profile "{}". Job id: {}'.format(
-                datetime.utcnow(), retranscode_params.get('profile', 'default'), res['id']))
+        if u'error_code' in res:
+            self.xblock.metadata['retranscode-status'] = (
+                'ReTranscode request encountered error {:%Y-%m-%d %H:%M} UTC using profile "{}".\nMessage: {}'.format(
+                    datetime.utcnow(), retranscode_params.get('profile', 'default'), res['message']
+                )
+            )
+        else:
+            self.xblock.metadata['retranscode-status'] = (
+                'ReTranscode request submitted {:%Y-%m-%d %H:%M} UTC using profile "{}". Job id: {}'.format(
+                    datetime.utcnow(), retranscode_params.get('profile', 'default'), res['id']
+                )
+            )
         return res
 
     def get_video_renditions(self, account_id, video_id):
@@ -388,6 +412,7 @@ def get_frag(self, **context):
         Because of this it doesn't use `super.get_frag()`.
         """
         context['player_state'] = json.dumps(context['player_state'])
+        log.debug('CONTEXT: player_state: %s', context.get('player_state'))
 
         frag = Fragment(
             self.render_template('brightcove.html', **context)
@@ -433,7 +458,7 @@ def get_player_html(self, **context):
                 'static/js/videojs/videojs-transcript.js'
             ]
         context['vjs_plugins'] = map(self.resource_string, vjs_plugins)
-        log.debug("[get_player_html] initialized scripts: %s", vjs_plugins)
+        log.debug("Initialized scripts: %s", vjs_plugins)
         return super(BrightcovePlayer, self).get_player_html(**context)
 
     def dispatch(self, _request, suffix):

video_xblock/backends/vimeo.py

@@ -3,7 +3,7 @@
 Vimeo Video player plugin.
 """
 
-import httplib
+import http.client as httplib
 import json
 import logging
 import re
@@ -51,7 +51,7 @@ def get(self, url, headers=None, can_retry=False):
             Response in python native data format.
         """
         headers_ = {
-            'Authorization': 'Bearer {}'.format(self.access_token.encode(encoding='utf-8')),
+            'Authorization': 'Bearer {}'.format(self.access_token),
             'Accept': 'application/json'
         }
         if headers is not None:
@@ -277,4 +277,4 @@ def download_default_transcript(self, url, language_code=None):  # pylint: disab
         data = requests.get(url)
         text = data.content.decode('utf8')
         cleaned_captions_text = remove_escaping(text)
-        return unicode(cleaned_captions_text)
+        return cleaned_captions_text

video_xblock/backends/wistia.py

@@ -3,9 +3,9 @@
 Wistia Video player plugin.
 """
 
-import HTMLParser
+from html.parser import HTMLParser
 import json
-import httplib
+import http.client as httplib
 import logging
 import re
 

video_xblock/backends/youtube.py

@@ -3,9 +3,9 @@
 YouTube Video player plugin.
 """
 
-import HTMLParser
+from html.parser import HTMLParser
 import json
-import httplib
+import http.client as httplib
 import re
 import textwrap
 import urllib

video_xblock/fields.py

@@ -7,6 +7,7 @@
 """
 
 import datetime
+from six import string_types
 import time
 
 from xblock.fields import JSONField
@@ -73,7 +74,7 @@ def from_json(self, value):
         if isinstance(value, float):
             return datetime.timedelta(seconds=value)
 
-        if isinstance(value, basestring):
+        if isinstance(value, string_types):
             return self.isotime_to_timedelta(value)
 
         msg = "RelativeTime Field {0} has bad value '{1!r}'".format(self.name, value)