Change URLs to load videos from DB API.

Adabriand Furtado
1 parent 61ae45dc
Showing 4 changed files with 37 additions and 20 deletions Show diff stats
corretor.py
view/js/corretor.js
view/js/helpers/video-helper.js
view/templates/index.html
@@ -34,19 +34,23 @@ class Corretor:
     def __setup_project(self, project):
         self.__update_project_info(project)
-    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"
+            blend = "/videos/" + sign + "_AVATAR.blend"
+            task = dict(sign_name=sign, submission_date=pyutil.get_date_now(),
+                         video_ref=video_ref, video_ava=video_ava, blend=blend)
             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
@@ -154,6 +158,7 @@ class Corretor:
     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)
@@ -2,7 +2,7 @@
 	var baseUrl = '';
 	var serverBackendUrl = '';
-	var videosUrl = '';
+	var apiDBHostUrl = '';
 	var uploadsUrl = '';
 	var uploadSessionId = _getUploadSessionID();
 	var pybossaEndpoint = '';
@@ -244,16 +244,17 @@
 	function _loadTaskInfo(task, deferred) {
 		currentTaskId = task.id;
 		var signName = task.info.sign_name;
-		var blendLink = videosUrl + signName + '_AVATAR.blend';
-		var baseAvatarVidUrl = videosUrl + signName + '_AVATAR';
-		var avatarVidUrl = baseAvatarVidUrl + '.webm';
-		var baseRefVidUrl = videosUrl + signName + '_REF';
-		var refVidUrl = baseRefVidUrl + '.webm';
+		var relBlend = task.info.blend;
+		var relVideoAvatarUrl = task.info.video_ava;
+		var relVideoRefUrl = task.info.video_ref;
+		var blendLink = apiDBHostUrl + relBlend;
+		var avatarVidUrl = apiDBHostUrl + relVideoAvatarUrl;
+		var refVidUrl = apiDBHostUrl + relVideoRefUrl;
 		$('.sign-label').text(signName);
 		$('#submission-date').text(
 				moment(task.info.submission_date).format('DD/MM/YYYY'));
-		$('#ref-video').html(videoHelper.getSource(baseRefVidUrl));
+		$('#ref-video').html(videoHelper.getSourceByWebmUrl(refVidUrl));
 		$('#ref-video-link').attr('href', encodeURI(refVidUrl));
 		var lastAnswer = task.info.last_answer;
@@ -262,16 +263,17 @@
 				&& typeof lastAnswer.upload_session_id != 'undefined') {
 			blendLink = uploadsUrl + lastAnswer.upload_session_id + '/'
 					+ signName + '.blend';
-			baseAvatarVidUrl = uploadsUrl + lastAnswer.upload_session_id + '/'
-			+ signName;
-			avatarVidUrl = baseAvatarVidUrl + '.webm';
+			avatarVidUrl = uploadsUrl + lastAnswer.upload_session_id + '/'
+			+ signName + '.webm';
+
 			$('#last-edit-date').text(
 					moment(lastAnswer.last_edit_date).format('DD/MM/YYYY'));
 			$('#number-of-fixes').text(lastAnswer.number_of_fixes);
 			_showApprovalGUI(task, deferred);
 		}
+
 		$('#blend-link').attr('href', encodeURI(blendLink));
-		$('#avatar-video').html(videoHelper.getSource(baseAvatarVidUrl));
+		$('#avatar-video').html(videoHelper.getSourceByWebmUrl(avatarVidUrl));
 	}
 	function _loadMainComponents() {
@@ -301,10 +303,10 @@
 	}
 	// Public methods
-	corretor.run = function(serverhost, serverbackend, projname) {
+	corretor.run = function(serverhost, serverbackend, projname, apidbhost) {
 		baseUrl = serverhost;
 		serverBackendUrl = serverbackend;
-		videosUrl = baseUrl + '/videos/';
+		apiDBHostUrl = apidbhost;
 		uploadsUrl = baseUrl + '/uploads/';
 		pybossaEndpoint = '/pybossa';
 		projectName = projname;
@@ -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));
@@ -144,5 +144,5 @@
 </div>
 <script type="text/javascript">
-	corretor.run("{{ server }}", "{{ server_backend }}", "{{ app_shortname }}");
+	corretor.run("{{ server }}", "{{ server_backend }}", "{{ app_shortname }}", "{{ api_db_host }}");
 </script>
	@@ -5,6 +5,12 @@		@@ -5,6 +5,12 @@
5	+ '<source src="' + encodeURI(videoBaseUrl + '.mp4') + '" type="video/mp4">Sem suporte a vídeos';	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	function _controlVideo(elId, toPlay) {	14	function _controlVideo(elId, toPlay) {
9	if ($(elId).length === 0)	15	if ($(elId).length === 0)
10	return;	16	return;
	@@ -27,4 +33,8 @@		@@ -27,4 +33,8 @@
27	return _getSource(videoBaseUrl);	33	return _getSource(videoBaseUrl);
28	};	34	};
29		35
		36	+ videoHelper.getSourceByWebmUrl = function(webmUrl) {
		37	+ return _getSourceByWebmUrl(webmUrl);
		38	+ };
		39	+
30	}(window.videoHelper = window.videoHelper \|\| {}, jQuery));	40	}(window.videoHelper = window.videoHelper \|\| {}, jQuery));
	@@ -144,5 +144,5 @@		@@ -144,5 +144,5 @@
144	</div>	144	</div>
145		145
146	<script type="text/javascript">	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	</script>	148	</script>