From 8214776dfd322de53bb13576fd150a6f12f1a5c9 Mon Sep 17 00:00:00 2001
From: Wesnydy Ribeiro <wesnydy@lavid.ufpb.br>
Date: Thu, 10 Sep 2015 11:28:57 -0300
Subject: [PATCH] Ajustes para gerar o .deb e correção nos paths

---
 main.cpp                      | 30 ++++++++++++++++++++++--------
 recognize/src/recognize.cpp   |  9 ++++++++-
 servico/src/serviceTester.cpp | 13 +++++++++++--
 util/src/argParser.cpp        |  2 +-
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/main.cpp b/main.cpp
index 246fc32..9626b5a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -321,15 +321,29 @@ void hasInvalid(){
 
 void setPathContents(int mode, string id){
 	string command = "mkdir -p ";
-	if(mode == 1)// 1 aqui é devel
-		command.append(PATH_DEVEL_CONTENTS).append(" && mkdir -p ").append(PATH_DEVEL_UPLOADS).append("/").append(id);
-	else if (mode == 2)// 2 aqui é prod
-		command.append(PATH_VBOX_UPLOADS);
-	else {
-		fail("Modo de execução não reconhecido!");
-		exit(127);
+	switch(mode){
+		case 1://devel
+			char* vlStorage;
+	        char* vlUploads;
+	        vlStorage = getenv("VLSTORAGE");
+	        vlUploads = getenv("VLUPLOADS");
+
+	        if(vlStorage == NULL || vlUploads == NULL){
+				command.append(PATH_DEVEL_CONTENTS).append(" && mkdir -p ")
+				.append(PATH_DEVEL_UPLOADS).append("/").append(id);
+				system(command.c_str());
+	        }
+	    break;
+
+	    case 2://produção
+	    	command.append(PATH_VBOX_UPLOADS).append("/").append(id);
+	    	system(command.c_str());
+	    	break;
+
+	    default:
+		    fail("Modo de execução não reconhecido!");
+			exit(127);
 	}
-	system(command.c_str());
 }
 
 void help()
diff --git a/recognize/src/recognize.cpp b/recognize/src/recognize.cpp
index b8f6fc9..62be8df 100644
--- a/recognize/src/recognize.cpp
+++ b/recognize/src/recognize.cpp
@@ -443,7 +443,14 @@ void Recognize::executeGoogleEngine() {
 
 	wavcut =  new Wavcut(pathAudio,outputPath,_id);
 	Jconf *jconf;
-	jconf = j_config_load_file_new(PATH_WCONFIG);
+
+	char* wPath;
+	wPath = getenv("WCONFIG");
+
+	if(wPath != NULL)
+		jconf = j_config_load_file_new(wPath);
+	else
+		jconf = j_config_load_file_new(PATH_WCONFIG);
 
 	if(wavcut->initialize(jconf)<2){
 		
diff --git a/servico/src/serviceTester.cpp b/servico/src/serviceTester.cpp
index c468604..20b4729 100644
--- a/servico/src/serviceTester.cpp
+++ b/servico/src/serviceTester.cpp
@@ -15,7 +15,6 @@ ServiceTester::ServiceTester(int _position, int _size, int _background) {
 	msgErr = "";
 	finish = false;
 	fail = false;
-	setPathContents();
 	PRINTL(util::_DEBUG, "Done!\n");
 }
 
@@ -24,6 +23,9 @@ ServiceTester::~ServiceTester() {
 }
 
 void ServiceTester::checkServiceSRT() {
+
+	setPathContents();
+
 	service_srt = new ServiceWindowGenerationFromSRT((char*)VID_FILE, (char*)SRT_FILE, 1, position,
 	 resolution, background, (char*)TESTER_ID, MODE_TEST, 1);
 
@@ -48,6 +50,9 @@ void ServiceTester::checkServiceSRT() {
 }
 
 void ServiceTester::checkServiceRec() {
+
+	setPathContents();
+
 	service_rec = new ServiceWindowGenerationFromRec((char*)REC_FILE, 0, 0,
 	 background, (char*)TESTER_ID, MODE_TEST, 6);// 6 serviço sem mixagem
 	
@@ -70,6 +75,9 @@ void ServiceTester::checkServiceRec() {
     deleteFiles();
 }
 void ServiceTester::checkServiceText() {
+
+	setPathContents();
+
 	service_text = new ServiceWindowGenerationFromText((char*)TXT_FILE, 1, background, 
 		(char*)TESTER_ID, MODE_TEST);
 
@@ -141,7 +149,8 @@ void ServiceTester::setPathContents() {
 
 void ServiceTester::deleteFiles() {
 	string command = "rm -f ";
-	command.append(OUT_FILE);
+	command.append(OUT_FILE).append(" && rm -rf ")
+	.append(PATH_TEST_UPLOADS).append("/").append(TESTER_ID);
 	system(command.c_str());
 }
 
diff --git a/util/src/argParser.cpp b/util/src/argParser.cpp
index 353c56d..317816c 100644
--- a/util/src/argParser.cpp
+++ b/util/src/argParser.cpp
@@ -135,7 +135,7 @@ void ArgParser::readArgs(char** argv, int argc)
 	}
 
 	if (argc < 2){
-		printf("Not enough arguments.\nTry --help.\n");
+		printf("Not enough arguments. Try --help.\n");
 		throw lavidlib::RuntimeException();
 	}
 
--
libgit2 0.21.2