Update Amica JSON urls and parsing

amica.py

@@ -2,9 +2,9 @@ import pnalib
 import datetime
 
 restaurant_info = [
-  [ "(TaY) Amica Minerva", "http://www.amica.fi/minerva", "", "middle", "http://www.amica.fi/api/restaurant/menu/week?language=fi&restaurantPageId=7381" ],
-  [ "(TaY) Tampereen normaalikoulun ravintola", "http://www.amica.fi/tampereennormaalikoulu", "", "middle", "http://www.amica.fi/api/restaurant/menu/week?language=fi&restaurantPageId=6655" ],
-  [ "(TTY) Ravintola Reaktori", "http://www.amica.fi/reaktori", "", "middle", "http://www.amica.fi/api/restaurant/menu/week?language=fi&restaurantPageId=69171" ]
+  [ "(TaY) Amica Minerva", "http://www.amica.fi/minerva", "", "middle", "https://www.amica.fi/modules/json/json/Index?costNumber=0815&language=fi" ],
+  [ "(TaY) Tampereen normaalikoulun ravintola", "http://www.amica.fi/tampereennormaalikoulu", "", "middle", "https://www.amica.fi/modules/json/json/Index?costNumber=0811&language=fi" ],
+  [ "(TTY) Ravintola Reaktori", "http://www.amica.fi/reaktori", "", "middle", "https://www.amica.fi/modules/json/json/Index?costNumber=0812&language=fi" ]
 ]
 
 def get_restaurants(use_old, week):
@@ -17,41 +17,45 @@ def get_restaurants(use_old, week):
         title = info[0]
         url = info[4]
         temp_fname = "amica_{count}.temp.js".format(count = count)
-        url = "{url}&weekDate={week_date}".format(url=url, week_date=week_date)
         data = pnalib.get_json_file(url, temp_fname, use_old)
         if not data:
             continue
 
         week_foods = {}
-        lunch_menus = data["LunchMenus"]
+        lunch_menus = data["MenusForDays"]
         for week_day, lunch_menu in enumerate(lunch_menus):
             current_day_foods = []
             set_menus = lunch_menu["SetMenus"]
-            html = lunch_menu["Html"]
+            html = lunch_menu.get("Html", "")
             if len(html):
-                menus = html.split("<p>")
-                for set_menu in menus:
-                    meals = set_menu.split("<br />")
-                    food = []
-                    for meal in meals:
-                        parts = meal.split("(")
-                        current_food = parts[0]
-                        diets = [s.strip() for s in parts.split(")")[0].split(",")]
-                        if diets:
-                            current_food += " ({allergies})".format(allergies=", ".join(diets))
-                        food.append(current_food)
-                    current_day_foods.append("\n".join(food))
+                    current_day_foods.append(handle_html(html))
             else:
                 for set_menu in set_menus:
-                    meals = set_menu["Meals"]
+                    meals = set_menu["Components"]
                     food = []
                     for meal in meals:
-                        current_food = meal["Name"]
-                        if "Diets" in meal:
-                            current_food += " ({allergies})".format(allergies=", ".join(meal["Diets"]))
-                        food.append(current_food)
+                        food.append(format_meal_allergies(meal))
                     current_day_foods.append("\n".join(food))
             week_foods[week_day] = current_day_foods
 
         restaurants.append([title, "", week, week_foods, info])
     return restaurants
+
+# Onko enää tarpeellinen?
+def handle_html(html):
+    menus = html.split("<p>")
+    for set_menu in menus:
+        meals = set_menu.split("<br />")
+        food = []
+        for meal in meals:
+            food.append(format_meal_allergies(meal))
+    return "\n".join(food)
+
+def format_meal_allergies(meal):
+    parts = meal.split("(")
+    current_food = parts[0]
+    diets = [s.strip() for s in parts[1].split(")")[0].split(",")]
+    if diets:
+        current_food += " ({allergies})".format(allergies=", ".join(diets))
+    return current_food
+

campusravita.py

@@ -52,6 +52,7 @@ class Tracker(object):
 class CampusravitaHTMLParser(html.parser.HTMLParser):
     week_re = re.compile("Ruokalista - Viikko (\d+)")
     lunch_re = re.compile("Lounas|Deli-lounas")
+    week = None
 
     def __init__(self):
         html.parser.HTMLParser.__init__(self)
@@ -166,7 +167,9 @@ def get_restaurants(use_old, week):
     parser = CampusravitaHTMLParser()
     parser.feed(data)
 
-    restaurants = [[restaurant_info[0][0], "", parser.week, parser.week_foods, restaurant_info[0]]]
+    restaurants = []
+    if parser.week is not None:
+        restaurants.append([restaurant_info[0][0], "", parser.week, parser.week_foods, restaurant_info[0]])
 
     return restaurants