From de519bcef14920ea59d3acceb28ef7dc7dbeced2 Mon Sep 17 00:00:00 2001
From: Cassio Cabral <cassioscabral@gmail.com>
Date: Wed, 21 Oct 2015 11:21:25 -0300
Subject: [PATCH] update subtitle name

---
 endpoints/videornp.js | 38 +++++++++++++++++++++++---------------
 helpers/files.js      |  3 +--
 logsystem/errors.log  | 10 +++++-----
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/endpoints/videornp.js b/endpoints/videornp.js
index 3030e13..d7df323 100644
--- a/endpoints/videornp.js
+++ b/endpoints/videornp.js
@@ -3,7 +3,8 @@ var properties = require('../helpers/properties');
 var files = require('../helpers/files');
 var core = require('../helpers/core');
 var db = require('../db/api');
-
+var queue_helper = require('../helpers/queue');
+var exec = require('child_process').exec, child;
 var uuid = require('node-uuid');
 var mkdirp = require('mkdirp');
 var async = require('async');
@@ -147,7 +148,8 @@ function downloadAndMoveFiles(folder, req, locals, callback) {
 		if (_.isEmpty(req.body.legenda_url)) { // video_url present
 			console.log("== Video baixado");
 		} else {
-			console.log("== Legenda baixada");
+            // nao chama corretamente
+			// console.log("== Legenda baixada");
 		}
 		// Callback chamado depois de todas as tarefas
 		// Se tiver erro, vai passar para cima
@@ -170,25 +172,31 @@ function callCore(id, video, subtitle, req, res, Request, request_object) {
 
 function callCoreSubtitle(id, subtitle, req, res, Request, request_object) {
                 /* 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) {
-                        if (error) { console.log(error); }
-                });
 
                 /* Cria a linha de comando */
+                var legenda_name = "";
+                if(req.body.legenda_url !== undefined) {
+                    legenda_name = req.body.legenda_url.substring(req.body.legenda_url.lastIndexOf('/') + 1);
+                    legenda_name = legenda_name.split(".")[0];
+                } else if (req.files.legenda.name !== undefined) {
+                    legenda_name = req.files.legenda.name;
+                }
+
                 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';
+                                                        legenda_name + ' -l portugues -b opaco --id' + id + ' --mode devel > /tmp/core_log 2>&1';
+
 
-								var child;
-								var job = queue.create('exec_command_line' + id, {
-								    title: 'Command Line for: ' + req.body.servico,
-								    command_line: command_line
-								}).removeOnComplete( true ).save();
+				var child;
+				var job = queue.create('exec_command_line' + id, {
+				    title: 'Command Line for: ' + req.body.servico,
+				    command_line: command_line
+				}).removeOnComplete( true ).save();
 
-								queue.process('exec_command_line' + id, function(job, done){
-									child = queue_helper.exec_command_line(job.data.command_line, done);
-								});
+				queue.process('exec_command_line' + id, function(job, done){
+					child = queue_helper.exec_command_line(job.data.command_line, done);
+				});
 
-								job.on('complete', function() {
+				job.on('complete', function() {
 	                /* Executa a linha de comando */
 	                child = exec(command_line, function(err, stdout, stderr) {
 	                        // [stdout] = vlibras-core output
diff --git a/helpers/files.js b/helpers/files.js
index 564b7eb..7386cff 100644
--- a/helpers/files.js
+++ b/helpers/files.js
@@ -95,7 +95,6 @@ function downloadAndMoveVideo(folder, req, locals, callback) {
 * Deve retornar um objeto contendo o nome e o caminho
 */
 function downloadAndMoveSubtitle(folder, req, locals, callback) {
-
 	// Se enviou o arquivo na requisição
 	if (req.files.legenda !== undefined) {
 
@@ -147,7 +146,6 @@ function downloadAndMoveSubtitle(folder, req, locals, callback) {
 
 			// Salva o arquivo em disco
 			response.pipe(file);
-
 			// Quando a escrita acabar
 			file.on('finish', function() {
 
@@ -160,6 +158,7 @@ function downloadAndMoveSubtitle(folder, req, locals, callback) {
 				 	};
 
 				 	// Chama o callback para prosseguir execução
+					console.log("== Legenda baixada");
 				 	callback();
 				});
 			});
diff --git a/logsystem/errors.log b/logsystem/errors.log
index 9fde06f..99dfbeb 100644
--- a/logsystem/errors.log
+++ b/logsystem/errors.log
@@ -1,10 +1,10 @@
 {
     "resumo": {
         "bloqueante": {
-            "1": 2,
+            "1": 3,
             "2": 0,
-            "3": 0,
-            "4": 48
+            "3": 2,
+            "4": 49
         },
         "nao-bloqueante": {
             "1": 0,
@@ -14,9 +14,9 @@
         }
     },
     "detalhado": {
-        "1": "detalhe do erro",
+        "1": "Erro no retorno do core. Código: 127",
         "2": "detalhe",
-        "3": "detalhe",
+        "3": {},
         "4": "Rota nao encontrada"
     }
 }
\ No newline at end of file
--
libgit2 0.21.2