refactoring
This commit is contained in:
@@ -9,10 +9,6 @@ import numpy as np
|
|||||||
from plotly_calplot import calplot
|
from plotly_calplot import calplot
|
||||||
import plotly
|
import plotly
|
||||||
|
|
||||||
|
|
||||||
date_format = "%Y-%m-%d"
|
|
||||||
yesterday = datetime.today() - timedelta(days=1)
|
|
||||||
yesterday = yesterday.strftime(date_format)
|
|
||||||
delay_csv = "delays.csv"
|
delay_csv = "delays.csv"
|
||||||
delay_html = "output/delays.html"
|
delay_html = "output/delays.html"
|
||||||
delay_png = "output/delays.png"
|
delay_png = "output/delays.png"
|
||||||
@@ -29,15 +25,17 @@ def get_delay(date_string: str) -> int:
|
|||||||
int: The delay in minutes.
|
int: The delay in minutes.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
vehicles = requests.get(
|
vehicles = requests.get(
|
||||||
f"https://bustimes.org/services/632-wigan-bus-station-bus-station/vehicles?date={date_string}").text
|
f"https://bustimes.org/services/632-wigan-bus-station-bus-station/vehicles?date={date_string}").text
|
||||||
|
|
||||||
last_joruney = re.findall(
|
last_joruney = re.findall(
|
||||||
r'\#journeys\/(\d+)">([\d\:]+)<\/a>\s+<\/td>\s+<td>Chorley Town Centre',
|
r'\#journeys\/(\d+)">([\d\:]+)<\/a>\s+<\/td>\s+<td>Chorley Town Centre',
|
||||||
vehicles,
|
vehicles,
|
||||||
)[-1]
|
)[-1]
|
||||||
|
|
||||||
if last_joruney[1] != "23:20" and last_joruney[1] != "22:45":
|
if last_joruney[1] != "23:20" and last_joruney[1] != "22:45":
|
||||||
print(f"No last bus at 23:20 or 22:45, last bus was at {last_joruney[1]}")
|
#print(f"No last bus at 23:20 or 22:45, last bus was at {last_joruney[1]}")
|
||||||
return 60
|
return 60
|
||||||
else:
|
else:
|
||||||
journey_info = requests.get(
|
journey_info = requests.get(
|
||||||
@@ -51,6 +49,9 @@ def get_delay(date_string: str) -> int:
|
|||||||
|
|
||||||
|
|
||||||
def output_csv():
|
def output_csv():
|
||||||
|
yesterday = datetime.today() - timedelta(days=1)
|
||||||
|
yesterday = yesterday.strftime("%Y-%m-%d")
|
||||||
|
|
||||||
# Check if the file exists
|
# Check if the file exists
|
||||||
try:
|
try:
|
||||||
with open(delay_csv, "r") as file:
|
with open(delay_csv, "r") as file:
|
||||||
@@ -58,11 +59,14 @@ def output_csv():
|
|||||||
for row in reader:
|
for row in reader:
|
||||||
if row[0] == yesterday:
|
if row[0] == yesterday:
|
||||||
break
|
break
|
||||||
|
# If the entry for yesterday already exists, do nothing
|
||||||
|
|
||||||
else:
|
else:
|
||||||
# Add a new entry for yesterday
|
# Add a new entry for yesterday
|
||||||
with open(delay_csv, "a", newline="") as file:
|
with open(delay_csv, "a", newline="") as file:
|
||||||
writer = csv.writer(file)
|
writer = csv.writer(file)
|
||||||
writer.writerow([yesterday, get_delay(yesterday)])
|
writer.writerow([yesterday, get_delay(yesterday)])
|
||||||
|
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
# Create a new file and add the entry for yesterday
|
# Create a new file and add the entry for yesterday
|
||||||
with open(delay_csv, "w", newline="") as file:
|
with open(delay_csv, "w", newline="") as file:
|
||||||
@@ -70,6 +74,7 @@ def output_csv():
|
|||||||
writer.writerow(["Date", "Minutes Late"])
|
writer.writerow(["Date", "Minutes Late"])
|
||||||
writer.writerow([yesterday, get_delay(yesterday)])
|
writer.writerow([yesterday, get_delay(yesterday)])
|
||||||
|
|
||||||
|
|
||||||
def make_plot():
|
def make_plot():
|
||||||
df = pd.read_csv(delay_csv)
|
df = pd.read_csv(delay_csv)
|
||||||
df["Date"] = pd.to_datetime(df["Date"])
|
df["Date"] = pd.to_datetime(df["Date"])
|
||||||
|
|||||||
Reference in New Issue
Block a user