Download as
Browse Code »

Commit fb34333bcba2d0bd10a735121f8a1d124942fdc4

Authored by dhuy
1 parent b032b670
Exists in master and in 1 other branch devel

Refactoring the source code of endpoints files

Showing 3 changed files with 12 additions and 9 deletions   Show diff stats
endpoints/video.js
  Diff comments   View file @fb34333
@@ -3,6 +3,7 @@ var properties = require('../helpers/properties'); @@ -3,6 +3,7 @@ var properties = require('../helpers/properties');
3 3
4 var exec = require('child_process').exec, child; 4 var exec = require('child_process').exec, child;
5 var querystring = require('querystring'); 5 var querystring = require('querystring');
  6 +var mkdirp = require('mkdirp');
6 var http = require('http'); 7 var http = require('http');
7 var url = require('url'); 8 var url = require('url');
8 var fs = require('fs'); 9 var fs = require('fs');
@@ -26,14 +27,14 @@ function init(req, res) { @@ -26,14 +27,14 @@ function init(req, res) {
26 return; 27 return;
27 } 28 }
28 29
29 - /* Cria uma pasta cujo o nome é o ID */  
30 - child = exec('mkdir ' + __dirname + '/uploads/' + properties.ID_FROM_BD); 30 + /* Cria uma pasta cujo o nome é o ID atual */
  31 + mkdirp('/home/libras/vlibras-api/uploads/' + properties.ID_FROM_BD, function(error) {
  32 +
  33 + if (error) { console.log(error); res.send(500, parameters.errorMessage('Erro na criação da pasta com o ID: ' + properties.ID_FROM_BD)); return; }
31 34
32 - /* Listener que dispara quando a pasta é criada */  
33 - child.on('close', function(code, signal){  
34 /* Move o vídeo submetido para a pasta com o seu ID correspondente */ 35 /* Move o vídeo submetido para a pasta com o seu ID correspondente */
35 - fs.rename(req.files.video.path, __dirname + '/uploads/' + properties.ID_FROM_BD + '/' + req.files.video.name, function(error) {  
36 - if (error) { console.log(error); } 36 + fs.rename(req.files.video.path, properties.uploads_folder + properties.ID_FROM_BD + '/' + req.files.video.name, function(error) {
  37 + if (error) { console.log(error); res.send(500, parameters.errorMessage('Erro ao mover a pasta com o ID: ' + properties.ID_FROM_BD)); return; }
37 }); 38 });
38 39
39 /* Cria a linha de comando */ 40 /* Cria a linha de comando */
endpoints/video_legenda.js
  Diff comments   View file @fb34333
@@ -2,8 +2,8 @@ var parameters = require('../helpers/parameters'); @@ -2,8 +2,8 @@ var parameters = require('../helpers/parameters');
2 var properties = require('../helpers/properties'); 2 var properties = require('../helpers/properties');
3 3
4 var exec = require('child_process').exec, child; 4 var exec = require('child_process').exec, child;
5 -var mkdirp = require('mkdirp');  
6 var querystring = require('querystring'); 5 var querystring = require('querystring');
  6 +var mkdirp = require('mkdirp');
7 var http = require('http'); 7 var http = require('http');
8 var url = require('url'); 8 var url = require('url');
9 var fs = require('fs'); 9 var fs = require('fs');
@@ -39,12 +39,12 @@ function init(req, res) { @@ -39,12 +39,12 @@ function init(req, res) {
39 if (error) { console.log(error); return; } 39 if (error) { console.log(error); return; }
40 40
41 /* Move o vídeo submetido para a pasta com o seu ID correspondente */ 41 /* Move o vídeo submetido para a pasta com o seu ID correspondente */
42 - fs.rename(req.files.video.path, '/home/libras/vlibras-api/uploads/' + properties.ID_FROM_BD + '/' + req.files.video.name, function(error) { 42 + fs.rename(req.files.video.path, properties.uploads_folder + properties.ID_FROM_BD + '/' + req.files.video.name, function(error) {
43 if (error) { console.log(error); } 43 if (error) { console.log(error); }
44 }); 44 });
45 45
46 /* Move a legenda submetido para a pasta com o seu ID correspondente */ 46 /* Move a legenda submetido para a pasta com o seu ID correspondente */
47 - fs.rename(req.files.legenda.path, '/home/libras/vlibras-api/uploads/' + properties.ID_FROM_BD + '/' + req.files.legenda.name, function(error) { 47 + fs.rename(req.files.legenda.path, properties.uploads_folder + properties.ID_FROM_BD + '/' + req.files.legenda.name, function(error) {
48 if (error) { console.log(error); } 48 if (error) { console.log(error); }
49 }); 49 });
50 50
@@ -65,6 +65,7 @@ function init(req, res) { @@ -65,6 +65,7 @@ function init(req, res) {
65 if (req.body.callback === undefined) { 65 if (req.body.callback === undefined) {
66 /* Listener que dispara quando a requisição ao core finaliza */ 66 /* Listener que dispara quando a requisição ao core finaliza */
67 child.on('close', function(code, signal){ 67 child.on('close', function(code, signal){
  68 + console.log('Code: ' + code);
68 res.send(200, { 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + properties.ID_FROM_BD + '.flv' }); 69 res.send(200, { 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + properties.ID_FROM_BD + '.flv' });
69 properties.ID_FROM_BD++; 70 properties.ID_FROM_BD++;
70 }); 71 });
helpers/properties.js
  Diff comments   View file @fb34333
@@ -2,6 +2,7 @@ var host = '0.0.0.0'; @@ -2,6 +2,7 @@ var host = '0.0.0.0';
2 var port = 5000; 2 var port = 5000;
3 var ID_FROM_BD = 1; 3 var ID_FROM_BD = 1;
4 var SERVER_IP = '150.165.204.30'; 4 var SERVER_IP = '150.165.204.30';
  5 +var uploads_folder = '/home/libras/vlibras-api/uploads/';
5 6
6 module.exports.host = host; 7 module.exports.host = host;
7 module.exports.port = port; 8 module.exports.port = port;