Converted all of code to python except pikante

amica.py

@@ -1,8 +1,67 @@
+import datetime
+import os
+import urllib.request
+import urllib.error
+import json
+
 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" ]
 ]
 
-def get_restaurants(use_old):
-    return []
+def get_restaurants(use_old, week):
+    today = datetime.date.today()
+    week_day = today.isocalendar()[2]
+    this_monday = today - datetime.timedelta(days=week_day-1)
+    week_date = this_monday.strftime("%Y-%m-%d")
+    restaurants = []
+    for count, info in enumerate(restaurant_info):
+        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)
+        if not use_old or not os.path.isfile(temp_fname):
+            try:
+                urllib.request.urlretrieve(url, temp_fname)
+            except urllib.error.HTTPError as e:
+                print("Failed to download {url}".format(url=url))
+        try:
+            with open(temp_fname, "r", encoding="utf-8") as fin:
+                data = json.load(fin)
+        except OSError as e:
+            continue
+
+        week_foods = {}
+        lunch_menus = data["LunchMenus"]
+        for week_day, lunch_menu in enumerate(lunch_menus):
+            current_day_foods = []
+            set_menus = lunch_menu["SetMenus"]
+            html = lunch_menu["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))
+            else:
+                for set_menu in set_menus:
+                    meals = set_menu["Meals"]
+                    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)
+                    current_day_foods.append("\n".join(food))
+            week_foods[week_day] = current_day_foods
+
+        restaurants.append([title, "", week, week_foods, info])
+    return restaurants

food.py

@@ -40,10 +40,10 @@ unordered = []
 l = time.localtime()
 this_week = datetime.datetime.now().isocalendar()[1]
 
-unordered += amica.get_restaurants(use_old)
-unordered += juvenes.get_restaurants(use_old)
-unordered += sodexo.get_restaurants(use_old)
-unordered += pikante.get_restaurants(use_old)
+unordered += amica.get_restaurants(use_old, this_week)
+unordered += juvenes.get_restaurants(use_old, this_week)
+unordered += sodexo.get_restaurants(use_old, this_week)
+unordered += pikante.get_restaurants(use_old, this_week)
 
 print(unordered)
 
@@ -103,7 +103,6 @@ file_footer = """
   </body>
 </html>
 """.format(stamp=time.strftime("%d.%m.%Y %H:%M:%S"))
-print(file_footer)
 
 def find_last_day_with_foods(restaurants):
     last_day = 0
