Commit ad36f6d857c38e2cc540c8c64ad69031b2778035
1 parent
477fb7f2
Exists in
master
and in
1 other branch
Adicionado endpoint de retorno da glosa e corrigido bug no endpoint de texto
Showing
1 changed file
with
25 additions
and
7 deletions
Show diff stats
@@ -4,14 +4,17 @@ var properties = require('./helpers/properties'); | @@ -4,14 +4,17 @@ var properties = require('./helpers/properties'); | ||
4 | var ep_texto = require('./endpoints/texto'); | 4 | var ep_texto = require('./endpoints/texto'); |
5 | var ep_ios = require('./endpoints/ios'); | 5 | var ep_ios = require('./endpoints/ios'); |
6 | var ep_video = require('./endpoints/video'); | 6 | var ep_video = require('./endpoints/video'); |
7 | -var ep_audio = require('./endpoints/audio'); | ||
8 | var ep_legenda = require('./endpoints/legenda'); | 7 | var ep_legenda = require('./endpoints/legenda'); |
9 | var ep_video_legenda = require('./endpoints/video_legenda'); | 8 | var ep_video_legenda = require('./endpoints/video_legenda'); |
10 | 9 | ||
10 | +var mongoose = require('mongoose'); | ||
11 | +require('./db/config').connect(mongoose); | ||
11 | var express = require('express'); | 12 | var express = require('express'); |
12 | var path = require('path'); | 13 | var path = require('path'); |
13 | var util = require('util'); | 14 | var util = require('util'); |
14 | var app = express(); | 15 | var app = express(); |
16 | +var Request = require('./db/schemas/request').init(mongoose); | ||
17 | +var db = require('./db/api'); | ||
15 | 18 | ||
16 | app.use(express.static(path.join(__dirname, '/videos'))); | 19 | app.use(express.static(path.join(__dirname, '/videos'))); |
17 | app.use(express.bodyParser({ keepExtensions: true, uploadDir: path.join(__dirname, '/uploads') })); | 20 | app.use(express.bodyParser({ keepExtensions: true, uploadDir: path.join(__dirname, '/uploads') })); |
@@ -24,6 +27,7 @@ app.post('/api', function(req, res) { | @@ -24,6 +27,7 @@ app.post('/api', function(req, res) { | ||
24 | console.log("\n\n\n============================================="); | 27 | console.log("\n\n\n============================================="); |
25 | console.log("[" + new Date().toISOString() + "] Requisição do IP: " + req.ip); | 28 | console.log("[" + new Date().toISOString() + "] Requisição do IP: " + req.ip); |
26 | console.log("== Parametros: " + util.inspect(req.body)); | 29 | console.log("== Parametros: " + util.inspect(req.body)); |
30 | + console.log("== Body: " + JSON.stringify(req.headers)); | ||
27 | 31 | ||
28 | /* Verifica se o paramêtro [servico] possui algum valor */ | 32 | /* Verifica se o paramêtro [servico] possui algum valor */ |
29 | if (req.body.servico !== '') { | 33 | if (req.body.servico !== '') { |
@@ -31,7 +35,7 @@ app.post('/api', function(req, res) { | @@ -31,7 +35,7 @@ app.post('/api', function(req, res) { | ||
31 | switch(req.body.servico) { | 35 | switch(req.body.servico) { |
32 | /* Tipo de Serviço: Texto */ | 36 | /* Tipo de Serviço: Texto */ |
33 | case 'texto': | 37 | case 'texto': |
34 | - ep_texto.init(req, res); | 38 | + ep_texto.init(req, res, Request); |
35 | break; | 39 | break; |
36 | 40 | ||
37 | /* Tipo de Serviço: iOS */ | 41 | /* Tipo de Serviço: iOS */ |
@@ -44,11 +48,6 @@ app.post('/api', function(req, res) { | @@ -44,11 +48,6 @@ app.post('/api', function(req, res) { | ||
44 | ep_video.init(req, res); | 48 | ep_video.init(req, res); |
45 | break; | 49 | break; |
46 | 50 | ||
47 | - /* Tipo de Serviço: Só o Áudio */ | ||
48 | - case 'audio': | ||
49 | - ep_audio.init(req, res); | ||
50 | - break; | ||
51 | - | ||
52 | /* Tipo de Serviço: Só a Legenda */ | 51 | /* Tipo de Serviço: Só a Legenda */ |
53 | case 'legenda': | 52 | case 'legenda': |
54 | ep_legenda.init(req, res); | 53 | ep_legenda.init(req, res); |
@@ -69,6 +68,25 @@ app.post('/api', function(req, res) { | @@ -69,6 +68,25 @@ app.post('/api', function(req, res) { | ||
69 | } | 68 | } |
70 | }); | 69 | }); |
71 | 70 | ||
71 | +app.get('/api/requests', function(req, res) { | ||
72 | + db.read_all(Request, function(result) { | ||
73 | + if (result !== null) { | ||
74 | + res.send(200, result); | ||
75 | + } else { | ||
76 | + res.send(500, { 'error': 'Erro na busca.'}); | ||
77 | + } | ||
78 | + }); | ||
79 | +}); | ||
80 | + | ||
81 | +app.post('/glosa', function(req, res) { | ||
82 | +// options.args = JSON.stringify(req.body); | ||
83 | + PythonShell.run('vlibras_user/vlibras-translate/PortGlosa.py', req.body.texto, function (err, results) { | ||
84 | + if (err) { console.log(err); res.send(400); return; } | ||
85 | + // results is an array consisting of messages collected during execution | ||
86 | + res.send(results); | ||
87 | + }); | ||
88 | +}); | ||
89 | + | ||
72 | app.listen(properties.port, properties.host, function(){ | 90 | app.listen(properties.port, properties.host, function(){ |
73 | console.log('Server running on ' + properties.host + ':' + properties.port); | 91 | console.log('Server running on ' + properties.host + ':' + properties.port); |
74 | }); | 92 | }); |