From 793a42310abc9e1581e0f0d9fb60103c85221f22 Mon Sep 17 00:00:00 2001 From: Erickson Silva Date: Thu, 10 Sep 2015 17:10:40 -0300 Subject: [PATCH] Corrige chamadas ao core --- endpoints/audio.js | 3 +-- endpoints/legenda.js | 12 ++++++------ endpoints/texto.js | 14 ++++++++++---- endpoints/video.js | 4 +--- endpoints/video_legenda.js | 6 ++---- endpoints/videornp.js | 6 +++--- helpers/parameters.js | 32 ++++++++++++++++++++++++-------- server.js | 1 + 8 files changed, 48 insertions(+), 30 deletions(-) diff --git a/endpoints/audio.js b/endpoints/audio.js index 5bcc2ee..f327d9e 100644 --- a/endpoints/audio.js +++ b/endpoints/audio.js @@ -97,8 +97,7 @@ function callCore(id, audio, req, res) { /* Cria a linha de comando */ /* slice(2) é para transformar ./path em path */ - var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.body.servico) + ' ' + - audio.path.slice(2) + ' ' + parameters.getTransparency(req.body.transparencia) + ' ' + id + ' > /tmp/core_log 2>&1'; + var command_line = 'vlibras_user/vlibras-core/./vlibras -A ' + audio.path.slice(2) + ' -b ' + parameters.getTransparency(req.body.transparencia) + ' --id ' + id + ' --mode devel > /tmp/core_log 2>&1'; console.log("=== Core: " + command_line); diff --git a/endpoints/legenda.js b/endpoints/legenda.js index a520660..5315292 100644 --- a/endpoints/legenda.js +++ b/endpoints/legenda.js @@ -13,19 +13,19 @@ function init(req, res) { var id = uuid.v4(); /* Verifica se o paramêtro [transparencia] possue algum valor */ - if (req.body.transparencia !== '') { + if (req.body.transparencia === '') { res.send(500, parameters.errorMessage('O valor de algum parâmetro está vazio')); return; } /* Verifica se os paramêtros [transparencia] possuem os seus únicos valores possíveis */ - if ((parameters.checkTransparency(req.body.transparencia) === true)) { + if ((parameters.checkTransparency(req.body.transparencia) === false)) { res.send(500, parameters.errorMessage('Parâmetros insuficientes ou inválidos')); return; } /* Checa se o arquivo de legenda submetivo possui uma extensão válida */ - if (parameters.checkSubtitle(req.files.legenda.name)) { + if (parameters.checkSubtitle(req.files.legenda.name) == false) { res.send(500, parameters.errorMessage('Legenda com Extensão Inválida')); return; } @@ -36,13 +36,13 @@ function init(req, res) { /* Listener que dispara quando a pasta é criada */ child.on('close', function(code, signal){ /* Move a legenda submetido para a pasta com o seu ID correspondente */ - fs.rename(req.files.legenda.path, __dirname + '/uploads/' + id + '/' + req.files.legenda.name, function(error) { + fs.rename(req.files.legenda.path, __dirname + 'uploads/' + id + '/' + req.files.legenda.name, function(error) { if (error) { console.log(error); } }); /* Cria a linha de comando */ - var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.body.servico) + ' uploads/' + id + '/' + - req.files.legenda.name + ' ' + parameters.getTransparency(req.body.transparencia) + ' ' + id; + var command_line = 'vlibras_user/vlibras-core/./vlibras -S' + ' uploads/' + id + '/' + + req.files.legenda.name + ' -l ' + parameters.getLanguage(req.body.linguagem) + ' -b ' + parameters.getTransparency(req.body.transparencia) + ' --id ' + id + ' --mode devel > /tmp/core_log 2>&1'; /* Executa a linha de comando */ // child = exec(command_line, function(err, stdout, stderr) { diff --git a/endpoints/texto.js b/endpoints/texto.js index 9085e86..9dd3ea2 100644 --- a/endpoints/texto.js +++ b/endpoints/texto.js @@ -14,10 +14,11 @@ function init(req, res, Request) { var id = uuid.v4(); /* Verifica se os paramêtros [transparencia, texto] possuem algum valor */ - if ((req.body.transparencia === '') || (req.body.texto === '')) { + + if ((req.body.transparencia === '') || (req.body.texto === '') || (req.body.linguagem === '')) { res.send(500, parameters.errorMessage('O valor de algum parâmetro está vazio')); return; - } + } /* Verifica se o paramêtro [transparencia] possui os únicos valores possíveis [opaco, transparente] */ if (parameters.checkTransparency(req.body.transparencia) === false) { @@ -25,6 +26,12 @@ function init(req, res, Request) { return; } + /* Verifica se o paramêtro [linguagem] possui os únicos valores possíveis [portugues, glosa] */ + if (parameters.checkLanguage(req.body.linguagem) === false) { + res.send(500, parameters.errorMessage('Parâmetros insuficientes ou inválidos')); + return; + } + var request_object = new Request({ id: id, type: req.body.servico, @@ -43,8 +50,7 @@ function init(req, res, Request) { }); /* Cria a linha de comando */ - var command_line = 'echo ' + req.body.texto + ' >> text_files/' + id + ' && mkdir uploads/' + id + ' && vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.body.servico) + ' text_files/' + - id + ' ' + parameters.getTransparency(req.body.transparencia) + ' ' + id + ' Web > /tmp/core_log 2>&1'; + var command_line = 'echo ' + req.body.texto + ' >> text_files/' + id + ' && mkdir uploads/' + id + ' && vlibras_user/vlibras-core/./vlibras -T ' + 'text_files/' + id + ' -l ' + parameters.getLanguage(req.body.linguagem) + ' -b ' + parameters.getTransparency(req.body.transparencia) + ' --id ' + id + ' --mode devel >> /tmp/core_log 2>&1'; console.log(command_line); var child; diff --git a/endpoints/video.js b/endpoints/video.js index 7efed0b..11fdd34 100644 --- a/endpoints/video.js +++ b/endpoints/video.js @@ -97,9 +97,7 @@ function callCore(id, video, subtitle, req, res) { /* Cria a linha de comando */ /* slice(2) é para transformar ./path em path */ - var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.body.servico) + ' ' + - video.path.slice(2) + ' 1 ' + parameters.getPosition(req.body.posicao) + ' ' + parameters.getSize(req.body.tamanho) + ' ' + - parameters.getTransparency(req.body.transparencia) + ' ' + id + ' > /tmp/core_log 2>&1'; + var command_line = 'vlibras_user/vlibras-core/./vlibras -V ' + video.path.slice(2) + ' -p ' + parameters.getPosition(req.body.posicao) + ' -r ' + parameters.getSize(req.body.tamanho) + ' -b ' + parameters.getTransparency(req.body.transparencia) + ' --id ' + id + ' --mode devel > /tmp/core_log 2>&1'; console.log("=== Core: " + command_line); diff --git a/endpoints/video_legenda.js b/endpoints/video_legenda.js index a662ac2..9b54c9c 100644 --- a/endpoints/video_legenda.js +++ b/endpoints/video_legenda.js @@ -102,10 +102,8 @@ function callCore(id, video, subtitle, req, res) { /* Cria a linha de comando */ /* slice(2) é para transformar ./path em path */ - var command_line = 'vlibras_user/vlibras-core/./vlibras ' + parameters.getServiceType(req.body.servico) + ' ' + - video.path.slice(2) + ' ' + subtitle.path.slice(2) + ' ' + parameters.getLanguage(req.body.linguagem) + - ' ' + parameters.getPosition(req.body.posicao) + ' ' + parameters.getSize(req.body.tamanho) + ' ' + - parameters.getTransparency(req.body.transparencia) + ' ' + id + ' > /tmp/core_log 2>&1'; + var command_line = 'vlibras_user/vlibras-core/./vlibras -V ' + video.path.slice(2) + ' -S ' + subtitle.path.slice(2) + ' -l ' + parameters.getLanguage(req.body.linguagem) + ' -p ' + parameters.getPosition(req.body.posicao) + ' -r ' + parameters.getSize(req.body.tamanho) + ' -b ' + + parameters.getTransparency(req.body.transparencia) + ' --id ' + id + ' --mode devel > /tmp/core_log 2>&1'; console.log("=== Core: " + command_line); diff --git a/endpoints/videornp.js b/endpoints/videornp.js index c87721d..bffe34a 100644 --- a/endpoints/videornp.js +++ b/endpoints/videornp.js @@ -134,7 +134,7 @@ function callCore(id, video, subtitle, req, res, Request, request_object) { /* Cria a linha de comando */ /* slice(2) é para transformar ./path em path */ - var command_line = 'vlibras_user/vlibras-core/./vlibras 7 ' + video.path.slice(2) + ' ' + id + ' > /tmp/core_log 2>&1'; + var command_line = 'vlibras_user/vlibras-core/./vlibras -V ' + video.path.slice(2) + ' -p bottom_right -r large - -b opaque --no-mixer --id ' + id + ' --mode devel > /tmp/core_log 2>&1'; console.log("=== Core: " + command_line); @@ -149,8 +149,8 @@ function callCoreSubtitle(id, subtitle, req, res, Request, request_object) { }); /* Cria a linha de comando */ - var command_line = 'vlibras_user/vlibras-core/./vlibras 7 ' + ' uploads/' + id + '/' + - req.files.legenda.name + ' opaco ' + id; + var command_line = 'vlibras_user/vlibras-core/./vlibras -S ' + ' uploads/' + id + '/' + + req.files.legenda.name + ' -l portugues -b opaco --id' + id + ' --mode devel > /tmp/core_log 2>&1'; /* Executa a linha de comando */ child = exec(command_line, function(err, stdout, stderr) { diff --git a/helpers/parameters.js b/helpers/parameters.js index 3b2e2c9..a2caba3 100644 --- a/helpers/parameters.js +++ b/helpers/parameters.js @@ -28,11 +28,11 @@ function getServiceType(service_type) { function getLanguage(language) { switch(language) { case 'portugues': - return 1; + return 'portugues'; break; case 'glosa': - return 2; + return 'glosa'; break; } }; @@ -40,19 +40,19 @@ function getLanguage(language) { function getPosition(position) { switch(position) { case 'superior-esquerdo': - return 1; + return 'top_left'; break; case 'superior-direito': - return 2; + return 'top_right'; break; case 'inferior-direito': - return 3; + return 'bottom_right'; break; case 'inferior-esquerdo': - return 4; + return 'bottom_left'; break; } }; @@ -76,11 +76,27 @@ function getSize(size) { function getTransparency(transparency) { switch(transparency) { case 'opaco': - return 0; + return 'opaque'; break; case 'transparente': - return 1; + return 'transp'; + break; + } +}; + +function getSize(size) { + switch(size) { + case 'pequeno': + return 'small'; + break; + + case 'medio': + return 'medium'; + break; + + case 'grande': + return 'large'; break; } }; diff --git a/server.js b/server.js index 0bfc436..349de91 100644 --- a/server.js +++ b/server.js @@ -6,6 +6,7 @@ var ep_ios = require('./endpoints/ios'); var ep_video = require('./endpoints/video'); var ep_legenda = require('./endpoints/legenda'); var ep_video_legenda = require('./endpoints/video_legenda'); +var ep_video_rnp = require('./endpoints/videornp'); var mongoose = require('mongoose'); require('./db/config').connect(mongoose); -- libgit2 0.21.2