ADD: Protección tracker si no está iniciado

C-Tas · Apr 16, 2022 · c209143 · c209143
1 parent d60e6a0
commit c209143
Show file tree

Hide file tree

Showing 58 changed files with 88 additions and 319 deletions.
diff --git a/src/.gitignore b/src/.gitignore
@@ -29,6 +29,8 @@
 .vs/
 /[Tt]mp
 /[Ee]xes
+/[Ee]vents
+!/[Ee]vents/noDel.txt
 !/[Ll]ib
 !/[Dd]ll
 

diff --git a/src/Events/Login/Login0.json b/src/Events/Login/Login0.json
diff --git a/src/Events/Login/Login2.json b/src/Events/Login/Login2.json
diff --git a/src/Events/Login/Login3.json b/src/Events/Login/Login3.json
diff --git a/src/Events/LoginZone/LoginZone0.json b/src/Events/LoginZone/LoginZone0.json
diff --git a/src/Events/LoginZone/LoginZone2.json b/src/Events/LoginZone/LoginZone2.json
diff --git a/src/Events/Logout/Logout0.json b/src/Events/Logout/Logout0.json
diff --git a/src/Events/Logout/Logout2.json b/src/Events/Logout/Logout2.json
diff --git a/src/Events/Logout/Logout3.json b/src/Events/Logout/Logout3.json
diff --git a/src/Events/LogoutZone/LogoutZone0.json b/src/Events/LogoutZone/LogoutZone0.json
diff --git a/src/Events/LogoutZone/LogoutZone2.json b/src/Events/LogoutZone/LogoutZone2.json
diff --git a/src/Events/OpenInv/OpenInv0.json b/src/Events/OpenInv/OpenInv0.json
diff --git a/src/Events/OpenInv/OpenInv1.json b/src/Events/OpenInv/OpenInv1.json
diff --git a/src/Events/OpenInv/OpenInv10.json b/src/Events/OpenInv/OpenInv10.json
diff --git a/src/Events/OpenInv/OpenInv11.json b/src/Events/OpenInv/OpenInv11.json
diff --git a/src/Events/OpenInv/OpenInv2.json b/src/Events/OpenInv/OpenInv2.json
diff --git a/src/Events/OpenInv/OpenInv4.json b/src/Events/OpenInv/OpenInv4.json
diff --git a/src/Events/OpenInv/OpenInv5.json b/src/Events/OpenInv/OpenInv5.json
diff --git a/src/Events/OpenInv/OpenInv6.json b/src/Events/OpenInv/OpenInv6.json
diff --git a/src/Events/OpenInv/OpenInv7.json b/src/Events/OpenInv/OpenInv7.json
diff --git a/src/Events/OpenInv/OpenInv8.json b/src/Events/OpenInv/OpenInv8.json
diff --git a/src/Events/OpenInv/OpenInv9.json b/src/Events/OpenInv/OpenInv9.json
diff --git a/src/Events/OpenShop/OpenShop0.json b/src/Events/OpenShop/OpenShop0.json
diff --git a/src/Events/OpenSkills/OpenSkills0.json b/src/Events/OpenSkills/OpenSkills0.json
diff --git a/src/Events/OpenSkills/OpenSkills1.json b/src/Events/OpenSkills/OpenSkills1.json
diff --git a/src/Events/OpenSkills/OpenSkills2.json b/src/Events/OpenSkills/OpenSkills2.json
diff --git a/src/Events/OpenSkills/OpenSkills3.json b/src/Events/OpenSkills/OpenSkills3.json
diff --git a/src/Events/OpenSkills/OpenSkills4.json b/src/Events/OpenSkills/OpenSkills4.json
diff --git a/src/Events/OpenSkills/OpenSkills5.json b/src/Events/OpenSkills/OpenSkills5.json
diff --git a/src/Events/noDel.txt b/src/Events/noDel.txt
@@ -0,0 +1 @@
+.
diff --git a/src/Sources/Application.cpp b/src/Sources/Application.cpp
@@ -25,11 +25,10 @@ Application::Application(GameStateMachine* state) {
 
 Application::~Application() {
 	// USABILIDAD
-	int timest = std::chrono::duration_cast<std::chrono::seconds>(
-		std::chrono::system_clock::now().time_since_epoch()).count();
+	long long timest = Tracker::GetTimeStamp();
 	Logout* logout = (Logout*)(Tracker::CreateNewEvent(timest, gameManager_->getIdUser(), "a", (int)EventInfo::EventType::Logout));
 	Tracker::TrackEvent(logout);
-	tracker_->End(); // FLUSH DE PRUEBA - BORRAR
+	tracker_->End();
 	tracker_->Free();
 
 	delete machine_;
@@ -69,9 +68,9 @@ bool Application::initTracker()
 
 	//USABILIDAD
 	std::string cmd = "getmac";
-	std::string filename = "macaddress.txt";
+	std::string auxFile = "macaddress.txt";
 
-	system((cmd + ">" + filename).c_str());
+	system((cmd + ">" + auxFile).c_str());
 	std::string line;
 	std::ifstream myfile("macaddress.txt");
 
@@ -89,13 +88,18 @@ bool Application::initTracker()
 	else
 		std::cout << "Unable to open the file";
 
-	system(("del " + filename).c_str());
+	system(("del " + auxFile).c_str());
+
+	if (gameManager_ == nullptr) {
+		std::cout << "Error al inicializar el tracker. Gamemanager sin inicializar...\n";
+		return false;
+	}
 
 	gameManager_->setIdUser(mac);
 
 	trackerStarted_ =  tracker_->Init(PersistenceType::FILE, TypeOfFile::Json, PATH_TRACKER);
-	int timest = std::chrono::duration_cast<std::chrono::seconds>(
-		std::chrono::system_clock::now().time_since_epoch()).count();
+	long long timest = Tracker::GetTimeStamp();
+
 	Login* login = (Login*)(Tracker::CreateNewEvent(timest, mac, "a", (int)EventInfo::EventType::Login));
 	Tracker::TrackEvent(login);
 

diff --git a/src/Sources/BeerButton.cpp b/src/Sources/BeerButton.cpp
@@ -36,7 +36,7 @@ bool BeerButton::update(){
 		if (!clicked_ && SDL_PointInRect(&mouse, &getDestiny())) {
 			select_ = true;
 			//Cuando se ha clickado
-			if (input->getMouseButtonState(HandleEvents::MOUSEBUTTON::LEFT)) {
+			if (input->getMouseButtonState((Uint8)HandleEvents::MOUSEBUTTON::LEFT)) {
 				app_->getAudioManager()->playChannel(Resources::Shout, 0, Resources::BeerButtonChanel);
 				currentState_->setButtonClick(true);
 				clicked_ = true;

diff --git a/src/Sources/Button.cpp b/src/Sources/Button.cpp
@@ -23,7 +23,7 @@ bool Button::update() {
 	Vector2D aux = input->getRealMousePos(); //Guardas la posicion del raton
 	SDL_Point mouse = { (int)round(aux.getX()), (int)round(aux.getY()) };
 
-	if (SDL_PointInRect(&mouse, &getDestiny()) && input->getMouseButtonState(HandleEvents::MOUSEBUTTON::LEFT)) {
+	if (SDL_PointInRect(&mouse, &getDestiny()) && input->getMouseButtonState((Uint8)HandleEvents::MOUSEBUTTON::LEFT)) {
 		if (cbClick_ != nullptr) {
 			cbClick_(app_);
 			//app_->getAudioManager()->playChannel(Resources::Time, 0, Resources::AuxMusicChannel2);