add airlines field & make from_airport/to_airport repeated in the proto

fast_flights/core.py

@@ -105,6 +105,14 @@ def safe(n: Optional[LexborNode]):
             name = safe(item.css_first("div.sSHqwe.tPgKwe.ogfYpf span")).text(
                 strip=True
             )
+            # from_airport - to_airport
+            from_to_airport_node = item.css("span.PTuQse.sSHqwe.tPgKwe.ogfYpf div.QylvBf span span span")
+            try:
+                from_airport = from_to_airport_node[0].text(strip=True)
+                to_airport = from_to_airport_node[1].text(strip=True)
+            except IndexError:
+                from_airport = ""
+                to_airport = ""
 
             # Get departure & arrival time
             dp_ar_node = item.css("span.mv1WYe div")
@@ -141,6 +149,8 @@ def safe(n: Optional[LexborNode]):
                 {
                     "is_best": is_best_flight,
                     "name": name,
+                    "from_airport": from_airport,
+                    "to_airport": to_airport,
                     "departure": " ".join(departure_time.split()),
                     "arrival": " ".join(arrival_time.split()),
                     "arrival_time_ahead": time_ahead,

fast_flights/flights.proto

@@ -6,8 +6,9 @@ message Airport {
 
 message FlightData {
   string date = 2;
-  Airport from_flight = 13;
-  Airport to_flight = 14;
+  repeated string airlines = 6;
+  repeated Airport from_flight = 13;
+  repeated Airport to_flight = 14;
   optional int32 max_stops = 5;
 }
 

fast_flights/flights_impl.py

@@ -17,13 +17,15 @@ class FlightData:
         date (str): Date.
         from_airport (str): Departure (airport). Where from?
         to_airport (str): Arrival (airport). Where to?
+        airlines (list(str), optional): A list of airlines. Default is None.
         max_stops (int, optional): Maximum number of stops. Default is None.
     """
 
-    __slots__ = ("date", "from_airport", "to_airport", "max_stops")
+    __slots__ = ("date", "from_airport", "to_airport", "airlines", "max_stops")
     date: str
     from_airport: str
     to_airport: str
+    airlines: Optional[List[str]]
     max_stops: Optional[int]
 
     def __init__(
@@ -32,22 +34,28 @@ def __init__(
         date: str,
         from_airport: Union[Airport, str],
         to_airport: Union[Airport, str],
+        airlines: Optional[List[str]] = None,
         max_stops: Optional[int] = None,
     ):
         self.date = date
         self.from_airport = (
             from_airport.value if isinstance(from_airport, Airport) else from_airport
-        )
+        ).split(',')
         self.to_airport = (
             to_airport.value if isinstance(to_airport, Airport) else to_airport
-        )
+        ).split(',')
+        self.airlines = airlines
         self.max_stops = max_stops
 
     def attach(self, info: PB.Info) -> None:  # type: ignore
         data = info.data.add()
         data.date = self.date
-        data.from_flight.airport = self.from_airport
-        data.to_flight.airport = self.to_airport
+        for from_airport in self.from_airport:
+            data.from_flight.add().airport = from_airport
+        for to_airport in self.to_airport:
+            data.to_flight.add().airport = to_airport
+        if self.airlines is not None:
+            data.airlines[:] = self.airlines
         if self.max_stops is not None:
             data.max_stops = self.max_stops
 

fast_flights/schema.py

@@ -14,6 +14,8 @@ class Result:
 class Flight:
     is_best: bool
     name: str
+    from_airport: str
+    to_airport: str
     departure: str
     arrival: str
     arrival_time_ahead: str