changes to DB code

src/google_flight_analysis/analysis.py

@@ -5,11 +5,9 @@
   Written by Kaya Celebi, March 2022
 ****************************************************************************************************************************************************************/'''
 
-from typing import overload
 import numpy as np
 import pandas as pd
-from tqdm import tqdm
-import json
-import os
+from tqdm import tqdm, trange
+from flight import Flight
 
 

src/google_flight_analysis/cache.py

@@ -48,7 +48,7 @@ def cache(self, obj, db):
 				recent_access = file.readline()
 				if recent_access != current_access:
 					df_old = pd.read_csv(fname, index_col = 'Unnamed: 0')
-					df = pd.concat([df_old, df])
+					df = pd.concat([df_old, df], ignore_index = True)
 				else:
 					return # Data already in csv, redundant
 

src/google_flight_analysis/flight.py

@@ -139,9 +139,9 @@ def _classify_arg(self, arg):
 			# or multiple stops
 			self._stops = arg
 		elif len(arg) > 0 and arg != 'Separate tickets booked together' and arg != 'Change of airport':
-			#val = arg.split(',')
-			#val = [elem[] if 'Operate' in elem for elem in val]
-			self._airline = arg
+			val = arg.split(',')
+			val = [elem.split('Operated')[0] for elem in val]
+			self._airline = ','.join(val)
 		else:
 			self._trash += [arg]
 			# airline and other stuff idk

src/google_flight_analysis/scrape.py

@@ -136,7 +136,7 @@ def _scrape_data(self):
 		if self._date_return is not None:
 			return_result = self._get_results(self._make_url(self._date_return, leave = False), driver)
 			driver.quit()
-			return pd.concat([leave_result, return_result])
+			return pd.concat([leave_result, return_result], ignore_index = True)
 
 		driver.quit()
 		return leave_result
@@ -172,7 +172,6 @@ def _get_results(self, url, driver):
 
 	def _clean_results(self, result):
 		res2 = [x.encode("ascii", "ignore").decode().strip() for x in result]
-		#res2 = [x[0:-2] if len(x) > 2 and x[-2] == '+' else x for x in res2 ]
 
 		start = res2.index("Sort by:")+1
 		mid_start = res2.index("Price insights")