From fb34333bcba2d0bd10a735121f8a1d124942fdc4 Mon Sep 17 00:00:00 2001
From: dhuy <vandhuy@6ps.com>
Date: Mon, 26 May 2014 13:52:57 -0300
Subject: [PATCH] Refactoring the source code of endpoints files

---
 endpoints/video.js         | 13 +++++++------
 endpoints/video_legenda.js |  7 ++++---
 helpers/properties.js      |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/endpoints/video.js b/endpoints/video.js
index 167a66f..71febf6 100644
--- a/endpoints/video.js
+++ b/endpoints/video.js
@@ -3,6 +3,7 @@ var properties = require('../helpers/properties');
 
 var exec = require('child_process').exec, child;
 var querystring = require('querystring');
+var mkdirp = require('mkdirp');
 var http = require('http');
 var url = require('url');
 var fs = require('fs');
@@ -26,14 +27,14 @@ function init(req, res) {
 		return;
 	}
 
-	/* Cria uma pasta cujo o nome é o ID */
-	child = exec('mkdir ' + __dirname + '/uploads/' + properties.ID_FROM_BD);
+	/* Cria uma pasta cujo o nome é o ID atual */
+	mkdirp('/home/libras/vlibras-api/uploads/' + properties.ID_FROM_BD, function(error) {
+	
+		if (error) { console.log(error); res.send(500, parameters.errorMessage('Erro na criação da pasta com o ID: ' + properties.ID_FROM_BD)); return; }
 
-	/* Listener que dispara quando a pasta é criada */
-	child.on('close', function(code, signal){
 		/* Move o vídeo submetido para a pasta com o seu ID correspondente */
-		fs.rename(req.files.video.path, __dirname + '/uploads/' + properties.ID_FROM_BD + '/' + req.files.video.name, function(error) {
-			if (error) { console.log(error); }
+		fs.rename(req.files.video.path, properties.uploads_folder + properties.ID_FROM_BD + '/' + req.files.video.name, function(error) {
+			if (error) { console.log(error); res.send(500, parameters.errorMessage('Erro ao mover a pasta com o ID: ' + properties.ID_FROM_BD)); return; }
 		});
 
 		/* Cria a linha de comando */
diff --git a/endpoints/video_legenda.js b/endpoints/video_legenda.js
index d3be5c5..9f8d723 100644
--- a/endpoints/video_legenda.js
+++ b/endpoints/video_legenda.js
@@ -2,8 +2,8 @@ var parameters = require('../helpers/parameters');
 var properties = require('../helpers/properties');
 
 var exec = require('child_process').exec, child;
-var mkdirp = require('mkdirp');
 var querystring = require('querystring');
+var mkdirp = require('mkdirp');
 var http = require('http');
 var url = require('url');
 var fs = require('fs');
@@ -39,12 +39,12 @@ function init(req, res) {
 		if (error) { console.log(error); return; }
 
 		/* Move o vídeo submetido para a pasta com o seu ID correspondente */
-		fs.rename(req.files.video.path, '/home/libras/vlibras-api/uploads/' + properties.ID_FROM_BD + '/' + req.files.video.name, function(error) {
+		fs.rename(req.files.video.path, properties.uploads_folder + properties.ID_FROM_BD + '/' + req.files.video.name, function(error) {
 			if (error) { console.log(error); }
 		});
 
 		/* Move a legenda submetido para a pasta com o seu ID correspondente */
-		fs.rename(req.files.legenda.path, '/home/libras/vlibras-api/uploads/' + properties.ID_FROM_BD + '/' + req.files.legenda.name, function(error) {
+		fs.rename(req.files.legenda.path, properties.uploads_folder + properties.ID_FROM_BD + '/' + req.files.legenda.name, function(error) {
 			if (error) { console.log(error); }
 		});
 
@@ -65,6 +65,7 @@ function init(req, res) {
 		if (req.body.callback === undefined) {
 			/* Listener que dispara quando a requisição ao core finaliza */
 			child.on('close', function(code, signal){
+				console.log('Code: ' + code);
 				res.send(200, { 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + properties.ID_FROM_BD + '.flv' });
 				properties.ID_FROM_BD++;
 			});
diff --git a/helpers/properties.js b/helpers/properties.js
index 993d093..d1fda0c 100644
--- a/helpers/properties.js
+++ b/helpers/properties.js
@@ -2,6 +2,7 @@ var host = '0.0.0.0';
 var port = 5000;
 var ID_FROM_BD = 1;
 var SERVER_IP = '150.165.204.30';
+var uploads_folder = '/home/libras/vlibras-api/uploads/';
 
 module.exports.host = host;
 module.exports.port = port;
--
libgit2 0.21.2