Support Fazer Minerva menu again

amica.py

@@ -2,8 +2,8 @@ import pnalib
 import datetime
 
 restaurant_info = [
-  [ "(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" ],
+  [ "(TaY) Amica Minerva", "https://www.fazerfoodco.fi/ravintolat/Ravintolat-kaupungeittain/tampere/minerva/", "", "middle", "https://www.fazerfoodco.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", "https://www.fazerfoodco.fi/ravintolat/Ravintolat-kaupungeittain/tampere/reaktori/", "", "middle", "https://www.fazerfoodco.fi/modules/json/json/Index?costNumber=0812&language=fi" ]
 ]
 
@@ -20,38 +20,46 @@ def get_restaurants(use_old, week):
     for count, info in enumerate(restaurant_info):
         title = info[0]
         url = info[4]
-        temp_fname = "amica_{count}.temp.js".format(count = count)
-        data = pnalib.get_json_file(url, temp_fname, use_old)
-        if not data:
-            continue
-
-        week_foods = {}
-        lunch_menus = data["MenusForDays"]
-        if not lunch_menus:
-            continue
-        for lunch_menu in lunch_menus:
-            date = lunch_menu["Date"].split("T")[0]
-            try:
-                week_day = date_strings.index(date)
-            except:
-                continue
-            current_day_foods = []
-            set_menus = lunch_menu["SetMenus"]
-            html = lunch_menu.get("Html", "")
-            if len(html):
-                    current_day_foods.append(handle_html(html))
-            else:
-                for set_menu in set_menus:
-                    meals = set_menu["Components"]
-                    food = []
-                    for meal in meals:
-                        food.append(format_meal_allergies(meal))
-                    current_day_foods.append("\n".join(food))
-            week_foods[week_day] = current_day_foods
-
+        week_foods = handle_one(use_old, date_strings, count, url)
         restaurants.append([title, "", week, week_foods, info])
     return restaurants
 
+def handle_one(use_old, date_strings, count, url):
+    temp_fname = "amica_{count}.temp.json".format(count = count)
+
+    week_foods = {}
+    data = pnalib.get_json_file(url, temp_fname, use_old)
+    if not data:
+        print("Fazer no data")
+        return week_foods
+
+    lunch_menus = data["MenusForDays"]
+    if not lunch_menus:
+        print("Fazer no MenusForDays")
+        return week_foods
+
+    for lunch_menu in lunch_menus:
+        date = lunch_menu["Date"].split("T")[0]
+        try:
+            week_day = date_strings.index(date)
+        except:
+            print("Fazer no date dates=({}), key=({})".format(date_strings, date))
+            continue
+        current_day_foods = []
+        set_menus = lunch_menu["SetMenus"]
+        html = lunch_menu.get("Html", "")
+        if len(html):
+                current_day_foods.append(handle_html(html))
+        else:
+            for set_menu in set_menus:
+                meals = set_menu["Components"]
+                food = []
+                for meal in meals:
+                    food.append(format_meal_allergies(meal))
+                current_day_foods.append("\n".join(food))
+        week_foods[week_day] = current_day_foods
+    return week_foods
+
 # Onko enää tarpeellinen?
 def handle_html(html):
     menus = html.split("<p>")