Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved all YouTube related URLs to a separate namespace.

Browse Source 
All YouTube urls are defined on backend side.
This commit is contained in:
Valera Rozuvan
2014-03-24 15:45:18 +00:00
parent 156b531293
commit 1c8eed853e
15 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/lib/xmodule/xmodule/js/fixtures/video.html
View File

@@ -17,7 +17,8 @@
data-transcript-available-translations-url="/transcript/available_translations"
data-autoplay="False"
data-yt-test-timeout="1500"
data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
data-yt-api-url="www.youtube.com/iframe_api"
data-yt-test-url="gdata.youtube.com/feeds/api/videos/"
data-autohide-html5="True"
>
<div class="focus_grabber first"></div>

3
common/lib/xmodule/xmodule/js/fixtures/video_all.html
View File

@@ -20,7 +20,8 @@
data-ogg-source="xmodule/include/fixtures/test.ogv"
data-autoplay="False"
data-yt-test-timeout="1500"
data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
data-yt-api-url="www.youtube.com/iframe_api"
data-yt-test-url="gdata.youtube.com/feeds/api/videos/"
data-autohide-html5="True"
>
<div class="focus_grabber first"></div>

3
common/lib/xmodule/xmodule/js/fixtures/video_html5.html
View File

@@ -20,7 +20,8 @@
data-ogg-source="xmodule/include/fixtures/test.ogv"
data-autoplay="False"
data-yt-test-timeout="1500"
data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
data-yt-api-url="www.youtube.com/iframe_api"
data-yt-test-url="gdata.youtube.com/feeds/api/videos/"
data-autohide-html5="True"
>
<div class="focus_grabber first"></div>

3
common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html
View File

@@ -17,7 +17,8 @@
data-transcript-available-translations-url="/transcript/available_translations"
data-autoplay="False"
data-yt-test-timeout="1500"
data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
data-yt-api-url="www.youtube.com/iframe_api"
data-yt-test-url="gdata.youtube.com/feeds/api/videos/"
data-autohide-html5="True"
>
<div class="focus_grabber first"></div>

3
common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html
View File

@@ -17,7 +17,8 @@
data-transcript-available-translations-url="/transcript/available_translations"
data-autoplay="False"
data-yt-test-timeout="1500"
data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
data-yt-api-url="www.youtube.com/iframe_api"
data-yt-test-url="gdata.youtube.com/feeds/api/videos/"
data-autohide-html5="True"
>
<div class="focus_grabber first"></div>

4
common/lib/xmodule/xmodule/js/src/video/01_initialize.js
View File

@@ -156,7 +156,7 @@ function (VideoPlayer, VideoStorage) {
_reportToServer(state, state.youtubeApiAvailable);
}, state.config.ytTestTimeout);
$.getScript(document.location.protocol + '//www.youtube.com/iframe_api');
$.getScript(document.location.protocol + '//' + state.config.ytApiUrl);
}
function _reportToServer(state, youtubeIsAvailable) {
@@ -704,7 +704,7 @@ function (VideoPlayer, VideoStorage) {
}
successHandler = ($.isFunction(callback)) ? callback : null;
xhr = $.ajax({
url: this.config.ytTestUrl + url + '?v=2&alt=jsonc',
url: document.location.protocol + '//' + this.config.ytTestUrl + url + '?v=2&alt=jsonc',
dataType: 'jsonp',
timeout: this.config.ytTestTimeout,
success: successHandler

7
common/lib/xmodule/xmodule/video_module/transcripts_utils.py
View File

@@ -97,9 +97,9 @@ def get_transcripts_from_youtube(youtube_id, settings, i18n):
utf8_parser = etree.XMLParser(encoding='utf-8')
youtube_api = copy.deepcopy(settings.YOUTUBE_API)
youtube_api['params']['v'] = youtube_id
data = requests.get(youtube_api['url'], params=youtube_api['params'])
youtube_text_api = copy.deepcopy(settings.YOUTUBE['TEXT_API'])
youtube_text_api['params']['v'] = youtube_id
data = requests.get('http://' + youtube_text_api['url'], params=youtube_text_api['params'])
if data.status_code != 200 or not data.text:
msg = _("Can't receive transcripts from Youtube for {youtube_id}. Status code: {status_code}.").format(
@@ -522,4 +522,3 @@ class Transcript(object):
return StaticContent.compute_location(
location.org, location.course, filename
)

3
common/lib/xmodule/xmodule/video_module/video_module.py
View File

@@ -325,7 +325,8 @@ class VideoModule(VideoFields, XModule):
# TODO: Later on the value 1500 should be taken from some global
# configuration setting field.
'yt_test_timeout': 1500,
'yt_test_url': settings.YOUTUBE_TEST_URL,
'yt_api_url': settings.YOUTUBE['API'],
'yt_test_url': settings.YOUTUBE['TEST_URL'],
'transcript_download_format': transcript_download_format,
'transcript_download_formats_list': self.descriptor.fields['transcript_download_format'].values,
'transcript_language': transcript_language,