Download as
Browse Code »

Commit da8c3da46ccae1a0a79a392256e026ec412b42ba

Authored by GTAVCS
1 parent 637d60ba
Exists in master and in 1 other branch devel

Adding UUID to API

Showing 3 changed files with 21 additions and 20 deletions   Show diff stats
.gitignore
  Diff comments   View file @da8c3da
... ... @@ -4,3 +4,4 @@ text_files/*
4 4 uploads/*
5 5 videos/*
6 6 vlibras_user
  7 +npm-debug.log
... ...
endpoints/ios.js
  Diff comments   View file @da8c3da
... ... @@ -2,9 +2,13 @@ var parameters = require('../helpers/parameters');
2 2 var properties = require('../helpers/properties');
3 3  
4 4 var exec = require('child_process').exec, child;
  5 +var uuid = require('node-uuid');
5 6 var fs = require('fs');
6 7  
7 8 function init(req, res) {
  9 +
  10 + var id = uuid.v4();
  11 +
8 12 /* Verifica se os paramêtros [transparencia, texto] possuem algum valor */
9 13 if ((req.body.transparencia !== '') && (req.body.texto !== '')) {
10 14 res.send(500, parameters.errorMessage('O valor de algum parâmetro está vazio'));
... ... @@ -18,9 +22,9 @@ function init(req, res) {
18 22 }
19 23  
20 24 /* Cria a linha de comando */
21   - var command_line = 'echo ' + req.body.texto + ' >> ' + __dirname + '/text_files/' + properties.ID_FROM_BD + ' && cd ../vlibras-core' +
  25 + var command_line = 'echo ' + req.body.texto + ' >> ' + __dirname + '/text_files/' + id + ' && cd ../vlibras-core' +
22 26 ' && ./vlibras ' + parameters.getServiceType(req.body.servico) + ' ../vlibras-api/text_files/' +
23   - properties.ID_FROM_BD + ' ' + parameters.getTransparency(req.body.transparencia) + ' ' + properties.ID_FROM_BD + ' IOS';
  27 + id + ' ' + parameters.getTransparency(req.body.transparencia) + ' ' + id + ' IOS';
24 28  
25 29 /* Executa a linha de comando */
26 30 child = exec(command_line, function(err, stdout, stderr) {
... ... @@ -30,8 +34,7 @@ function init(req, res) {
30 34  
31 35 /* Listener que dispara quando a requisição ao core finaliza */
32 36 child.on('close', function(code, signal){
33   - res.send(200, { 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + properties.ID_FROM_BD + '.avi' });
34   - properties.ID_FROM_BD++;
  37 + res.send(200, { 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + id + '.avi' });
35 38 });
36 39  
37 40 /* Listener que dispara quando a requisição ao core da erro */
... ...
endpoints/video_legenda.js
  Diff comments   View file @da8c3da
... ... @@ -3,12 +3,16 @@ var properties = require('../helpers/properties');
3 3  
4 4 var exec = require('child_process').exec, child;
5 5 var querystring = require('querystring');
  6 +var uuid = require('node-uuid');
6 7 var mkdirp = require('mkdirp');
7 8 var http = require('http');
8 9 var url = require('url');
9 10 var fs = require('fs');
10 11  
11 12 function init(req, res) {
  13 +
  14 + var id = uuid.v4();
  15 +
12 16 /* Verifica se os paramêtros [transparencia, texto] possuem algum valor */
13 17 if ((req.body.linguagem === '') || (req.body.posicao === '') || (req.body.tamanho === '') || (req.body.transparencia === '')) {
14 18 res.send(500, parameters.errorMessage('O valor de algum parâmetro está vazio'));
... ... @@ -34,25 +38,25 @@ function init(req, res) {
34 38 }
35 39  
36 40 /* Cria uma pasta cujo o nome é o ID atual */
37   - mkdirp('/home/libras/vlibras-api/uploads/' + properties.ID_FROM_BD, function(error) {
  41 + mkdirp('/home/libras/vlibras-api/uploads/' + id, function(error) {
38 42  
39 43 if (error) { console.log(error); return; }
40 44  
41 45 /* 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) {
  46 + fs.rename(req.files.video.path, '/home/libras/vlibras-api/uploads/' + id + '/' + req.files.video.name, function(error) {
43 47 if (error) { console.log(error); res.send(500, parameters.errorMessage('Erro ao mover o vídeo submetido')); return; }
44 48 });
45 49  
46 50 /* 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) {
  51 + fs.rename(req.files.legenda.path, '/home/libras/vlibras-api/uploads/' + id + '/' + req.files.legenda.name, function(error) {
48 52 if (error) { console.log(error); res.send(500, parameters.errorMessage('Erro ao mover a legenda submetido')); return; }
49 53 });
50 54  
51 55 /* Cria a linha de comando */
52   - var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.body.servico) + ' uploads/' + properties.ID_FROM_BD + '/' +
53   - req.files.video.name + ' uploads/' + properties.ID_FROM_BD + '/' + req.files.legenda.name + ' ' + parameters.getLanguage(req.body.linguagem) +
  56 + var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.body.servico) + ' uploads/' + id + '/' +
  57 + req.files.video.name + ' uploads/' + id + '/' + req.files.legenda.name + ' ' + parameters.getLanguage(req.body.linguagem) +
54 58 ' ' + parameters.getPosition(req.body.posicao) + ' ' + parameters.getSize(req.body.tamanho) + ' ' +
55   - parameters.getTransparency(req.body.transparencia) + ' ' + properties.ID_FROM_BD;
  59 + parameters.getTransparency(req.body.transparencia) + ' ' + id;
56 60  
57 61 console.log(command_line);
58 62  
... ... @@ -71,8 +75,7 @@ function init(req, res) {
71 75 console.log('Erro código: ' + code); res.send(500, { 'error': 'Erro no Core', 'code': code }); return;
72 76 }
73 77  
74   - res.send(200, { 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + properties.ID_FROM_BD + '.flv' });
75   - properties.ID_FROM_BD++;
  78 + res.send(200, { 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + id + '.flv' });
76 79 });
77 80  
78 81 child.on('error', function(code, signal){
... ... @@ -108,14 +111,12 @@ function init(req, res) {
108 111 requesting.write(data);
109 112 requesting.end();
110 113  
111   - properties.ID_FROM_BD++;
112   -
113 114 return;
114 115 }
115 116  
116 117 var path = url.parse(req.body.callback);
117 118  
118   - var data = querystring.stringify({ 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + properties.ID_FROM_BD + '.flv' });
  119 + var data = querystring.stringify({ 'response' : 'http://' + properties.SERVER_IP + ':' + properties.port + '/' + id + '.flv' });
119 120  
120 121 var options = {
121 122 host: path.hostname,
... ... @@ -138,8 +139,6 @@ function init(req, res) {
138 139  
139 140 requesting.write(data);
140 141 requesting.end();
141   -
142   - properties.ID_FROM_BD++;
143 142 });
144 143  
145 144 /* Listener que dispara quando a requisição ao core da erro */
... ... @@ -169,8 +168,6 @@ function init(req, res) {
169 168  
170 169 requesting.write(data);
171 170 requesting.end();
172   -
173   - properties.ID_FROM_BD++;
174 171 });
175 172  
176 173 res.send(200);
... ... @@ -178,4 +175,4 @@ function init(req, res) {
178 175 });
179 176 };
180 177  
181 178 -module.exports.init = init;
  179 +module.exports.init = init;
182 180 \ No newline at end of file
... ...