Download as
Browse Code »

Commit 3b97dc0c9b5d3ab2963cb2b36b025db4512a4171

Authored by dhuy
1 parent 2b4fed0f
Exists in master and in 1 other branch devel

Added folders in gitignore & changed doublequotes for singlequotes

Showing 3 changed files with 48 additions and 47 deletions   Show diff stats
.gitignore
  Diff comments   View file @3b97dc0
1 1 .DS_Store
2 2 node_modules
  3 +text_files/*
  4 +uploads/*
  5 +videos/*
... ...
helpers/parameters.js
  Diff comments   View file @3b97dc0
1 1 function getServiceType(service_type) {
2 2 switch(service_type) {
3   - case "video":
  3 + case 'video':
4 4 return 3;
5 5 break;
6 6  
7   - case "texto":
  7 + case 'texto':
8 8 return 4;
9 9 break;
10 10 }
... ... @@ -12,11 +12,11 @@ function getServiceType(service_type) {
12 12  
13 13 function getLanguage(language) {
14 14 switch(language) {
15   - case "portugues":
  15 + case 'portugues':
16 16 return 1;
17 17 break;
18 18  
19   - case "glosa":
  19 + case 'glosa':
20 20 return 2;
21 21 break;
22 22 }
... ... @@ -24,19 +24,19 @@ function getLanguage(language) {
24 24  
25 25 function getPosition(position) {
26 26 switch(position) {
27   - case "superior-esquerdo":
  27 + case 'superior-esquerdo':
28 28 return 1;
29 29 break;
30 30  
31   - case "superior-direito":
  31 + case 'superior-direito':
32 32 return 2;
33 33 break;
34 34  
35   - case "inferior-direito":
  35 + case 'inferior-direito':
36 36 return 3;
37 37 break;
38 38  
39   - case "inferior-esquerdo":
  39 + case 'inferior-esquerdo':
40 40 return 4;
41 41 break;
42 42 }
... ... @@ -44,15 +44,15 @@ function getPosition(position) {
44 44  
45 45 function getSize(size) {
46 46 switch(size) {
47   - case "pequeno":
  47 + case 'pequeno':
48 48 return 1;
49 49 break;
50 50  
51   - case "medio":
  51 + case 'medio':
52 52 return 2;
53 53 break;
54 54  
55   - case "grande":
  55 + case 'grande':
56 56 return 3;
57 57 break;
58 58 }
... ... @@ -60,18 +60,18 @@ function getSize(size) {
60 60  
61 61 function getTransparency(transparency) {
62 62 switch(transparency) {
63   - case "opaco":
  63 + case 'opaco':
64 64 return 0;
65 65 break;
66 66  
67   - case "transparente":
  67 + case 'transparente':
68 68 return 1;
69 69 break;
70 70 }
71 71 };
72 72  
73 73 function checkServiceType(service_type) {
74   - var t_types = ["video", "texto"];
  74 + var t_types = ['video', 'texto'];
75 75  
76 76 for (var i = 0; i < t_types.length; i++){
77 77 if (service_type === t_types[i]) {
... ... @@ -85,7 +85,7 @@ function checkServiceType(service_type) {
85 85 };
86 86  
87 87 function checkLanguage(language) {
88   - var t_types = ["portugues", "glosa"];
  88 + var t_types = ['portugues', 'glosa'];
89 89  
90 90 for (var i = 0; i < t_types.length; i++){
91 91 if (language === t_types[i]) {
... ... @@ -99,7 +99,7 @@ function checkLanguage(language) {
99 99 };
100 100  
101 101 function checkPosition(position) {
102   - var t_types = ["superior-esquerdo", "superior-direito", "inferior-esquerdo", "inferior-direito"];
  102 + var t_types = ['superior-esquerdo', 'superior-direito', 'inferior-esquerdo', 'inferior-direito'];
103 103  
104 104 for (var i = 0; i < t_types.length; i++){
105 105 if (position === t_types[i]) {
... ... @@ -113,7 +113,7 @@ function checkPosition(position) {
113 113 };
114 114  
115 115 function checkSize(size) {
116   - var t_types = ["pequeno", "medio", "grande"];
  116 + var t_types = ['pequeno', 'medio', 'grande'];
117 117  
118 118 for (var i = 0; i < t_types.length; i++){
119 119 if (size === t_types[i]) {
... ... @@ -127,7 +127,7 @@ function checkSize(size) {
127 127 };
128 128  
129 129 function checkTransparency(transparency) {
130   - var t_types = ["opaco", "transparente"];
  130 + var t_types = ['opaco', 'transparente'];
131 131  
132 132 for (var i = 0; i < t_types.length; i++){
133 133 if (transparency === t_types[i]) {
... ... @@ -140,17 +140,13 @@ function checkTransparency(transparency) {
140 140 }
141 141 };
142 142  
143   -function errorMessage(message) {
144   - return { "error": message }
145   -};
146   -
147 143 function checkVideo(file) {
148   - var accepted_file_types = ["flv", "ts", "avi", "mp4", "mov", "webm", "wmv", "mkv",];
  144 + var accepted_file_types = ['flv', 'ts', 'avi', 'mp4', 'mov', 'webm', 'wmv', 'mkv',];
149 145 return check_type(file, accepted_file_types)
150 146 };
151 147  
152 148 function checkSubtitle(file) {
153   - var accepted_file_types = ["srt"];
  149 + var accepted_file_types = ['srt'];
154 150 return check_type(file, accepted_file_types)
155 151 };
156 152  
... ... @@ -175,6 +171,10 @@ function check_type(file, accepted_file_types) {
175 171 return isValidFile;
176 172 };
177 173  
  174 +function errorMessage(message) {
  175 + return { 'error': message }
  176 +};
  177 +
178 178 module.exports.getServiceType = getServiceType;
179 179 module.exports.getLanguage = getLanguage;
180 180 module.exports.getPosition = getPosition;
... ...
server.js
  Diff comments   View file @3b97dc0
... ... @@ -2,7 +2,7 @@ var parameters = require(&#39;./helpers/parameters&#39;);
2 2 var exec = require('child_process').exec, child;
3 3 var path = require('path');
4 4 var fs = require('fs');
5   -var express = require("express");
  5 +var express = require('express');
6 6  
7 7 var host = '0.0.0.0';
8 8 var port = 5000;
... ... @@ -10,31 +10,30 @@ var port = 5000;
10 10 var app = express();
11 11  
12 12 var ID_FROM_BD = 1;
13   -var SERVER_IP = "150.165.204.30";
  13 +var SERVER_IP = '150.165.204.30';
14 14  
15   -app.use(express.static(path.join(__dirname, "/videos")));
  15 +app.use(express.static(path.join(__dirname, '/videos')));
16 16 app.use(express.bodyParser({ keepExtensions: true, uploadDir: path.join(__dirname, '/uploads') }));
17 17  
18   -app.get("/", function(req, res){
19   - res.send(200, "<center><h2>Server " + host + ":" + port + " is running</h2></center>");
  18 +app.get('/', function(req, res){
  19 + res.send(200, { 'status': 'server ' + host + ':' + port + ' is running!' } );
20 20 });
21 21  
22   -app.post("/api", function(req, res){
23   -
  22 +app.post('/api', function(req, res){
24 23 /* Verifica se o paramêtro [servico] possui algum valor */
25   - if (req.query.servico !== "") {
  24 + if (req.query.servico !== '') {
26 25 /* Verifica qual é o Tipo de Serviço fornecido */
27 26 switch(req.query.servico) {
28 27 /* Case para o Tipo de Serviço: Texto */
29   - case "texto":
  28 + case 'texto':
30 29 /* Verifica se os paramêtros [transparencia, texto] possuem algum valor */
31   - if ((req.query.transparencia !== "") && (req.query.texto !== "")) {
  30 + if ((req.query.transparencia !== '') && (req.query.texto !== '')) {
32 31 /* Verifica se o paramêtro [transparencia] possui os únicos valores possíveis [opaco, transparente] */
33 32 if (parameters.getTransparency(req.query.transparencia)) {
34 33 /* Cria a linha de comando */
35   - var command_line = "echo " + req.query.texto + " >> " + __dirname + "/text_files/" + ID_FROM_BD + " && cd ../vlibras-core" +
36   - " && ./gtaaas " + parameters.getServiceType(req.query.servico) + " ../vlibras-api/text_files/" +
37   - ID_FROM_BD + " " + parameters.getTransparency(req.query.transparencia) + " " + ID_FROM_BD + " WEB";
  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/' +
  36 + ID_FROM_BD + ' ' + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD + ' WEB';
38 37  
39 38 /* Executa a linha de comando */
40 39 child = exec(command_line, function(err, stdout, stderr) {
... ... @@ -43,8 +42,8 @@ app.post(&quot;/api&quot;, function(req, res){
43 42 });
44 43  
45 44 /* Listener que dispara quando a requisição ao core finaliza */
46   - child.on("close", function(code, signal){
47   - res.send(200, { "response" : "http://" + SERVER_IP + ":" + port + "/" + ID_FROM_BD + ".webm" });
  45 + child.on('close', function(code, signal){
  46 + res.send(200, { 'response' : 'http://' + SERVER_IP + ':' + port + '/' + ID_FROM_BD + '.webm' });
48 47 ID_FROM_BD++;
49 48 });
50 49 } else {
... ... @@ -58,7 +57,7 @@ app.post(&quot;/api&quot;, function(req, res){
58 57 case 'video':
59 58  
60 59 /* Verifica se os paramêtros [transparencia, texto] possuem algum valor */
61   - if ((req.query.posicao !== "") && (req.query.tamanho !== "") && (req.query.transparencia !== "")) {
  60 + if ((req.query.posicao !== '') && (req.query.tamanho !== '') && (req.query.transparencia !== '')) {
62 61 /* Verifica se os paramêtros [linguagem, posicao, tamanho, transparencia] possuem os seus únicos valores possíveis */
63 62 if ((parameters.checkPosition(req.query.posicao) === true) && (parameters.checkSize(req.query.tamanho) === true) && (parameters.checkTransparency(req.query.transparencia) === true)) {
64 63 /* Checa se o arquivo de vídeo submetivo possui uma extensão válida */
... ... @@ -74,9 +73,9 @@ app.post(&quot;/api&quot;, function(req, res){
74 73 });
75 74  
76 75 /* Cria a linha de comando */
77   - var command_line = "cd ../vlibras-core && ./gtaaas " + parameters.getServiceType(req.query.servico) + " ../vlibras-api/uploads/" + ID_FROM_BD + "/" +
78   - req.files.video.name + " 1 " + parameters.getPosition(req.query.posicao) + " " + parameters.getSize(req.query.tamanho) + " " +
79   - parameters.getTransparency(req.query.transparencia) + " " + ID_FROM_BD;
  76 + var command_line = 'cd ../vlibras-core && ./gtaaas ' + parameters.getServiceType(req.query.servico) + ' ../vlibras-api/uploads/' + ID_FROM_BD + '/' +
  77 + req.files.video.name + ' 1 ' + parameters.getPosition(req.query.posicao) + ' ' + parameters.getSize(req.query.tamanho) + ' ' +
  78 + parameters.getTransparency(req.query.transparencia) + ' ' + ID_FROM_BD;
80 79  
81 80 /* Executa a linha de comando */
82 81 child = exec(command_line, function(err, stdout, stderr) {
... ... @@ -85,8 +84,8 @@ app.post(&quot;/api&quot;, function(req, res){
85 84 });
86 85  
87 86 /* Listener que dispara quando a requisição ao core finaliza */
88   - child.on("close", function(code, signal){
89   - res.send(200, { "response" : "http://" + SERVER_IP + ":" + port + "/" + ID_FROM_BD + ".flv" });
  87 + child.on('close', function(code, signal){
  88 + res.send(200, { 'response' : 'http://' + SERVER_IP + ':' + port + '/' + ID_FROM_BD + '.flv' });
90 89 });
91 90 });
92 91 } else {
... ... @@ -108,9 +107,8 @@ app.post(&quot;/api&quot;, function(req, res){
108 107 } else {
109 108 res.send(500, parameters.errorMessage('Especifique o tipo do serviço'));
110 109 }
111   -
112 110 });
113 111  
114 112 app.listen(port, host, function(){
115 113 console.log('Server running on ' + host + ':' + port);
116 114 -});
  115 +});
117 116 \ No newline at end of file
... ...