From 3b97dc0c9b5d3ab2963cb2b36b025db4512a4171 Mon Sep 17 00:00:00 2001 From: dhuy Date: Thu, 10 Apr 2014 19:17:34 -0300 Subject: [PATCH] Added folders in gitignore & changed doublequotes for singlequotes --- .gitignore | 3 +++ helpers/parameters.js | 48 ++++++++++++++++++++++++------------------------ server.js | 44 +++++++++++++++++++++----------------------- 3 files changed, 48 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 9daa824..66f258d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ .DS_Store node_modules +text_files/* +uploads/* +videos/* diff --git a/helpers/parameters.js b/helpers/parameters.js index c69cc3b..f064869 100644 --- a/helpers/parameters.js +++ b/helpers/parameters.js @@ -1,10 +1,10 @@ function getServiceType(service_type) { switch(service_type) { - case "video": + case 'video': return 3; break; - case "texto": + case 'texto': return 4; break; } @@ -12,11 +12,11 @@ function getServiceType(service_type) { function getLanguage(language) { switch(language) { - case "portugues": + case 'portugues': return 1; break; - case "glosa": + case 'glosa': return 2; break; } @@ -24,19 +24,19 @@ function getLanguage(language) { function getPosition(position) { switch(position) { - case "superior-esquerdo": + case 'superior-esquerdo': return 1; break; - case "superior-direito": + case 'superior-direito': return 2; break; - case "inferior-direito": + case 'inferior-direito': return 3; break; - case "inferior-esquerdo": + case 'inferior-esquerdo': return 4; break; } @@ -44,15 +44,15 @@ function getPosition(position) { function getSize(size) { switch(size) { - case "pequeno": + case 'pequeno': return 1; break; - case "medio": + case 'medio': return 2; break; - case "grande": + case 'grande': return 3; break; } @@ -60,18 +60,18 @@ function getSize(size) { function getTransparency(transparency) { switch(transparency) { - case "opaco": + case 'opaco': return 0; break; - case "transparente": + case 'transparente': return 1; break; } }; function checkServiceType(service_type) { - var t_types = ["video", "texto"]; + var t_types = ['video', 'texto']; for (var i = 0; i < t_types.length; i++){ if (service_type === t_types[i]) { @@ -85,7 +85,7 @@ function checkServiceType(service_type) { }; function checkLanguage(language) { - var t_types = ["portugues", "glosa"]; + var t_types = ['portugues', 'glosa']; for (var i = 0; i < t_types.length; i++){ if (language === t_types[i]) { @@ -99,7 +99,7 @@ function checkLanguage(language) { }; function checkPosition(position) { - var t_types = ["superior-esquerdo", "superior-direito", "inferior-esquerdo", "inferior-direito"]; + var t_types = ['superior-esquerdo', 'superior-direito', 'inferior-esquerdo', 'inferior-direito']; for (var i = 0; i < t_types.length; i++){ if (position === t_types[i]) { @@ -113,7 +113,7 @@ function checkPosition(position) { }; function checkSize(size) { - var t_types = ["pequeno", "medio", "grande"]; + var t_types = ['pequeno', 'medio', 'grande']; for (var i = 0; i < t_types.length; i++){ if (size === t_types[i]) { @@ -127,7 +127,7 @@ function checkSize(size) { }; function checkTransparency(transparency) { - var t_types = ["opaco", "transparente"]; + var t_types = ['opaco', 'transparente']; for (var i = 0; i < t_types.length; i++){ if (transparency === t_types[i]) { @@ -140,17 +140,13 @@ function checkTransparency(transparency) { } }; -function errorMessage(message) { - return { "error": message } -}; - function checkVideo(file) { - var accepted_file_types = ["flv", "ts", "avi", "mp4", "mov", "webm", "wmv", "mkv",]; + var accepted_file_types = ['flv', 'ts', 'avi', 'mp4', 'mov', 'webm', 'wmv', 'mkv',]; return check_type(file, accepted_file_types) }; function checkSubtitle(file) { - var accepted_file_types = ["srt"]; + var accepted_file_types = ['srt']; return check_type(file, accepted_file_types) }; @@ -175,6 +171,10 @@ function check_type(file, accepted_file_types) { return isValidFile; }; +function errorMessage(message) { + return { 'error': message } +}; + module.exports.getServiceType = getServiceType; module.exports.getLanguage = getLanguage; module.exports.getPosition = getPosition; diff --git a/server.js b/server.js index 8ef34d1..aee4840 100644 --- a/server.js +++ b/server.js @@ -2,7 +2,7 @@ var parameters = require('./helpers/parameters'); var exec = require('child_process').exec, child; var path = require('path'); var fs = require('fs'); -var express = require("express"); +var express = require('express'); var host = '0.0.0.0'; var port = 5000; @@ -10,31 +10,30 @@ var port = 5000; var app = express(); var ID_FROM_BD = 1; -var SERVER_IP = "150.165.204.30"; +var SERVER_IP = '150.165.204.30'; -app.use(express.static(path.join(__dirname, "/videos"))); +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, "

Server " + host + ":" + port + " is running

"); +app.get('/', function(req, res){ + res.send(200, { 'status': 'server ' + host + ':' + port + ' is running!' } ); }); -app.post("/api", function(req, res){ - +app.post('/api', function(req, res){ /* Verifica se o paramêtro [servico] possui algum valor */ - if (req.query.servico !== "") { + if (req.query.servico !== '') { /* Verifica qual é o Tipo de Serviço fornecido */ switch(req.query.servico) { /* Case para o Tipo de Serviço: Texto */ - case "texto": + case 'texto': /* Verifica se os paramêtros [transparencia, texto] possuem algum valor */ - if ((req.query.transparencia !== "") && (req.query.texto !== "")) { + if ((req.query.transparencia !== '') && (req.query.texto !== '')) { /* Verifica se o paramêtro [transparencia] possui os únicos valores possíveis [opaco, transparente] */ if (parameters.getTransparency(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/" + - ID_FROM_BD + " " + parameters.getTransparency(req.query.transparencia) + " " + ID_FROM_BD + " WEB"; + 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/' + + ID_FROM_BD + ' ' + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD + ' WEB'; /* Executa a linha de comando */ child = exec(command_line, function(err, stdout, stderr) { @@ -43,8 +42,8 @@ app.post("/api", function(req, res){ }); /* Listener que dispara quando a requisição ao core finaliza */ - child.on("close", function(code, signal){ - res.send(200, { "response" : "http://" + SERVER_IP + ":" + port + "/" + ID_FROM_BD + ".webm" }); + child.on('close', function(code, signal){ + res.send(200, { 'response' : 'http://' + SERVER_IP + ':' + port + '/' + ID_FROM_BD + '.webm' }); ID_FROM_BD++; }); } else { @@ -58,7 +57,7 @@ app.post("/api", function(req, res){ case 'video': /* Verifica se os paramêtros [transparencia, texto] possuem algum valor */ - if ((req.query.posicao !== "") && (req.query.tamanho !== "") && (req.query.transparencia !== "")) { + if ((req.query.posicao !== '') && (req.query.tamanho !== '') && (req.query.transparencia !== '')) { /* Verifica se os paramêtros [linguagem, posicao, tamanho, transparencia] possuem os seus únicos valores possíveis */ if ((parameters.checkPosition(req.query.posicao) === true) && (parameters.checkSize(req.query.tamanho) === true) && (parameters.checkTransparency(req.query.transparencia) === true)) { /* Checa se o arquivo de vídeo submetivo possui uma extensão válida */ @@ -74,9 +73,9 @@ app.post("/api", function(req, res){ }); /* Cria a linha de comando */ - var command_line = "cd ../vlibras-core && ./gtaaas " + parameters.getServiceType(req.query.servico) + " ../vlibras-api/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; + var command_line = 'cd ../vlibras-core && ./gtaaas ' + parameters.getServiceType(req.query.servico) + ' ../vlibras-api/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; /* Executa a linha de comando */ child = exec(command_line, function(err, stdout, stderr) { @@ -85,8 +84,8 @@ app.post("/api", function(req, res){ }); /* Listener que dispara quando a requisição ao core finaliza */ - child.on("close", function(code, signal){ - res.send(200, { "response" : "http://" + SERVER_IP + ":" + port + "/" + ID_FROM_BD + ".flv" }); + child.on('close', function(code, signal){ + res.send(200, { 'response' : 'http://' + SERVER_IP + ':' + port + '/' + ID_FROM_BD + '.flv' }); }); }); } else { @@ -108,9 +107,8 @@ app.post("/api", function(req, res){ } else { res.send(500, parameters.errorMessage('Especifique o tipo do serviço')); } - }); app.listen(port, host, function(){ console.log('Server running on ' + host + ':' + port); -}); +}); \ No newline at end of file -- libgit2 0.21.2