@@ -152,7 +151,7 @@ def write_day(day, header, outfname, last_day, restaurants, prefix, resources_pr
     with open(outfname, "w", encoding="utf-8") as fout:
         import types
         def write(self, writable):
-            print("Writing {}: {}".format(type(writable), writable))
+            #print("Writing {}: {}".format(type(writable), writable))
             self.write_orig(writable)
         fout.write_orig = fout.write
         fout.write = types.MethodType(write, fout)
@@ -221,7 +220,7 @@ def write_day(day, header, outfname, last_day, restaurants, prefix, resources_pr
                         part_count += 1
 
                         # add missing () around allergies
-                        part = re.sub(" (([MLGK]|VL|Ve|Veg|Hot)(,([MLGK]|VL|Ve|Veg|Hot|))+)$", " (\\1)", part)
+                        part = re.sub(" (([MLGKA]|VL|Ve|VE|Veg|Hot)(, *([MLGKA]|VL|Ve|VE|Veg|Hot|))+)$", " (\\1)", part)
                         match = re.match("^(.*) \\(([^\\)]+)\\)$", part)
                         if match:
                             # fix allergy issues
@@ -306,8 +305,8 @@ def write_day(day, header, outfname, last_day, restaurants, prefix, resources_pr
             fout.write("eatable_foods[\"{a}\"] = [{eatable_food_number}];\n".format(a=a, eatable_food_number=",".join(str(e) for e in eatable_food_numbers[a])))
             fout.write("maybe_eatable_foods[\"{a}\"] = [{maybe_eatable_food_number}];\n".format(a=a, maybe_eatable_food_number=",".join(str(e) for e in maybe_eatable_food_numbers[a])))
         allergy_string = ",".join('"{a}"'.format(a=a) for a in allergies)
-        fout.write("var allergies = {allergies}];\n".format(allergies = allergy_string))
-        fout.write("var food_count = $foodnum;\n")
+        fout.write("var allergies = [{allergies}];\n".format(allergies = allergy_string))
+        fout.write("var food_count = {foodnum};\n".format(foodnum = foodnum))
         fout.write("window.onload = function() { set_allergies(); show_warning(); };\n")
         fout.write("</script>\n")
         fout.write("</div></div>{file_footer}".format(file_footer=file_footer.format(resources_prefix=resources_prefix)))
@@ -333,9 +332,10 @@ def write_all_days(restaurants, prefix, title, resources_prefix):
 def write_table(restaurants, prefix, title, resources_prefix):
     last_day = find_last_day_with_foods(restaurants);
     outfname = "{prefix}table.html".format(prefix=prefix)
-    with open(outfname, "w") as fout:
+    with open(outfname, "w", encoding="utf-8") as fout:
         header = "{title} vko {max_week}{max_week_daterange}".format(title=title, max_week=max_week, max_week_daterange=max_week_daterange)
-        fout.write("{file_header}<h1>{header}</h1>\n".format(file_header=file_header, header=header))
+        fout.write(file_header.format(resources_prefix=resources_prefix))
+        fout.write("<h1>{header}</h1>\n".format(header=header))
         fout.write("<div class=\"title\">\n")
 
         write_days_header(fout, -1, last_day)
@@ -345,7 +345,7 @@ def write_table(restaurants, prefix, title, resources_prefix):
             (title, open_hours, week, week_foods, info) = r
             (title2, url) = info[0:2]
             url = re.sub("&", "&nbsp;", url)
-            fout.write("<th><a href=\"{url}\">{title}</a></th>")
+            fout.write("<th><a href=\"{url}\">{title}</a></th>".format(url=url, title=title))
         fout.write("</tr>\n")
         for day in range(last_day):
             fout.write("<tr><td>{day_name}</td>\n".format(day_name=day_names[day]))

juvenes.py

@@ -24,21 +24,19 @@ restaurant_info = [
 ]
 
 
-def get_restaurants(use_old):
-    count = 0
+def get_restaurants(use_old, week):
     restaurants = []
-    for info in restaurant_info:
+    for count, info in enumerate(restaurant_info):
         kitchen = info[4]
         menutype = info[5]
         title = info[0]
         cur_title = title
         open_hours = ""
         week_foods = {}
-        week = datetime.datetime.now().isocalendar()[1]
         for weekday in range(1,7):
             url = "http://www.juvenes.fi/DesktopModules/Talents.LunchMenu/LunchMenuServices.asmx/GetMenuByWeekday?KitchenId={kitchen}&MenuTypeId={menutype}&Week={week}&Weekday={weekday}&lang='fi'&format=json".format(kitchen=kitchen, menutype=menutype, week=week, weekday=weekday)
             temp_fname = "juvenes_{count}-{weekday}.temp.js".format(count=count, weekday=weekday)
-            if not use_old and not os.path.isfile(temp_fname):
+            if not use_old or not os.path.isfile(temp_fname):
                 try:
                     urllib.request.urlretrieve(url, temp_fname)
                 except urllib.error.HTTPError as e:
@@ -47,7 +45,7 @@ def get_restaurants(use_old):
             try:
                 with open(temp_fname, "r", encoding="utf-8") as fin:
                     jsonp = fin.read()
-                    data = json.loads(jsonp[1:-2])
+                data = json.loads(jsonp[1:-2])
             except OSError as e:
                 continue
             if data and data["d"] != "null":
@@ -71,5 +69,4 @@ def get_restaurants(use_old):
                         cur_day_foods.append("\n".join(cur_food))
                 week_foods[weekday-1] = cur_day_foods
         restaurants.append([title, open_hours, week, week_foods, info])
-        count += 1
     return restaurants

pikante.py

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 pikante_url = "http://www.pikante.fi/lounaslistat-pdf";
 
 restaurant_info = [
@@ -8,5 +6,5 @@ restaurant_info = [
   [ "(TAYS) Ellipsi", "$pky_url", "all", "middle" ]
 ]
 
-def get_restaurants(use_old):
+def get_restaurants(use_old, week):
     return []

ruoka.js

@@ -114,7 +114,7 @@ function show_warning() {
   if (shouldShowWarning()) {
     var input = document.createElement("input");
     input.type="submit";
-    input.value="Älä näytä tätä enää";
+    input.value="Älä näytä tätä enää";
     input.onclick = function() {
       notice.parentNode.removeChild(notice); 
       noMoreWarning();

sodexo.py

@@ -1,8 +1,50 @@
+import datetime
+import os
+import urllib.request
+import urllib.error
+import json
+
 restaurant_info = [
   [ "(TaY) Sodexo Linna", "http://www.sodexo.fi/linna", "", "right", 92],
   #[ "(TTY) Sodexo Erkkeri", "http://www.sodexo.fi/erkkeri", "", "left", 100]
   [ "(TTY) Sodexo Hertsi", "http://www.sodexo.fi/tty-tietotalo", "", "right", 12812]
 ]
 
-def get_restaurants(use_old):
-    return []
+def get_restaurants(use_old, week):
+    restaurants = []
+    for count, info in enumerate(restaurant_info):
+        kitchen = info[4]
+        title = info[0]
+        open_hours = ""
+        week_foods = {}
+        today = datetime.date.today()
+        week_day = today.isocalendar()[2]
+        last_sunday = today - datetime.timedelta(days=week_day)
+        for weekday in range(1,7):
+            date = last_sunday + datetime.timedelta(days=weekday)
+            timestr = date.strftime("%Y/%m/%d")
+            url = "http://www.sodexo.fi/ruokalistat/output/daily_json/{kitchen}/{timestr}/fi".format(kitchen=kitchen, timestr=timestr)
+            temp_fname = "sodexo_{count}-{weekday}.temp.js".format(count=count, weekday=weekday)
+            if not use_old or not os.path.isfile(temp_fname):
+                try:
+                    urllib.request.urlretrieve(url, temp_fname)
+                except urllib.error.HTTPError as e:
+                    print("Failed to download {url}".format(url=url))
+            try:
+                with open(temp_fname, "r", encoding="utf-8") as fin:
+                    data = json.load(fin)
+            except OSError as e:
+                continue
+            current_day_foods = []
+            courses = data["courses"]
+            for course_info in courses:
+                print(course_info)
+                if course_info["category"] != "Aamupuuro":
+                    food = course_info["title_fi"]
+                    if "properties" in course_info:
+                        food += " ({allergies})".format(allergies=course_info["properties"])
+                    current_day_foods.append(food)
+            week_foods[weekday-1] = current_day_foods
+        restaurants.append([title, open_hours, week, week_foods, info])
+
+    return restaurants