From e044cd8434a1bf6290c8c96f4129128318f98460 Mon Sep 17 00:00:00 2001 From: Paul Martin Date: Mon, 17 Jun 2024 12:47:38 +0200 Subject: [PATCH] Quick Fixes --- fetchRAPLA.py | 9 +++++---- routing.py | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fetchRAPLA.py b/fetchRAPLA.py index e7c2348..05bca3d 100644 --- a/fetchRAPLA.py +++ b/fetchRAPLA.py @@ -101,7 +101,7 @@ async def getNewRapla(url: str, testing=False): elif parsed[0] == 1: url = parsed[1] elif parsed[0] == 2: - return await buildICALfromKey(parsed[1], onlyUpdate=False, testing=True) + return await buildICALfromKey(parsed[1], onlyUpdate=False, testing=testing) fileInURL = url.find("file=") kurs = url[fileInURL + 5:].upper() if url[-5:] != ".ical": @@ -189,7 +189,8 @@ async def buildICALfromKey(url, onlyUpdate, testing=False): if page.text[:10] == "BEGIN:VCAL": info = page.headers['content-disposition'] kursname = info[info.find('filename=')+9:-4].upper() - assert "TMB22" in kursname + if testing: + assert "TMB22" in kursname writeToFile(f"calendars/rapla{kursname}.ical", page) if not onlyUpdate: writeKursToDB(kursname, url) @@ -203,8 +204,8 @@ async def buildICALfromKey(url, onlyUpdate, testing=False): assert "TMT22B1" in kursname if len(kursname) > 15: return 0 - start = f'{(datetime.now() - relativedelta(days=183)):%Y-%m-%d}' - end = f'{(datetime.now() + relativedelta(days=183)):%Y-%m-%d}' + start = f'{(datetime.now() - relativedelta(days=100)):%Y-%m-%d}' + end = f'{(datetime.now() + relativedelta(days=100)):%Y-%m-%d}' payload = {"url": url, "start": start, "end": end} if testing: req = await s.post(url="https://dh-api.paulmartin.cloud/rapla", data=payload, diff --git a/routing.py b/routing.py index d81a83e..2816a16 100644 --- a/routing.py +++ b/routing.py @@ -88,7 +88,7 @@ def initRoutes(app: Flask): return redirect(url_for("getKurs", next=url_for(request.endpoint))) week = request.args.get("week") if week: - week = datetime.datetime.strptime(week, "%Y-%m-%d") + week = datetime.strptime(week, "%Y-%m-%d") else: week = "today" samstag = request.args.get("samstag") @@ -110,7 +110,7 @@ def initRoutes(app: Flask): """ week = request.args.get("week") if week: - week = datetime.datetime.strptime(week, "%Y-%m-%d") + week = datetime.strptime(week, "%Y-%m-%d") else: week = "today" try: