Download as
Browse Code »

Commit fee35ee7351b21dc6c0084e8c8bcd624c02a4150

Authored by Adabriand Furtado
1 parent 61ae45dc
Exists in master

Change URLs to load videos from DB API.

Showing 4 changed files with 37 additions and 20 deletions   Show diff stats
corretor.py
  Diff comments   View file @fee35ee
... ... @@ -34,19 +34,23 @@ class Corretor:
34 34 def __setup_project(self, project):
35 35 self.__update_project_info(project)
36 36  
37   - def __setup_project(self, project):
38   - #self.__create_tasks(project)
39   - self.__update_project_info(project)
40   -
41 37 def __create_tasks(self, project):
42 38 test_signs = ["ENSINADO", "ENTANTO", "ENTENDIDO"]
43 39 for sign in test_signs:
44   - task = dict(sign_name=sign, submission_date=pyutil.get_date_now())
  40 + video_ref = "/videos/" + sign + "_REF.webm"
  41 + video_ava = "/videos/" + sign + "_AVATAR.webm"
  42 + blend = "/videos/" + sign + "_AVATAR.blend"
  43 + task = dict(sign_name=sign, submission_date=pyutil.get_date_now(),
  44 + video_ref=video_ref, video_ava=video_ava, blend=blend)
45 45 pbclient.create_task(project.id, task)
46 46  
47 47 def __update_project_info(self, project):
48 48 template = self.env.get_template('index.html')
49   - 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'])
  49 + project.info['task_presenter'] = template.render(
  50 + server=self.config['HOST_STATIC_FILES_ENDPOINT'],
  51 + server_backend=self.config['HOST_ENDPOINT'],
  52 + app_shortname=self.config['PYBOSSA_APP_SHORT_NAME'],
  53 + api_db_host=self.config['API_DB_HOST'])
50 54 project.info['thumbnail'] = self.config['HOST_STATIC_FILES_ENDPOINT'] + "/img/thumbnail.png"
51 55 project.info['sched'] = "incremental"
52 56 project.info['published'] = True
... ... @@ -154,6 +158,7 @@ class Corretor:
154 158 def update_project(self):
155 159 app_short_name = self.config['PYBOSSA_APP_SHORT_NAME']
156 160 project = self.__find_project(app_short_name)
  161 + # self.__create_tasks(project)
157 162 self.__update_project_info(project)
158 163 result_msg = "The project " + app_short_name + " was updated."
159 164 pyutil.log(result_msg)
... ...
view/js/corretor.js
  Diff comments   View file @fee35ee
... ... @@ -2,7 +2,7 @@
2 2  
3 3 var baseUrl = '';
4 4 var serverBackendUrl = '';
5   - var videosUrl = '';
  5 + var apiDBHostUrl = '';
6 6 var uploadsUrl = '';
7 7 var uploadSessionId = _getUploadSessionID();
8 8 var pybossaEndpoint = '';
... ... @@ -244,16 +244,17 @@
244 244 function _loadTaskInfo(task, deferred) {
245 245 currentTaskId = task.id;
246 246 var signName = task.info.sign_name;
247   - var blendLink = videosUrl + signName + '_AVATAR.blend';
248   - var baseAvatarVidUrl = videosUrl + signName + '_AVATAR';
249   - var avatarVidUrl = baseAvatarVidUrl + '.webm';
250   - var baseRefVidUrl = videosUrl + signName + '_REF';
251   - var refVidUrl = baseRefVidUrl + '.webm';
  247 + var relBlend = task.info.blend;
  248 + var relVideoAvatarUrl = task.info.video_ava;
  249 + var relVideoRefUrl = task.info.video_ref;
  250 + var blendLink = apiDBHostUrl + relBlend;
  251 + var avatarVidUrl = apiDBHostUrl + relVideoAvatarUrl;
  252 + var refVidUrl = apiDBHostUrl + relVideoRefUrl;
252 253  
253 254 $('.sign-label').text(signName);
254 255 $('#submission-date').text(
255 256 moment(task.info.submission_date).format('DD/MM/YYYY'));
256   - $('#ref-video').html(videoHelper.getSource(baseRefVidUrl));
  257 + $('#ref-video').html(videoHelper.getSourceByWebmUrl(refVidUrl));
257 258 $('#ref-video-link').attr('href', encodeURI(refVidUrl));
258 259  
259 260 var lastAnswer = task.info.last_answer;
... ... @@ -262,16 +263,17 @@
262 263 && typeof lastAnswer.upload_session_id != 'undefined') {
263 264 blendLink = uploadsUrl + lastAnswer.upload_session_id + '/'
264 265 + signName + '.blend';
265   - baseAvatarVidUrl = uploadsUrl + lastAnswer.upload_session_id + '/'
266   - + signName;
267   - avatarVidUrl = baseAvatarVidUrl + '.webm';
  266 + avatarVidUrl = uploadsUrl + lastAnswer.upload_session_id + '/'
  267 + + signName + '.webm';
  268 +
268 269 $('#last-edit-date').text(
269 270 moment(lastAnswer.last_edit_date).format('DD/MM/YYYY'));
270 271 $('#number-of-fixes').text(lastAnswer.number_of_fixes);
271 272 _showApprovalGUI(task, deferred);
272 273 }
  274 +
273 275 $('#blend-link').attr('href', encodeURI(blendLink));
274   - $('#avatar-video').html(videoHelper.getSource(baseAvatarVidUrl));
  276 + $('#avatar-video').html(videoHelper.getSourceByWebmUrl(avatarVidUrl));
275 277 }
276 278  
277 279 function _loadMainComponents() {
... ... @@ -301,10 +303,10 @@
301 303 }
302 304  
303 305 // Public methods
304   - corretor.run = function(serverhost, serverbackend, projname) {
  306 + corretor.run = function(serverhost, serverbackend, projname, apidbhost) {
305 307 baseUrl = serverhost;
306 308 serverBackendUrl = serverbackend;
307   - videosUrl = baseUrl + '/videos/';
  309 + apiDBHostUrl = apidbhost;
308 310 uploadsUrl = baseUrl + '/uploads/';
309 311 pybossaEndpoint = '/pybossa';
310 312 projectName = projname;
... ...
view/js/helpers/video-helper.js
  Diff comments   View file @fee35ee
... ... @@ -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/templates/index.html
  Diff comments   View file @fee35ee
... ... @@ -144,5 +144,5 @@
144 144 </div>
145 145  
146 146 <script type="text/javascript">
147   - corretor.run("{{ server }}", "{{ server_backend }}", "{{ app_shortname }}");
  147 + corretor.run("{{ server }}", "{{ server_backend }}", "{{ app_shortname }}", "{{ api_db_host }}");
148 148 </script>
... ...