Commit b314d47a68858967f952c99e26d62000cc6a088c
1 parent
85b33a36
Exists in
master
Change URLs to load videos from DB API.
Showing
4 changed files
with
31 additions
and
11 deletions
Show diff stats
validador.py
... | ... | @@ -23,18 +23,24 @@ class Validador: |
23 | 23 | return projects[0] if len(projects) > 0 else None |
24 | 24 | |
25 | 25 | def __setup_project(self, project): |
26 | - #self.__create_tasks(project) | |
27 | 26 | self.__update_project_info(project) |
28 | 27 | |
29 | 28 | def __create_tasks(self, project): |
30 | 29 | test_signs = ["ENSINADO", "ENTANTO", "ENTENDIDO"] |
31 | 30 | for sign in test_signs: |
32 | - task = dict(sign_name=sign, submission_date=pyutil.get_date_now()) | |
31 | + video_ref = "/videos/" + sign + "_REF.webm" | |
32 | + video_ava = "/videos/" + sign + "_AVATAR.webm" | |
33 | + task = dict(sign_name=sign, submission_date=pyutil.get_date_now(), | |
34 | + video_ref=video_ref, video_ava=video_ava) | |
33 | 35 | pbclient.create_task(project.id, task) |
34 | 36 | |
35 | 37 | def __update_project_info(self, project): |
36 | 38 | template = self.env.get_template('index.html') |
37 | - project.info['task_presenter'] = template.render(server=self.config['HOST_STATIC_FILES_ENDPOINT'], server_backend=self.config['HOST_ENDPOINT'], app_shortname=self.config['PYBOSSA_APP_SHORT_NAME']) | |
39 | + project.info['task_presenter'] = template.render( | |
40 | + server=self.config['HOST_STATIC_FILES_ENDPOINT'], | |
41 | + server_backend=self.config['HOST_ENDPOINT'], | |
42 | + app_shortname=self.config['PYBOSSA_APP_SHORT_NAME'], | |
43 | + api_db_host=self.config['API_DB_HOST']) | |
38 | 44 | project.info['thumbnail'] = self.config['HOST_STATIC_FILES_ENDPOINT'] + "/img/thumbnail.png" |
39 | 45 | project.info['sched'] = "incremental" |
40 | 46 | project.info['published'] = True |
... | ... | @@ -60,6 +66,7 @@ class Validador: |
60 | 66 | def update_project(self): |
61 | 67 | app_short_name = self.config['PYBOSSA_APP_SHORT_NAME'] |
62 | 68 | project = self.__find_project(app_short_name) |
69 | + # self.__create_tasks(project) | |
63 | 70 | self.__update_project_info(project) |
64 | 71 | result_msg = "The project " + app_short_name + " was updated." |
65 | 72 | pyutil.log(result_msg) | ... | ... |
view/js/helpers/video-helper.js
... | ... | @@ -5,6 +5,12 @@ |
5 | 5 | + '<source src="' + encodeURI(videoBaseUrl + '.mp4') + '" type="video/mp4">Sem suporte a vídeos'; |
6 | 6 | } |
7 | 7 | |
8 | + function _getSourceByWebmUrl(webmUrl) { | |
9 | + var mp4Url = webmUrl.replace('.webm', '.mp4'); | |
10 | + return '<source src="' + encodeURI(webmUrl) + '" type="video/webm">' | |
11 | + + '<source src="' + encodeURI(mp4Url) + '" type="video/mp4">Sem suporte a vídeos'; | |
12 | + } | |
13 | + | |
8 | 14 | function _controlVideo(elId, toPlay) { |
9 | 15 | if ($(elId).length === 0) |
10 | 16 | return; |
... | ... | @@ -27,4 +33,8 @@ |
27 | 33 | return _getSource(videoBaseUrl); |
28 | 34 | }; |
29 | 35 | |
36 | + videoHelper.getSourceByWebmUrl = function(webmUrl) { | |
37 | + return _getSourceByWebmUrl(webmUrl); | |
38 | + }; | |
39 | + | |
30 | 40 | }(window.videoHelper = window.videoHelper || {}, jQuery)); | ... | ... |
view/js/validador.js
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | |
3 | 3 | var baseUrl = ''; |
4 | 4 | var serverBackendUrl = ''; |
5 | - var videosUrl = ''; | |
5 | + var apiDBHostUrl = ''; | |
6 | 6 | var pybossaEndpoint = ''; |
7 | 7 | var projectName = ''; |
8 | 8 | var currentTaskId = -1; |
... | ... | @@ -219,11 +219,14 @@ |
219 | 219 | function _loadTaskInfo(task) { |
220 | 220 | currentTaskId = task.id; |
221 | 221 | var signName = task.info.sign_name; |
222 | - var baseAvatarVidUrl = videosUrl + signName + '_AVATAR'; | |
223 | - var baseRefVidUrl = videosUrl + signName + '_REF'; | |
222 | + var relVideoAvatarUrl = task.info.video_ava; | |
223 | + var relVideoRefUrl = task.info.video_ref; | |
224 | + var avatarVidUrl = apiDBHostUrl + relVideoAvatarUrl; | |
225 | + var refVidUrl = apiDBHostUrl + relVideoRefUrl; | |
226 | + | |
224 | 227 | $('.sign-label').text(signName); |
225 | - $('#avatar-video').html(videoHelper.getSource(baseAvatarVidUrl)); | |
226 | - $('#ref-video').html(videoHelper.getSource(baseRefVidUrl)); | |
228 | + $('#avatar-video').html(videoHelper.getSourceByWebmUrl(avatarVidUrl)); | |
229 | + $('#ref-video').html(videoHelper.getSourceByWebmUrl(refVidUrl)); | |
227 | 230 | } |
228 | 231 | |
229 | 232 | function _loadMainComponents() { |
... | ... | @@ -253,10 +256,10 @@ |
253 | 256 | } |
254 | 257 | |
255 | 258 | // Public methods |
256 | - validador.run = function(serverhost, serverbackend, projname) { | |
259 | + validador.run = function(serverhost, serverbackend, projname, apidbhost) { | |
257 | 260 | baseUrl = serverhost; |
258 | 261 | serverBackendUrl = serverbackend; |
259 | - videosUrl = baseUrl + '/videos/'; | |
262 | + apiDBHostUrl = apidbhost; | |
260 | 263 | pybossaEndpoint = '/pybossa'; |
261 | 264 | projectName = projname; |
262 | 265 | _run(projectName); | ... | ... |
view/templates/index.html