SoftwareEngineering/DualHub
4
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

complete mensa async

Browse Source
This commit is contained in:
Paul Martin
2024-04-09 08:50:05 +02:00
parent 490ee7f02f
commit 0d31d84d48
2 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fetchDUALIS.py
View File

@ -1,4 +1,3 @@
import requests
import urllib.parse import urllib.parse
import time import time
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
@ -59,7 +58,7 @@ async def getKurs(token: int, cookie: str):
headers=headers) headers=headers)
html = BeautifulSoup(response.text, 'lxml') html = BeautifulSoup(response.text, 'lxml')
link = html.body.find('a', attrs={'id': "Popup_details0001"})['href'] link = html.body.find('a', attrs={'id': "Popup_details0001"})['href']
response = requests.request("GET", url + link[21:], headers=headers, data={}) response = await s.get(url=f"{url}{link[21:]}", headers=headers)
html = BeautifulSoup(response.text, 'lxml') html = BeautifulSoup(response.text, 'lxml')
content = html.body.find('td', attrs={'class': 'level02'}).text content = html.body.find('td', attrs={'class': 'level02'}).text
start = content.find(" ") + 4 start = content.find(" ") + 4

80
fetchMENSA.py
View File

@ -1,8 +1,8 @@
import json import json
from init import db, Meals#, scheduler from init import db, Meals#, scheduler
import datetime import datetime
import requests
import time import time
import httpx
nomeal = 'Essen nicht (mehr) verfügbar' nomeal = 'Essen nicht (mehr) verfügbar'
@ -26,7 +26,7 @@ def getMeals(day: datetime):
return getMealsFromAPI(day, dbentry=True) return getMealsFromAPI(day, dbentry=True)
def getMealsFromAPI(day: str, dbentry: bool = False): async def getMealsFromAPI(day: str, dbentry: bool = False):
""" """
Fragt die Mensa-API nach den Mahlzeiten eines Tages ab. \n Fragt die Mensa-API nach den Mahlzeiten eines Tages ab. \n
Wenn dbentry: Schreibt die Ergebnisse in die Datenbank. \n Wenn dbentry: Schreibt die Ergebnisse in die Datenbank. \n
@ -35,46 +35,46 @@ def getMealsFromAPI(day: str, dbentry: bool = False):
:param dbentry: :param dbentry:
:return [Name1, Name2, ...]: :return [Name1, Name2, ...]:
""" """
url = "https://dh-api.paulmartin.cloud/plans/" + day + "?canteens=erzberger" async with httpx.AsyncClient() as s:
response = requests.request("GET", url) response = await s.get(url=f"https://dh-api.paulmartin.cloud/plans/{day}?canteens=erzberger")
response = response.content response = response.content
jres = json.loads(response.decode("utf-8")) jres = json.loads(response.decode("utf-8"))
essen = [] essen = []
try: try:
num = len(jres["data"][0]["lines"]) num = len(jres["data"][0]["lines"])
for i in range(num): for i in range(num):
try: try:
jsmeal = jres["data"][0]["lines"][i]["meals"] jsmeal = jres["data"][0]["lines"][i]["meals"]
cont = True cont = True
except IndexError: except IndexError:
essen = [] essen = []
cont = False cont = False
if cont: if cont:
for e in range(len(jsmeal)): for e in range(len(jsmeal)):
ji = jsmeal[e] ji = jsmeal[e]
name = ji["name"] name = ji["name"]
if pricetofloat(ji["price"]) >= 1.1: if pricetofloat(ji["price"]) >= 1.1:
vegan = ji["classifiers"].count("VG") == 1 vegan = ji["classifiers"].count("VG") == 1
schwein = ji["classifiers"].count("S") == 1 schwein = ji["classifiers"].count("S") == 1
if vegan: if vegan:
veget = True veget = True
else: else:
veget = ji["classifiers"].count("VEG") == 1 veget = ji["classifiers"].count("VEG") == 1
if veget: if veget:
if name.count("Reibekäse") > 0: if name.count("Reibekäse") > 0:
vegan = True vegan = True
essen += [name] essen += [name]
if dbentry: if dbentry:
mid = int(time.time() * 1000) % 100000 mid = int(time.time() * 1000) % 100000
neu = Meals(date=day, name=name, id=mid, vegan=vegan, vegetarian=veget, schwein=schwein) neu = Meals(date=day, name=name, id=mid, vegan=vegan, vegetarian=veget, schwein=schwein)
db.session.add(neu) db.session.add(neu)
db.session.commit() db.session.commit()
if not essen: if not essen:
essen = [nomeal]
except KeyError:
essen = [nomeal] essen = [nomeal]
except KeyError: return essen
essen = [nomeal]
return essen
def pricetofloat(price: str): def pricetofloat(price: str):