Download as
Browse Code »

Commit 047e90fe12e1ef5d9da8aab21ef89b27d559220d

Authored by libras
1 parent 0fdd2d3b
Exists in master and in 1 other branch devel

Added make clean to Makefile and change core call from ./gtaaas to ./vlibras

Showing 4 changed files with 14 additions and 7 deletions   Show diff stats
@@ -10,8 +10,13 @@ install: @@ -10,8 +10,13 @@ install:
10 run: 10 run:
11 @forever start server.js 11 @forever start server.js
12 12
13 -stop: 13 +stop: clean
14 @forever stop server.js 14 @forever stop server.js
15 15
16 list: 16 list:
17 @forever list 17 @forever list
  18 +
  19 +clean:
  20 + @rm text_files/*
  21 + @rm videos/*
  22 + @rm -r uploads/*
@@ -16,7 +16,7 @@ app.use(express.static(path.join(__dirname, '/videos'))); @@ -16,7 +16,7 @@ app.use(express.static(path.join(__dirname, '/videos')));
16 app.use(express.bodyParser({ keepExtensions: true, uploadDir: path.join(__dirname, '/uploads') })); 16 app.use(express.bodyParser({ keepExtensions: true, uploadDir: path.join(__dirname, '/uploads') }));
17 17
18 app.get('/', function(req, res){ 18 app.get('/', function(req, res){
19 - res.send(200, { 'status': 'server ' + host + ':' + port + ' is running!' } ); 19 + res.send(200, { 'status': 'server is running!' } );
20 }); 20 });
21 21
22 app.post('/api', function(req, res){ 22 app.post('/api', function(req, res){
@@ -32,7 +32,7 @@ app.post('/api', function(req, res){ @@ -32,7 +32,7 @@ app.post('/api', function(req, res){
32 if (parameters.checkTransparency(req.query.transparencia)) { 32 if (parameters.checkTransparency(req.query.transparencia)) {
33 /* Cria a linha de comando */ 33 /* Cria a linha de comando */
34 var command_line = 'echo ' + req.query.texto + ' >> ' + __dirname + '/text_files/' + ID_FROM_BD + ' && cd ../vlibras-core' + 34 var command_line = 'echo ' + req.query.texto + ' >> ' + __dirname + '/text_files/' + ID_FROM_BD + ' && cd ../vlibras-core' +
35 - ' && ./gtaaas ' + parameters.getServiceType(req.query.servico) + ' ../vlibras-api/text_files/' + 35 + ' && ./vlibras ' + parameters.getServiceType(req.query.servico) + ' ../vlibras-api/text_files/' +
36 ID_FROM_BD + ' ' + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD + ' WEB'; 36 ID_FROM_BD + ' ' + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD + ' WEB';
37 37
38 /* Executa a linha de comando */ 38 /* Executa a linha de comando */
@@ -77,7 +77,7 @@ app.post('/api', function(req, res){ @@ -77,7 +77,7 @@ app.post('/api', function(req, res){
77 }); 77 });
78 78
79 /* Cria a linha de comando */ 79 /* Cria a linha de comando */
80 - var command_line = 'vlibras_user/vlibras-core/./gtaaas ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' + 80 + var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' +
81 req.files.video.name + ' 1 ' + parameters.getPosition(req.query.posicao) + ' ' + parameters.getSize(req.query.tamanho) + ' ' + 81 req.files.video.name + ' 1 ' + parameters.getPosition(req.query.posicao) + ' ' + parameters.getSize(req.query.tamanho) + ' ' +
82 parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD; 82 parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD;
83 83
@@ -127,7 +127,7 @@ app.post('/api', function(req, res){ @@ -127,7 +127,7 @@ app.post('/api', function(req, res){
127 }); 127 });
128 128
129 /* Cria a linha de comando */ 129 /* Cria a linha de comando */
130 - var command_line = 'vlibras_user/vlibras-core/./gtaaas ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' + 130 + var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' +
131 req.files.legenda.name + ' ' + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD; 131 req.files.legenda.name + ' ' + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD;
132 132
133 /* Executa a linha de comando */ 133 /* Executa a linha de comando */
@@ -184,7 +184,7 @@ app.post('/api', function(req, res){ @@ -184,7 +184,7 @@ app.post('/api', function(req, res){
184 }); 184 });
185 185
186 /* Cria a linha de comando */ 186 /* Cria a linha de comando */
187 - var command_line = 'vlibras_user/vlibras-core/./gtaaas ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' + 187 + var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' +
188 req.files.video.name + ' uploads/' + ID_FROM_BD + '/' + req.files.legenda.name + ' ' + parameters.getLanguage(req.query.linguagem) + 188 req.files.video.name + ' uploads/' + ID_FROM_BD + '/' + req.files.legenda.name + ' ' + parameters.getLanguage(req.query.linguagem) +
189 ' ' + parameters.getPosition(req.query.posicao) + ' ' + parameters.getSize(req.query.tamanho) + ' ' + 189 ' ' + parameters.getPosition(req.query.posicao) + ' ' + parameters.getSize(req.query.tamanho) + ' ' +
190 parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD; 190 parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD;
@@ -231,4 +231,4 @@ app.post('/api', function(req, res){ @@ -231,4 +231,4 @@ app.post('/api', function(req, res){
231 231
232 app.listen(port, host, function(){ 232 app.listen(port, host, function(){
233 console.log('Server running on ' + host + ':' + port); 233 console.log('Server running on ' + host + ':' + port);
234 -});  
235 \ No newline at end of file 234 \ No newline at end of file
  235 +});
tamanho.txt 0 → 100644
  Diff comments   View file @047e90f
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +270
vlibras_user 0 → 120000
  Diff comments   View file @047e90f
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +/home/libras
0 \ No newline at end of file 2 \ No newline at end of file