diff --git a/Makefile b/Makefile index 3320046..3ea270b 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,13 @@ install: run: @forever start server.js -stop: +stop: clean @forever stop server.js list: @forever list + +clean: + @rm text_files/* + @rm videos/* + @rm -r uploads/* diff --git a/server.js b/server.js index a5e9117..95da9a0 100644 --- a/server.js +++ b/server.js @@ -16,7 +16,7 @@ app.use(express.static(path.join(__dirname, '/videos'))); app.use(express.bodyParser({ keepExtensions: true, uploadDir: path.join(__dirname, '/uploads') })); app.get('/', function(req, res){ - res.send(200, { 'status': 'server ' + host + ':' + port + ' is running!' } ); + res.send(200, { 'status': 'server is running!' } ); }); app.post('/api', function(req, res){ @@ -32,7 +32,7 @@ app.post('/api', function(req, res){ if (parameters.checkTransparency(req.query.transparencia)) { /* Cria a linha de comando */ var command_line = 'echo ' + req.query.texto + ' >> ' + __dirname + '/text_files/' + ID_FROM_BD + ' && cd ../vlibras-core' + - ' && ./gtaaas ' + parameters.getServiceType(req.query.servico) + ' ../vlibras-api/text_files/' + + ' && ./vlibras ' + parameters.getServiceType(req.query.servico) + ' ../vlibras-api/text_files/' + ID_FROM_BD + ' ' + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD + ' WEB'; /* Executa a linha de comando */ @@ -77,7 +77,7 @@ app.post('/api', function(req, res){ }); /* Cria a linha de comando */ - var command_line = 'vlibras_user/vlibras-core/./gtaaas ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' + + var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' + req.files.video.name + ' 1 ' + parameters.getPosition(req.query.posicao) + ' ' + parameters.getSize(req.query.tamanho) + ' ' + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD; @@ -127,7 +127,7 @@ app.post('/api', function(req, res){ }); /* Cria a linha de comando */ - var command_line = 'vlibras_user/vlibras-core/./gtaaas ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' + + var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' + req.files.legenda.name + ' ' + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD; /* Executa a linha de comando */ @@ -184,7 +184,7 @@ app.post('/api', function(req, res){ }); /* Cria a linha de comando */ - var command_line = 'vlibras_user/vlibras-core/./gtaaas ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' + + var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.query.servico) + ' uploads/' + ID_FROM_BD + '/' + req.files.video.name + ' uploads/' + ID_FROM_BD + '/' + req.files.legenda.name + ' ' + parameters.getLanguage(req.query.linguagem) + ' ' + parameters.getPosition(req.query.posicao) + ' ' + parameters.getSize(req.query.tamanho) + ' ' + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD; @@ -231,4 +231,4 @@ app.post('/api', function(req, res){ app.listen(port, host, function(){ console.log('Server running on ' + host + ':' + port); -}); \ No newline at end of file +}); diff --git a/tamanho.txt b/tamanho.txt new file mode 100644 index 0000000..67f3f23 --- /dev/null +++ b/tamanho.txt @@ -0,0 +1 @@ +270 diff --git a/vlibras_user b/vlibras_user new file mode 120000 index 0000000..fed1f97 --- /dev/null +++ b/vlibras_user @@ -0,0 +1 @@ +/home/libras \ No newline at end of file -- libgit2 0.21.2