From b314d47a68858967f952c99e26d62000cc6a088c Mon Sep 17 00:00:00 2001
From: Adabriand Furtado <adabriand@gmail.com>
Date: Sun, 20 Nov 2016 13:10:12 -0200
Subject: [PATCH] Change URLs to load videos from DB API.

---
 validador.py                    | 13 ++++++++++---
 view/js/helpers/video-helper.js | 10 ++++++++++
 view/js/validador.js            | 17 ++++++++++-------
 view/templates/index.html       |  2 +-
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/validador.py b/validador.py
index 4d7017b..cd2534c 100644
--- a/validador.py
+++ b/validador.py
@@ -23,18 +23,24 @@ class Validador:
         return projects[0] if len(projects) > 0 else None
 
     def __setup_project(self, project):
-        #self.__create_tasks(project)
         self.__update_project_info(project)
     
     def __create_tasks(self, project):
         test_signs = ["ENSINADO", "ENTANTO", "ENTENDIDO"]
         for sign in test_signs:
-            task = dict(sign_name=sign, submission_date=pyutil.get_date_now())
+            video_ref = "/videos/" + sign + "_REF.webm"
+            video_ava = "/videos/" + sign + "_AVATAR.webm"
+            task = dict(sign_name=sign, submission_date=pyutil.get_date_now(),
+                         video_ref=video_ref, video_ava=video_ava)
             pbclient.create_task(project.id, task)
 
     def __update_project_info(self, project):
         template = self.env.get_template('index.html')
-        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'])
+        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'],
+                            api_db_host=self.config['API_DB_HOST'])
         project.info['thumbnail'] = self.config['HOST_STATIC_FILES_ENDPOINT'] + "/img/thumbnail.png"
         project.info['sched'] = "incremental"
         project.info['published'] = True
@@ -60,6 +66,7 @@ class Validador:
     def update_project(self):
         app_short_name = self.config['PYBOSSA_APP_SHORT_NAME']
         project = self.__find_project(app_short_name)
+        # self.__create_tasks(project)
         self.__update_project_info(project)
         result_msg = "The project " + app_short_name + " was updated."
         pyutil.log(result_msg)
diff --git a/view/js/helpers/video-helper.js b/view/js/helpers/video-helper.js
index 1492606..4407d8f 100644
--- a/view/js/helpers/video-helper.js
+++ b/view/js/helpers/video-helper.js
@@ -5,6 +5,12 @@
 		+ '<source src="' + encodeURI(videoBaseUrl + '.mp4') + '" type="video/mp4">Sem suporte a vídeos';
 	}
 
+	function _getSourceByWebmUrl(webmUrl) {
+		var mp4Url = webmUrl.replace('.webm', '.mp4');
+		return '<source src="' + encodeURI(webmUrl) + '" type="video/webm">'
+				+ '<source src="' + encodeURI(mp4Url) + '" type="video/mp4">Sem suporte a vídeos';
+	}
+
 	function _controlVideo(elId, toPlay) {
 		if ($(elId).length === 0)
 			return;
@@ -27,4 +33,8 @@
 		return _getSource(videoBaseUrl);
 	};
 
+	videoHelper.getSourceByWebmUrl = function(webmUrl) {
+		return _getSourceByWebmUrl(webmUrl);
+	};
+
 }(window.videoHelper = window.videoHelper || {}, jQuery));
diff --git a/view/js/validador.js b/view/js/validador.js
index 3b4e3be..3b731ae 100755
--- a/view/js/validador.js
+++ b/view/js/validador.js
@@ -2,7 +2,7 @@
 
 	var baseUrl = '';
 	var serverBackendUrl = '';
-	var videosUrl = '';
+	var apiDBHostUrl = '';
 	var pybossaEndpoint = '';
 	var projectName = '';
 	var currentTaskId = -1;
@@ -219,11 +219,14 @@
 	function _loadTaskInfo(task) {
 		currentTaskId = task.id;
 		var signName = task.info.sign_name;
-		var baseAvatarVidUrl = videosUrl + signName + '_AVATAR';
-		var baseRefVidUrl = videosUrl + signName + '_REF';
+		var relVideoAvatarUrl = task.info.video_ava;
+		var relVideoRefUrl = task.info.video_ref;
+		var avatarVidUrl = apiDBHostUrl + relVideoAvatarUrl;
+		var refVidUrl = apiDBHostUrl + relVideoRefUrl;
+
 		$('.sign-label').text(signName);
-		$('#avatar-video').html(videoHelper.getSource(baseAvatarVidUrl));
-		$('#ref-video').html(videoHelper.getSource(baseRefVidUrl));
+		$('#avatar-video').html(videoHelper.getSourceByWebmUrl(avatarVidUrl));
+		$('#ref-video').html(videoHelper.getSourceByWebmUrl(refVidUrl));
 	}
 
 	function _loadMainComponents() {
@@ -253,10 +256,10 @@
 	}
 
 	// Public methods
-	validador.run = function(serverhost, serverbackend, projname) {
+	validador.run = function(serverhost, serverbackend, projname, apidbhost) {
 		baseUrl = serverhost;
 		serverBackendUrl = serverbackend;
-		videosUrl = baseUrl + '/videos/';
+		apiDBHostUrl = apidbhost;
 		pybossaEndpoint = '/pybossa';
 		projectName = projname;
 		_run(projectName);
diff --git a/view/templates/index.html b/view/templates/index.html
index 5ab30c2..29e5550 100755
--- a/view/templates/index.html
+++ b/view/templates/index.html
@@ -115,5 +115,5 @@
 
 <script type="text/javascript">
 	validador
-			.run("{{ server }}", "{{ server_backend }}", "{{ app_shortname }}");
+			.run("{{ server }}", "{{ server_backend }}", "{{ app_shortname }}", "{{ api_db_host }}");
 </script>
--
libgit2 0.21.2