From dfc439ed4de498981c6fbc975773e0de73ed0957 Mon Sep 17 00:00:00 2001
From: Arthur Lu <learthurgo@gmail.com>
Date: Sat, 23 May 2020 19:43:59 -0500
Subject: [PATCH] added test.py to .gitignore prepared tra.py for threading
 implement

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
---
 .gitignore           |  3 +-
 data-analysis/tra.py | 87 +++++++++++++++++++++++---------------------
 2 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e0a337d..fc47881e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,5 @@ data-analysis/config-pop.json
 data-analysis/__pycache__/
 analysis-master/__pycache__/
 analysis-master/.pytest_cache/
-data-analysis/.pytest_cache/
\ No newline at end of file
+data-analysis/.pytest_cache/
+data-analysis/test.py
diff --git a/data-analysis/tra.py b/data-analysis/tra.py
index de16723d..9ddbf94d 100644
--- a/data-analysis/tra.py
+++ b/data-analysis/tra.py
@@ -27,65 +27,70 @@ def main():
 	global pit_enable
 
 	global config
-	config = su.load_config("config.json")
+	global config = su.load_config("config.json")
 
-	while(True):
+	task = threading.Thread(name = "match", target = match)
+	task.start()
+	task = threading.Thread(name = "match", target = metric)
+	task.start()
+	task = threading.Thread(name = "pit", target = pit)
+	task.start()
 
-		if match_enable == True and match == False:
+def match():
 
-			def target():
+	match = True
 
-				apikey = config["key"]["database"]
-				competition = config["competition"]
-				tests = config["statistics"]["match"]
+	apikey = config["key"]["database"]
+	competition = config["competition"]
+	tests = config["statistics"]["match"]
 
-				data = su.load_match(apikey, competition)
-				su.matchloop(apikey, competition, data, tests)
+	data = su.load_match(apikey, competition)
+	su.matchloop(apikey, competition, data, tests)
 
-				match = False
-				return
+	match = False
 
-			match = True
-			task = threading.Thread(name = "match", target=target)
-			task.start()
+	if match_enable == True and match == False:
+		
+		task = threading.Thread(name = "match", target = match)
+		task.start()
 
-		if metric_enable == True and metric == False:
-			
-			def target():
+def metric():
 
-				apikey = config["key"]["database"]
-				tbakey = config["key"]["tba"]
-				competition = config["competition"]
-				metric = config["statistics"]["metric"]
+	metric = True
 
-				timestamp = su.get_previous_time(apikey)
+	apikey = config["key"]["database"]
+	tbakey = config["key"]["tba"]
+	competition = config["competition"]
+	metric = config["statistics"]["metric"]
 
-				su.metricloop(tbakey, apikey, competition, timestamp, metric)
+	timestamp = su.get_previous_time(apikey)
 
-				metric = False
-				return
+	su.metricloop(tbakey, apikey, competition, timestamp, metric)
 
-			match = True
-			task = threading.Thread(name = "metric", target=target)
-			task.start()
+	metric = False
 
-		if pit_enable == True and pit == False:
+	if metric_enable == True and metric == False:
+		
+		task = threading.Thread(name = "match", target = metric)
+		task.start()
 
-			def target():
+def pit():
 
-				apikey = config["key"]["database"]
-				competition = config["competition"]
-				tests = config["statistics"]["pit"]
+	pit = True
 
-				data = su.load_pit(apikey, competition)
-				su.pitloop(apikey, competition, data, tests)
+	apikey = config["key"]["database"]
+	competition = config["competition"]
+	tests = config["statistics"]["pit"]
 
-				pit = False
-				return
+	data = su.load_pit(apikey, competition)
+	su.pitloop(apikey, competition, data, tests)
+
+	pit = False
+
+	if pit_enable == True and pit == False:
+		
+		task = threading.Thread(name = "pit", target = pit)
+		task.start()
 
-			pit = True
-			task = threading.Thread(name = "pit", target=target)
-			task.start()
-			
 task = threading.Thread(name = "main", target=main)
 task.start()
\ No newline at end of file