Rewrote mensa module ...
This commit is contained in:
parent
c33aea37f2
commit
ae46cfb761
2 changed files with 70 additions and 74 deletions
2
curunir
2
curunir
|
|
@ -5,4 +5,4 @@ DIR=`dirname $0`
|
|||
|
||||
cd "$DIR"
|
||||
export PYTHONPATH="$PYTHONPATH:."
|
||||
exec /usr/bin/env python -OO "$APP.py" "$@"
|
||||
exec /usr/bin/env python2 -OO "$APP.py" "$@"
|
||||
|
|
|
|||
110
modules/mensa.py
110
modules/mensa.py
|
|
@ -22,7 +22,6 @@ class Module(ModuleBase):
|
|||
if tomorrow or datetime.now().time() > time(15):
|
||||
day += timedelta(1)
|
||||
daystr = 'Morgen'
|
||||
datestr = day.strftime(r'%d\.%m\.<\/div>')
|
||||
|
||||
try:
|
||||
f = urllib.urlopen(self.manager.config['mensa_url'], 'r')
|
||||
|
|
@ -33,64 +32,57 @@ class Module(ModuleBase):
|
|||
return
|
||||
|
||||
def handle_data(data):
|
||||
if not re.search(datestr, data):
|
||||
return False
|
||||
r = re.compile(r'.*?<tr[^>]*>(.*?)</tr>.*?<tr[^>]*>(.*?)</tr>', re.DOTALL)
|
||||
r2 = re.compile(r'.*?<td[^>]*>(.*?)</td>', re.DOTALL)
|
||||
|
||||
match = re.compile(r'^.*' + datestr + r'(.*?)(?:<td rowspan="3" class="schrift_fett"><div>|</table>).*$', re.DOTALL).match(data)
|
||||
|
||||
if not match:
|
||||
return False
|
||||
|
||||
data = match.group(1)
|
||||
|
||||
r = re.compile(r'.*?<tr[^>]*>(.*?)</tr>', re.DOTALL)
|
||||
r2 = re.compile(r'(?:.*?<td[^>]*>(.*?)</td>){4}', re.DOTALL)
|
||||
|
||||
mealstr = ''
|
||||
pos = 0
|
||||
while not r2.match(mealstr):
|
||||
def handle_data_row(data, pos):
|
||||
match = r.match(data, pos)
|
||||
if not match:
|
||||
return False
|
||||
mealstr = match.group(1)
|
||||
pos = match.end()
|
||||
|
||||
match = r.match(data, pos)
|
||||
if not match:
|
||||
return False
|
||||
pricestr = match.group(1)
|
||||
|
||||
ret = []
|
||||
mealpos = 0
|
||||
pricepos = 0
|
||||
|
||||
for day in range(0,5):
|
||||
mealmatch = r2.match(match.group(1), mealpos)
|
||||
pricematch = r2.match(match.group(2), pricepos)
|
||||
|
||||
if not mealmatch or not pricematch:
|
||||
return False
|
||||
|
||||
ret.append((mealmatch.group(1), pricematch.group(1)))
|
||||
mealpos = mealmatch.end()
|
||||
pricepos = pricematch.end()
|
||||
|
||||
return (ret, match.end())
|
||||
|
||||
|
||||
match = re.compile(r'^.*?<table[^>]*>.*?<td[^>]*>.*?(\d+)\.(\d+)\. - \d+\.\d+\.(\d+)\.*?</td>.*?(?:<col[^>]*>\s*){4}(.*?)</table>.*$', re.DOTALL).match(data)
|
||||
|
||||
if not match:
|
||||
return False
|
||||
|
||||
firstday = datetime.strptime('%s-%s-%s' % (match.group(3), match.group(2), match.group(1)), '%Y-%m-%d').date()
|
||||
weekday = (day - firstday).days
|
||||
|
||||
if weekday < 0 or weekday > 4:
|
||||
return False
|
||||
|
||||
data = match.group(4)
|
||||
|
||||
meals = []
|
||||
pos = 0
|
||||
r = re.compile(r'\s*<td class="schrift_(gerichte|spezial)">(.+?)</td>', re.DOTALL)
|
||||
match = r.match(mealstr, pos)
|
||||
while match:
|
||||
meals.append(match.group(2))
|
||||
|
||||
if len(meals) >= 4:
|
||||
break
|
||||
for i in range(0,6):
|
||||
row = handle_data_row(data, pos)
|
||||
|
||||
pos = match.end()
|
||||
match = r.match(mealstr, pos)
|
||||
|
||||
if len(meals) < 4:
|
||||
if not row:
|
||||
return False
|
||||
|
||||
prices = []
|
||||
pos = 0
|
||||
r = re.compile(r'\s*<td class="schrift_(?:preise|spezial)">(.+?)</td>', re.DOTALL)
|
||||
match = r.match(pricestr, pos)
|
||||
while match:
|
||||
prices.append(match.group(1))
|
||||
|
||||
if len(prices) >= 4:
|
||||
break
|
||||
|
||||
pos = match.end()
|
||||
match = r.match(pricestr, pos)
|
||||
|
||||
if len(prices) < 4:
|
||||
return False
|
||||
meals.append(row[0])
|
||||
pos = row[1]
|
||||
|
||||
def unescape(s):
|
||||
s = s.replace(' ', '')
|
||||
|
|
@ -118,18 +110,22 @@ class Module(ModuleBase):
|
|||
s = re.sub(r'<[^>]*>', '', s)
|
||||
return s
|
||||
|
||||
meals = map(unescape, meals)
|
||||
prices = map(unescape, prices)
|
||||
stripunescape = (lambda item: (unescape(item[0].strip()), unescape(item[1].strip())))
|
||||
meals = map(lambda item: map(stripunescape, item), meals)
|
||||
|
||||
reply = 'Mensa-Menü für den %s\n\n' % day.strftime('%d.%m.%y')
|
||||
if meals[0]:
|
||||
reply += 'Eintopf: %s (%s)\n' % (meals[0].strip(), prices[0].strip())
|
||||
if meals[1]:
|
||||
reply += 'Hauptgericht 1: %s (%s)\n' % (meals[1].strip(), prices[1].strip())
|
||||
if meals[2]:
|
||||
reply += 'Hauptgericht 2: %s (%s)\n' % (meals[2].strip(), prices[2].strip())
|
||||
if meals[3]:
|
||||
reply += 'Vegetarisches Hauptgericht: %s (%s)\n' % (meals[3].strip(), prices[3].strip())
|
||||
if meals[0][weekday][0]:
|
||||
reply += 'Eintopf: %s (%s)\n' % meals[0][weekday]
|
||||
if meals[1][weekday][0]:
|
||||
reply += 'Hauptgericht 1: %s (%s)\n' % meals[1][weekday]
|
||||
if meals[3][weekday][0]:
|
||||
reply += 'Hauptgericht 2: %s (%s)\n' % meals[3][weekday]
|
||||
if meals[2][weekday][0]:
|
||||
reply += 'Vegetarisches Hauptgericht: %s (%s)\n' % meals[2][weekday]
|
||||
if meals[4][weekday][0]:
|
||||
reply += 'Wok: %s (%s)\n' % meals[4][weekday]
|
||||
if meals[5][weekday][0]:
|
||||
reply += 'Beilagen: %s (%s)\n' % meals[5][weekday]
|
||||
|
||||
return reply
|
||||
|
||||
|
|
|
|||
Reference in a new issue