Probably a fix for #2
This commit is contained in:
@@ -21,14 +21,10 @@ trip = client.trip_find(origin_id=origin.id, dest_id=destination.id)
|
||||
"""
|
||||
|
||||
__name__ = "pyrmv"
|
||||
__version__ = "0.3.4"
|
||||
__version__ = "0.3.5"
|
||||
__license__ = "MIT License"
|
||||
__author__ = "Profitroll"
|
||||
|
||||
from . import raw
|
||||
from . import const
|
||||
from . import enums
|
||||
from . import errors
|
||||
from . import utility
|
||||
from . import const, enums, errors, raw, utility
|
||||
from .classes import *
|
||||
from .classes.Client import Client
|
||||
from .classes.Client import Client
|
||||
|
@@ -7,8 +7,10 @@ class LineArrival():
|
||||
self.journey = client.journey_detail(data["JourneyDetailRef"]["ref"])
|
||||
self.status = data["JourneyStatus"]
|
||||
self.messages = []
|
||||
for message in data["Messages"]["Message"]:
|
||||
self.messages.append(Message(message))
|
||||
if "Messages" in data:
|
||||
self.messages.extend(
|
||||
Message(message) for message in data["Messages"]["Message"]
|
||||
)
|
||||
self.name = data["name"]
|
||||
self.type = data["type"]
|
||||
self.stop_name = data["stop"]
|
||||
@@ -36,8 +38,10 @@ class LineDeparture():
|
||||
self.journey = client.journey_detail(data["JourneyDetailRef"]["ref"])
|
||||
self.status = data["JourneyStatus"]
|
||||
self.messages = []
|
||||
for message in data["Messages"]["Message"]:
|
||||
self.messages.append(Message(message))
|
||||
if "Messages" in data:
|
||||
self.messages.extend(
|
||||
Message(message) for message in data["Messages"]["Message"]
|
||||
)
|
||||
self.name = data["name"]
|
||||
self.type = data["type"]
|
||||
self.stop_name = data["stop"]
|
||||
|
@@ -11,11 +11,12 @@ class Journey():
|
||||
self.direction_flag = data["Directions"]["Direction"][0]["flag"]
|
||||
self.messages = []
|
||||
|
||||
for stop in data["Stops"]["Stop"]:
|
||||
self.stops.append(Stop(stop))
|
||||
self.stops.extend(Stop(stop) for stop in data["Stops"]["Stop"])
|
||||
|
||||
for message in data["Messages"]["Message"]:
|
||||
self.messages.append(Message(message))
|
||||
if "Messages" in data:
|
||||
self.messages.extend(
|
||||
Message(message) for message in data["Messages"]["Message"]
|
||||
)
|
||||
|
||||
def __str__(self) -> str:
|
||||
return f"Journey with total of {len(self.stops)} stops and {len(self.messages)} messages heading {self.direction} ({self.direction_flag})"
|
@@ -61,7 +61,7 @@ class Message():
|
||||
self.text = data["text"]
|
||||
self.company = data["company"]
|
||||
self.category = data["category"]
|
||||
self.priority = data["priority"]
|
||||
self.priority = None if "priority" not in data else data["priority"]
|
||||
self.products = data["products"]
|
||||
self.icon = data["icon"]
|
||||
self.time_start = datetime.strptime(data["sTime"], "%H:%M:%S")
|
||||
|
Reference in New Issue
Block a user