amica.pl

@@ -1,101 +0,0 @@
-use vars qw(@day_names);
-use JSON;
-
-my @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" ]
-);
-
-sub utf8_to_8859 {
-  $_ = shift;
-
-  s/ä/ä/g;
-  s/ö/ö/g;
-  s/Ä/Ä/g;
-  s/Ö/Ö/g;
-  return $_;
-}
-
-sub parse_amica {
-  my ($fname, $info_ref) = @_;
-  open(FILE, $fname);
-  my $json = do { local $/; <FILE> };
-  close(FILE);
-  
-  my $title = @{$info_ref}[0];
-  my $week = `date +%V`;
-  my @cur_day_foods = ();
-  my @week_foods = ();
-
-  my $data = from_json($json);
-  my $LunchMenus = $data->{'LunchMenus'};
-  foreach my $LunchMenu (@$LunchMenus) {
-    my $SetMenus = $LunchMenu->{'SetMenus'};
-    my $Html = $LunchMenu->{'Html'};
-    if (length($Html) > 0) {
-      my @Menus = split('<p>', $Html);
-      foreach my $SetMenu (@Menus) {
-        my @Meals = split('<br />', $SetMenu);
-	foreach my $Meal (@Meals) {
-	  my @parts = split('\\(', $Meal);
-	  $cur_food .= "\n" if $cur_food ne "";
-	  $cur_food .= @parts[0];
-	  my @Diets = split(",\s*", substr(@parts[1], 0, index(@parts[1], ')')));
-	  $cur_food .= ' (' . join(', ', @Diets) . ')' if @Diets;
-	}
-        push @cur_day_foods, utf8_to_8859($cur_food) if ($cur_food ne "");
-        $cur_food = "";
-      }
-    } else {
-      foreach my $SetMenu (@$SetMenus) {
-        my $Meals = $SetMenu->{'Meals'};
-        foreach my $Meal (@$Meals) {
-          $cur_food .= "\n" if $cur_food ne "";
-          $cur_food .= $Meal->{'Name'};
-          my $Diets = $Meal->{'Diets'};
-          $cur_food .= ' (' . join(', ', @$Diets) . ')';
-        }
-        push @cur_day_foods, utf8_to_8859($cur_food) if ($cur_food ne "");
-        $cur_food = "";
-      }
-    }
-
-    push @week_foods, [@cur_day_foods];
-    @cur_day_foods = ();
-  }
-
-  return [ $title, "", $week, [ @week_foods ], $info_ref ];
-}
-
-sub get_amica_restaurant {
-  my $use_old = shift;
-  my $count = 0;
-  my @restaurants = ();
-  my $weekDay = `date +%w`;
-  chomp($weekDay);
-  my $first_day = $weekDay == 1 
-    ? `date --date="today" +%Y-%m-%d`
-    : `date --date="last monday" +%Y-%m-%d`;
-  chomp($first_day);
-  my $last_day = $weekDay == 0
-    ? `date --date="today" +%Y-%m-%d`
-    : `date --date="next sunday" +%Y-%m-%d`;
-  chomp($last_day);
-  foreach my $i (@restaurant_info) {
-    my @info = @{$i};
-    my $temp_fname = "amica$count.temp.html";
-    my $url = "${info[4]}&weekDate=$first_day";
-    if (!-f $temp_fname || !$use_old) {
-      system("wget -q --timeout=10 -O $temp_fname.tmp '$url' && mv $temp_fname.tmp $temp_fname") if ($url ne "");
-    }
-    if (-f $temp_fname) {
-      $info[4] = $url;
-      push @restaurants, parse_amica($temp_fname, \@info);
-    }
-    $count++;
-  }
-  return @restaurants;
-}
-
-1;

amica.py

@@ -0,0 +1,81 @@
+import pnalib
+import datetime
+
+restaurant_info = [
+  [ "(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" ]
+]
+
+def get_restaurants(use_old, week):
+    today = datetime.date.today()
+    week_day = today.isocalendar()[2]
+    this_monday = today - datetime.timedelta(days=week_day-1)
+    date_strings = []
+    for i in range(7):
+        date = this_monday + datetime.timedelta(days=i)
+        date_strings.append(date.strftime("%Y-%m-%d"))
+
+    restaurants = []
+    for count, info in enumerate(restaurant_info):
+        title = info[0]
+        url = info[4]
+        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))
+                if food:
+                    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>")
+    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

@@ -0,0 +1,175 @@
+import pnalib
+import html.parser
+import re
+
+url = "http://www.campusravita.fi/ruokalista";
+
+restaurant_info = [
+  [ "(TAMK) Campus Food", url, "", "middle" ],
+]
+
+class Tracker(object):
+
+    def __init__(self, tag, attr_match=None, on_started=None, on_ended=None, on_data=None):
+        self.tag = tag
+        self.attr_match = attr_match
+        self.on_started = on_started
+        self.on_ended = on_ended
+        self.on_data = on_data
+        self.nesting = 0
+
+    def handle_starttag(self, tag, attrs):
+        if self.tag == tag:
+            if self.nesting:
+                self.nesting += 1
+            else:
+                attrs_matched = False
+                if self.attr_match is None:
+                    attrs_matched = True
+                else:
+                    for attr in attrs:
+                        if attr[0] == self.attr_match[0] and self.attr_match[1].match(attr[1]):
+                            attrs_matched = True
+                if attrs_matched:
+                    self.nesting = 1
+                    if self.on_started:
+                        self.on_started()
+
+
+    def handle_endtag(self, tag):
+        if self.nesting and self.tag == tag:
+            self.nesting -= 1
+            if self.nesting == 0 and self.on_ended:
+                self.on_ended()
+
+    def handle_data(self, data):
+        if self.nesting and self.on_data:
+            self.on_data(data)
+
+    def __bool__(self):
+        return self.nesting > 0
+
+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)
+        self._trackers = []
+        self.in_h3 = self._register_tracker("h3", on_data=self.handle_h3)
+        # Everything in inside menu
+        self.in_menu = self._register_tracker("section", ("id", "block-system-main"),
+                on_started=self.handle_menu_start, on_ended=self.handle_menu_end)
+        # Date comes after menu
+        self.in_date_display = self._register_tracker("span", ("class", "date-display-single"),
+                on_data=self.handle_date_display)
+        # Lunch element contains one meal
+        self.in_lunch = self._register_tracker("div", ("about", r"/fi/field-collection/field-ruoka-annos/\d+"),
+                on_started=self.handle_lunch_start, on_ended=self.handle_lunch_end)
+        # Next element contains food name 
+        self.in_lunch_food = self._register_tracker("div", ("class", ".*field-name-field-nimi.*"),
+                on_data=self.handle_lunch_food)
+        # Next element contains food allergies
+        self.in_allergy = self._register_tracker("div", ("class", ".*field-name-field-ruokavaliot.*"),
+                on_started=self.handle_allergy_start, on_ended=self.handle_allergy_end)
+        # Next element contains allergy short name
+        self.in_allergy_short = self._register_tracker("div", ("class", ".*field-name-title field-type-ds.*"),
+                on_data=self.handle_allergy)
+        # Next element contains lunch price
+        self.in_lunch_price = self._register_tracker("div", ("class", ".*field-name-field-annoksen-hinta.*"))
+        self.lunch_type_match = False
+        self.lunch = None
+
+        self.week_foods = {}
+
+    def _register_tracker(self, tag, attr_match=None, **kwargs):
+        tracker = Tracker(tag, (attr_match[0], re.compile(attr_match[1])) if attr_match else None, **kwargs)
+        self._trackers.append(tracker)
+        return tracker
+
+    def handle_date_display(self, data):
+        index = -1
+        if "Maanantai" in data:
+            index = 0
+        elif "Tiistai" in data:
+            index = 1
+        elif "Keskiviikko" in data:
+            index = 2
+        elif "Torstai" in data:
+            index = 3
+        elif "Perjantai" in data:
+            index = 4
+        elif "Lauantai" in data:
+            index = 5
+        elif "Sunnuntai" in data:
+            index = 6
+        if index >= 0:
+            self.current_day = []
+            self.week_foods[index] = self.current_day
+
+    def handle_h3(self, data):
+        if self.in_menu:
+            lunch_match = self.lunch_re.match(data)
+            self.lunch_type_match = bool(lunch_match)
+
+    def handle_menu_start(self):
+        pass
+
+    def handle_menu_end(self):
+        pass
+
+    def handle_allergy(self, data):
+        data = data.strip()
+        if self.in_allergy and self.in_allergy_short and self.lunch and data:
+            self.lunch["allergies"].append(data) 
+
+    def handle_allergy_start(self):
+        pass
+
+    def handle_allergy_end(self):
+        pass
+
+    def handle_lunch_food(self, data):
+        data = data.strip()
+        if self.lunch and data:
+            self.lunch["food"].append(data)
+
+    def handle_lunch_start(self):
+        if self.lunch_type_match:
+            self.lunch = {"food": [], "allergies": []}
+
+    def handle_lunch_end(self):
+        if self.lunch:
+            #print(repr(self.lunch).encode("cp1252", "ignore"))
+            menu = "{menu} ({allergies})".format(menu=self.lunch["food"][0], allergies=", ".join(self.lunch["allergies"]))
+            self.current_day.append(menu)
+            self.lunch = None
+
+    def handle_starttag(self, tag, attrs):
+        for tracker in self._trackers:
+            tracker.handle_starttag(tag, attrs)
+
+    def handle_endtag(self, tag):
+        for tracker in self._trackers:
+            tracker.handle_endtag(tag)
+
+    def handle_data(self, data):
+        for tracker in self._trackers:
+            tracker.handle_data(data)
+        week_match = self.week_re.match(data)
+        if week_match:
+            self.week = int(week_match.group(1))
+
+def get_restaurants(use_old, week):
+
+    data = pnalib.get_file(url, "campusravita.html", use_old)
+    parser = CampusravitaHTMLParser()
+    parser.feed(data)
+
+    restaurants = []
+    if parser.week is not None:
+        restaurants.append([restaurant_info[0][0], "", parser.week, parser.week_foods, restaurant_info[0]])
+
+    return restaurants
+

cgi-bin/food.cgi

@@ -13,10 +13,10 @@ print '<?xml version="1.0" encoding="iso-8859-1"?>
 <body>';
 
 my $min_refresh_secs = 60*5;
-my @st = stat("/var/www/rna/1.html");
+my @st = stat("/var/www/pna/1.html");
 if ($st[9] > time-$min_refresh_secs) {
   print "<p>Ruokalistaa on jo päivitetty alle 5min sitten.</p>";
-} elsif (system("cd /var/www/rna && ./food.pl") == 0) {
+} elsif (system("cd /var/www/pna && ./food.py") == 0) {
   print "<p>Ruokalista päivitetty.</p>";
 } else {
   print "<p>Virhe päivittäessä ruokalistaa.</p>";

food.pl

@@ -1,470 +0,0 @@
-#!/usr/bin/env perl
-
-# Ruokalistaparseri v1.5.4
-# Copyright (c) 2007-2010 Timo Sirainen
-#               2011-2013 Toni Fadjukoff
-# This is Public Domain
-
-use strict;
-use POSIX qw(strftime mktime);
-use HTML::TokeParser;
-use HTML::Entities;
-
-use vars qw(@day_names);
-@day_names = ( "Maanantai", "Tiistai", "Keskiviikko", "Torstai", 
-	       "Perjantai", "Lauantai", "Sunnuntai" );
-
-require 'amica.pl';
-require 'sodexo.pl';
-require 'juvenes.pl';
-require 'pky.pl';
-
-my @allergies = ( "M", "L", "VL", "G", "K", "Ve" );
-my %allergy_descriptions = (
-  "M" => "Maidoton",
-  "L" => "Laktoositon",
-  "VL" => "Vähälaktoosinen",
-  "G" => "Gluteiiniton",
-  "K" => "Kasvis",
-  "Ve" => "Vegaani"
-);
-
-my $global_prefix = "";
-my $use_old = 0; # 1 is good for testing, 0 for production system!
-my @unordered;
-
-my @l = localtime;
-my $this_week = strftime("%V", @l);
-
-push @unordered, get_amica_restaurant($use_old);
-push @unordered, get_juvenes_restaurants($use_old);
-push @unordered, get_sodexo_restaurants($use_old);
-push @unordered, get_pky_restaurants($use_old, $l[6] == 0 || $l[6] == 6);
-
-my $max_week = 0;
-foreach my $r (@unordered) {
-  my $week = @{$r}[2];
-  $max_week = $week if ($week > $max_week || $week == 1);
-}
-
-if ($l[6] != 0 && $this_week != $max_week) {
-  # it's not sunday, don't force next week's menu yet
-  $max_week = $this_week;
-}
-
-my $stamp = time() - 3600*24*7;
-my $max_week_daterange = "";
-if ($max_week >= 1 && $max_week <= 52) {
-  # figure out the date range
-  for (;;) {
-    my $stamp_week = strftime("%V", localtime($stamp));
-    last if ($stamp_week == $max_week);
-    $stamp += 3600*24;
-  }
-  my @l1 = localtime($stamp);
-  my @l2 = localtime($stamp + 3600*24*6);
-  if ($l1[4] == $l2[4]) {
-    # same month
-    $max_week_daterange = $l1[3]."-".$l2[3].".".($l1[4]+1).".";
-  } else {
-    # different months
-    $max_week_daterange = $l1[3].".".($l1[4]+1)."-".$l2[3].".".($l2[4]+1).".";
-  }
-  $max_week_daterange = " ($max_week_daterange)"
-}
-
-my $file_header = '<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fi" lang="fi">
-<head>
-  <title>Ruokalistat</title>
-  <link rel="stylesheet" type="text/css" href="'.$global_prefix.'/ruoka.css" />
-</head>
-<body>
-
-<div id="notice" style="border: 1px solid black; border-radius: 5px; padding: 5px;">
-PNA.fi on kolmannen osapuolen tarjoama palvelu. En voi taata ruokalistojen oikeellisuutta.  Virallisen ruokalistan saat näkyviin siirtymällä ravintolan omille sivuille painamalla sen nimestä. Jos huomaat ruokalistassa virheen, nopeiten virhe saadaan pois näkyvistä kun lähetät minulle siitä sähköpostia: <a href="mailto:lamperi+pna@gmail.com">lamperi+pna@gmail.com</a>
-</div>
-
-<form method="get" action="/cgi-bin/food.cgi">
-';
-my $file_footer = "<div class=\"footer\">Päivitetty ".
-    strftime("%d.%m.%Y %H:%M:%S", localtime).
-    " <input type=\"submit\" value=\"Päivitä nyt\" />".
-    " / Palaute <a href=\"mailto:lamperi+pna\@gmail.com\">lamperi+pna\@gmail.com</a>".
-    " / <a href=\"$global_prefix/code.html\">Koodit täältä</a>".
-    " / <a href=\"$global_prefix/pna.html\">Mikä on PNA?</a>".
-    "</div>\n</form>\n</body></html>\n";
-
-sub find_last_day_with_foods {
-  my $restaurants_ref = shift;
-
-  my $last_day = 0;
-  foreach my $r (@${restaurants_ref}) {
-    my ($title, $open_hours, $week, $week_foods_ref) = @{$r};
-    my @week_foods = @{$week_foods_ref};
-    for (my $day = 0; $day < 7; $day++) {
-      if (defined($week_foods[$day])) {
-	$last_day = $day if ($day > $last_day);
-      }
-    }
-  }
-  return $last_day;
-}
-
-sub write_days_header {
-  my ($fout, $day, $last_day) = @_;
-  
-  print $fout "  <span class=\"days\">";
-  for (my $i = 0; $i <= $last_day; $i++) {
-    if ($i == $day) {
-      print $fout $day_names[$i]." ";
-    } else {
-      print $fout "<a href=\"".($i+1).".html\">".$day_names[$i]."</a> ";
-    }
-  }
-  if ($day < 0) {
-    print $fout "Taulukko";
-  } else {
-    print $fout "<a href=\"table.html\">Taulukko</a>";
-  }
-  print $fout "</span>\n";
-}
-
-sub write_prefix_header {
-  my ($fout, $prefix, $day) = @_;
-  
-  $day = "table" if ($day == 0);
-  print $fout "<span class=\"location\">";
-  if ($prefix eq "") {
-    print $fout "Kaikki ";
-  } else {
-    print $fout "<a href=\"$global_prefix/$day.html\">Kaikki</a> ";
-  }
-  if ($prefix eq "tay/") {
-    print $fout "TaY ";
-  } else {
-    print $fout "<a href=\"$global_prefix/tay/$day.html\">TaY</a> ";
-  }
-  if ($prefix eq "tays/") {
-    print $fout "TAYS ";
-  } else {
-    print $fout "<a href=\"$global_prefix/tays/$day.html\">TAYS</a> ";
-  }
-  if ($prefix eq "tty/") {
-    print $fout "TTY ";
-  } else {
-    print $fout "<a href=\"$global_prefix/tty/$day.html\">TTY</a> ";
-  }
-  print $fout "</span>\n";
-}
-
-sub write_day {
-  my ($day, $header, $outfname, $last_day, $restaurants_ref, $prefix) = @_;
-  my @restaurants = @{$restaurants_ref};
-
-  open(my $fout, ">$outfname") || die ("Can't create file $outfname");
-  print $fout "$file_header<h1>$header</h1>\n";
-  # print weekday links
-  print $fout "<div class=\"title\">\n";
-  write_days_header($fout, $day, $last_day);
-  print $fout "  <span class=\"allergy\">Näytä: ";
-  foreach my $a (@allergies) {
-    print $fout "<input type=\"checkbox\" name=\"allergy_$a\" id=\"allergy_$a\" onclick=\"highlight()\" />";
-    print $fout "<span title=\"".$allergy_descriptions{$a}."\">$a</span>";
-  }
-  print $fout "</span>\n";
-  write_prefix_header($fout, $prefix, $day+1);
-  print $fout "</div>\n";
-
-  # print foods
-  my $foodnum = 0;
-  my %eatable_food_numbers;
-  my %maybe_eatable_food_numbers;
-  my $class = "left";
-  print $fout "<div class=\"foods\"><div class=\"$class\">\n";
-  foreach my $r (@restaurants) {
-    my ($title, $open_hours, $week, $week_foods_ref, $info_ref) = @{$r};
-    my ($title2, $url, $lazy_allergies, $info_class) = @{$info_ref};
-    my @week_foods = @{$week_foods_ref};
-    if (defined($week_foods[$day]) || $day < 5) {
-
-      if ($info_class ne $class) {
-	$class = $info_class;
-	print $fout "</div><div class=\"$class\">\n";
-      }
-      $url =~ s/&/&amp;/g;
-      print $fout "<h2><a href=\"$url\">$title</a></h2>\n";
-      
-      if (!defined($week_foods[$day])) {
-	print $fout "<p class=\"missing\">Ruokalistaa ei saatavilla.</p>";
-	next;
-      }
-      if ($week ne "" && $week != $max_week) {
-	if ($week > $max_week || ($week == 1 && $max_week == 52)) {
-	  # early..
-	  print $fout "<p class=\"nextweek\">Viikon $week ruokalista:</p>";
-	} else {
-	  print $fout "<p class=\"missing\">Saatavilla vain viikon $week ruokalista.</p>";
-	  next;
-	}
-      }
-      if (scalar(@{$week_foods[$day]}) == 0) {
-	print $fout "<p class=\"missing\">Ei ruokatietoja päivälle.</p>";
-	next;
-      }
-      
-      print $fout "<ul class=\"food\">\n";
-      foreach my $food (@{$week_foods[$day]}) {
-	my $output = "";
-	my %total_allergies;
-	my %maybe_allergies;
-	my $part_count = 0;
-	foreach my $part (split("\n", $food)) {
-	  next if ($part =~ /^(Peruna|Riisi) /); # who cares?
-	  # fries: well, maybe we do care, but we don't care about allergy stuff
-	  # and keep it in the same line as the previous food so as not to
-	  # waste visible space
-	  my $fries = ($part =~ /^(Tikkuperunat|Ranskalaiset perunat)/);
-	  $part_count++;
-	  
-	  # add missing () around allergies
-	  $part =~ s/ (([MLGK]|VL|Ve|Veg|Hot)(,([MLGK]|VL|Ve|Veg|Hot|))+)$/ ($1)/;
-	  
-	  if ($part =~ /^(.*) \(([^\)]+)\)$/) {
-	    # fix allergy issues
-	    my ($food, $allergy) = ($1, $2);
-	    # standardization
-	    $allergy =~ s/Kasvis/K/g;
-	    $allergy =~ s/([MLGK]|VL)([MLGK]|VL)/$1,$2/g;
-	    # spaces to commas
-	    $allergy =~ s/saatavana[: ]+(.*)$/eriks: $1/;
-	    $allergy =~ s/ +/,/g;
-	    # remove double commas
-	    $allergy =~ s/,+/,/g;
-	    # eriks: standardization
-	    $allergy =~ s/,?eriks:,?/, eriks: /g;
-	    # remove extra commas/spaces from beginning/end
-	    $allergy =~ s/^[, ]+//;
-	    $allergy =~ s/[, ]+$//;
-	    $part = "$food ($allergy)";
-	  }
-	  
-	  $output .= "<br />\n" if ($output ne "" && !$fries);
-	  if ($part =~ /Saatavana myös: (.*)/) {
-	    # standardize allergy stuff
-	    my $alt = $1;
-	    $alt =~ s/^\((.*)\)$/$1/;
-	    $alt =~ s/[, ]+/,/g;
-	    $alt =~ s/^,+//;
-	    $alt =~ s/,+$//;
-	    $part =~ s/\)[- ]*Saatavana myös:.*/, eriks: $alt)/;
-	    $part =~ s/[- ]*Saatavana myös:.*/ (eriks: $alt)/;
-	  }
-	  if ($part =~ /^(.*)(\([^\)]+\))$/) {
-	    my ($text, $allergy) = ($1, $2);
-	    if ($fries) {
-	      $output .= ", $text";
-	    } else {
-	      $output .= "$text <span class=\"allergy\">$allergy</span>";
-	    }
-	    $allergy =~ s/^\((.*)\)$/$1/;
-	    $allergy =~ s/ *eriks: //;
-	    my %this_allergies;
-	    foreach my $a (split(/[, ]/, $allergy)) {
-	      foreach my $al (@allergies) {
-		if ($a eq $al) {
-		  $this_allergies{$a} = 1;
-		  last;
-		}
-	      }
-	    }
-	    # is M=L always correct? not at least in all restaurants..
-	    #$this_allergies{"L"} = 1 if ($this_allergies{"M"});
-	    $this_allergies{"VL"} = 1 if ($this_allergies{"L"});
-	    foreach my $a (keys %this_allergies) {
-	      $total_allergies{$a}++;
-	      $maybe_allergies{$a}++;
-	    }
-	    if ($lazy_allergies =~ /M/) {
-	      # L might mean M
-	      if ($this_allergies{"L"} && !$this_allergies{"M"}) {
-		$maybe_allergies{"M"}++;
-	      }
-	    }
-	  } else {
-	    if ($lazy_allergies eq "all") {
-	      # no allergy info, make everything maybe
-	      foreach my $a (@allergies) {
-		$maybe_allergies{$a}++;
-	      }
-	    }
-	    $output .= $part;
-	  }
-	}
-	my $allergy_output = "";
-	foreach my $a (@allergies) {
-	  if ($total_allergies{$a} == $part_count) {
-	    if (!defined($eatable_food_numbers{$a})) {
-	      $eatable_food_numbers{$a} = "";
-	    } else {
-	      $eatable_food_numbers{$a} .= ",";
-	    }
-	    $eatable_food_numbers{$a} .= $foodnum;
-	  } elsif ($maybe_allergies{$a} == $part_count) {
-	    if (!defined($maybe_eatable_food_numbers{$a})) {
-	      $maybe_eatable_food_numbers{$a} = "";
-	    } else {
-	      $maybe_eatable_food_numbers{$a} .= ",";
-	    }
-	    $maybe_eatable_food_numbers{$a} .= $foodnum;
-	  }
-	}
-	print $fout "  <li id=\"f$foodnum\">$output</li>\n";
-	$foodnum++;
-      }
-      print $fout "</ul>\n";
-    }
-  }
-  # write allergy scripts
-  print $fout '<script type="text/javascript" src="'.$global_prefix.'/ruoka.js"></script>';
-  print $fout '<script type="text/javascript">';
-  print $fout "var eatable_foods = [];";
-  print $fout "var maybe_eatable_foods = [];";
-  foreach my $a (@allergies) {
-    print $fout "eatable_foods[\"$a\"] = [".$eatable_food_numbers{$a}."];\n";
-    print $fout "maybe_eatable_foods[\"$a\"] = [".$maybe_eatable_food_numbers{$a}."];\n";
-  }
-  my @allergy_strings = map('"'.$_.'"', @allergies);
-  print $fout "var allergies = [".join(",", @allergy_strings)."];\n";
-  print $fout "var food_count = $foodnum\n";
-  print $fout "window.onload = function() { set_allergies(); show_warning(); };\n";
-  print $fout "</script>\n";
-
-  print $fout "</div></div>$file_footer";
-  close $fout;
-}
-
-sub write_all_days {
-  my ($restaurants_ref, $prefix, $title) = @_;
-  my $last_day = find_last_day_with_foods($restaurants_ref);
-  
-  for (my $day = 0; $day < 7; $day++) {
-    my $outfname = $prefix.($day+1).".html";
-    if ($day > $last_day) {
-      unlink($outfname);
-      next;
-    }
-    my $header = $day_names[$day]." - $title vko $max_week$max_week_daterange";
-    write_day($day, $header, $outfname, $last_day, $restaurants_ref, $prefix);
-  }
-}
-
-sub write_table {
-  my ($restaurants_ref, $prefix, $title) = @_;
-  my @restaurants = @{$restaurants_ref};
-  my $last_day = find_last_day_with_foods($restaurants_ref);
-
-  my $outfname = $prefix."table.html";
-  open(my $fout, ">$outfname") || die ("Can't create file $outfname");
-  my $header = "$title vko $max_week$max_week_daterange";
-  print $fout "$file_header<h1>$header</h1>\n";
-  print $fout "<div class=\"title\">\n";
-  write_days_header($fout, -1, $last_day);
-  write_prefix_header($fout, $prefix, 0);
-  print $fout "</div><table border=\"1\"><tr><th>Päivä</th>";
-  foreach my $r (@restaurants) {
-    my ($title, $open_hours, $week, $week_foods_ref, $info_ref) = @{$r};
-    my ($title2, $url) = @{$info_ref};
-    $url =~ s/&/&nbsp;/g;
-    print $fout "<th><a href=\"$url\">$title</a></th>";
-  }
-  print $fout "</tr>\n";
-  for (my $day = 0; $day <= $last_day; $day++) {
-    print $fout "<tr><td>".$day_names[$day]."</td>\n";
-    foreach my $r (@restaurants) {
-      my ($title, $open_hours, $week, $week_foods_ref, $info_ref) = @{$r};
-      my @week_foods = @{$week_foods_ref};
-      if (defined($week_foods[$day]) && ($week eq "" || $week == $max_week)) {
-	print $fout "<td><ul>\n";
-	foreach my $food (@{$week_foods[$day]}) {
-	  print $fout "<li>$food</li>";
-	}
-	print $fout "</ul></td>\n";
-      } else {
-	print $fout "<td></td>\n";
-      }
-    }
-    print $fout "</tr>\n";
-  }
-  print $fout "</table>$file_footer";
-  close $fout;
-}
-
-sub get_restaurants_sorted {
-  my @restaurants = @_;
-  my @out;
-  foreach my $r (@restaurants) {
-    push @out, $r if (@{@{$r}[4]}[3] eq "left");
-  }
-  foreach my $r (@restaurants) {
-    push @out, $r if (@{@{$r}[4]}[3] eq "right");
-  }
-  foreach my $r (@restaurants) {
-    my @e = @{@{$r}[4]};
-    push @out, $r if ($e[3] eq "middle" && $e[1] !~ /TAMK/);
-  }
-  foreach my $r (@restaurants) {
-    my @e = @{@{$r}[4]};
-    push @out, $r if ($e[3] eq "middle" && $e[1] =~ /TAMK/);
-  }
-  return @out;
-}
-
-sub get_restaurants_with_prefix {
-  my $prefix = shift;
-  my @out;
-  foreach my $r (@_) {
-    my $name = @{$r}[0];
-    if ($name =~ /^\($prefix\)/) {
-      push @out, $r;
-    }
-  }
-  return get_restaurants_sorted(@out);
-}
-
-my $tty_title = "TTY:n ruokalistat";
-my @tty = get_restaurants_with_prefix("TTY", @unordered);
-write_all_days(\@tty, "tty/", $tty_title);
-write_table(\@tty, "tty/", $tty_title);
-
-my $tay_title = "Tampereen yliopiston ruokalistat";
-my @tay = get_restaurants_with_prefix("TaY", @unordered);
-write_all_days(\@tay, "tay/", $tay_title);
-write_table(\@tay, "tay/", $tay_title);
-
-my $tays_title = "TAYS:n ruokalistat";
-my @tays = get_restaurants_with_prefix("TAYS", @unordered);
-write_all_days(\@tays, "tays/", $tays_title);
-write_table(\@tays, "tays/", $tays_title);
-
-foreach my $r (@unordered) {
-  if (@{$r}[0] =~ /^\(TaY\)/) {
-    @{@{$r}[4]}[3] = "left";
-  }
-  if (@{$r}[0] =~ /^\(TTY\)/) {
-    @{@{$r}[4]}[3] = "right";
-  }
-  if (@{$r}[0] =~ /^\(TAYS\)/) {
-    @{@{$r}[4]}[3] = "middle";
-  }
-}
-
-my $all_title = "Tampereen yliopistojen ruokalistat";
-my @all_restaurants = get_restaurants_sorted(@unordered);
-# move fusion kitchen last
-my @fusion = splice(@all_restaurants, 1, 1);
-splice(@all_restaurants, 4, 0, @fusion);
-
-write_all_days(\@all_restaurants, "", $all_title);
-write_table(\@all_restaurants, "", $all_title);

food.py

@@ -0,0 +1,418 @@
+#!/usr/bin/env python3
+
+# Ruokalistaparseri
+# Copyright (c) 2016 Toni Fadjukoff
+
+# Based on food.pl by
+# Copyright (c) 2007-2010 Timo Sirainen
+#               2011-2016 Toni Fadjukoff
+# This is Public Domain
+
+import sys
+
+day_names = [ "Maanantai", "Tiistai", "Keskiviikko", "Torstai", 
+	       "Perjantai", "Lauantai", "Sunnuntai" ]
+
+import amica
+import sodexo
+import juvenes
+import campusravita
+
+allergies = [ "M", "L", "VL", "G", "K", "Ve" ]
+allergy_descriptions = {
+        "M": "Maidoton",
+        "L": "Laktoositon","VL": "Vähälaktoosinen",
+        "G": "Gluteiiniton",
+        "K": "Kasvis",
+        "Ve": "Vegaani"
+        }
+
+import os
+import time
+import datetime
+import re
+
+global_prefix = "";
+use_old = False; # 1 is good for testing, 0 for production system!
+unordered = []
+
+l = time.localtime()
+this_week = datetime.datetime.now().isocalendar()[1]
+
+updateException = None
+for restaurant_module in [sodexo, amica, juvenes, campusravita]:
+    try:
+        unordered += restaurant_module.get_restaurants(use_old, this_week)
+    except Exception as e:
+        updateException = e
+
+max_week = 0;
+for r in unordered:
+  week = r[2]
+  max_week = week if week > max_week or week == 1 else max_week
+
+if l[6] != 0 and this_week != max_week:
+  # it's not sunday, don't force next week's menu yet
+  max_week = this_week
+
+stamp = time.time() - 3600*24*7
+max_week_daterange = ""
+if max_week >= 1 and max_week <= 52:
+  # figure out the date range
+  while True:
+    stamp_week = int(time.strftime("%W", time.localtime(stamp)))
+    if stamp_week == max_week:
+            break
+    stamp += 3600*24
+  l1 = time.localtime(stamp)
+  l2 = time.localtime(stamp + 3600*24*6)
+  if l1[1] == l2[1]:
+    # same month
+    max_week_daterange = "{monday}-{sunday}.{month}.".format(monday=l1[2], sunday=l2[2], month=l1[1])
+  else:
+    # different months
+    max_week_daterange = "{monday}.{month}.-{sunday}.{next_month}.".format(monday=l1[2], month=l1[1],
+            sunday=l2[2], next_month=l2[1])
+  max_week_daterange = " (" + str(max_week_daterange) + ")"
+
+file_header = '''<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fi" lang="fi">
+<head>
+  <title>Ruokalistat</title>
+  <meta charset="UTF-8"/>
+  <link rel="stylesheet" type="text/css" href="{resources_prefix}ruoka.css" />
+</head>
+<body>
+
+<div id="notice" style="border: 1px solid black; border-radius: 5px; padding: 5px;">
+PNA.fi on kolmannen osapuolen tarjoama palvelu. En voi taata ruokalistojen oikeellisuutta.  Virallisen ruokalistan saat näkyviin siirtymällä ravintolan omille sivuille painamalla sen nimestä. Jos huomaat ruokalistassa virheen, nopeiten virhe saadaan pois näkyvistä kun lähetät minulle siitä sähköpostia: <a href="mailto:lamperi+pna@gmail.com">lamperi+pna@gmail.com</a>
+</div>
+
+<form method="get" action="/cgi-bin/food.cgi">
+'''
+
+file_footer = """
+      <div class="footer">Päivitetty {stamp}
+        <input type="submit\" value=\"Päivitä nyt\" />
+          / Palaute <a href=\"mailto:lamperi+pna@gmail.com\">lamperi+pna@gmail.com</a>
+          / <a href="{{resources_prefix}}code.html\">Koodit täältä</a>
+         / <a href="{{resources_prefix}}pna.html\">Mikä on PNA?</a>
+      </div>
+    </form>
+  </body>
+</html>
+""".format(stamp=time.strftime("%d.%m.%Y %H:%M:%S"))
+
+def find_last_day_with_foods(restaurants):
+    last_day = 0
+    for r in restaurants:
+        for day in range(7):
+            if day in r[3]:
+                last_day = day if day > last_day else last_day
+    return last_day
+
+def write_days_header(fout, day, last_day):
+    fout.write( "  <span class=\"days\">")
+    for i in range(last_day):
+        if i == day:
+            fout.write("{0} ".format(day_names[i]))
+        else:
+            fout.write("<a href=\"{0}.html\">{1}</a> ".format(i+1, day_names[i]))
+  
+    if day < 0:
+        fout.write("Taulukko")
+    else:
+        fout.write("<a href=\"table.html\">Taulukko</a>")
+    fout.write("</span>\n")
+
+def write_prefix_header(fout, prefix, day, resources_prefix):
+    day = "table" if day == 0 else day
+    fout.write("<span class=\"location\">")
+    if prefix == "":
+        fout.write("Kaikki ")
+    else:
+        fout.write("<a href=\"{resources_prefix}{day}.html\">Kaikki</a> ".format(resources_prefix=resources_prefix, day=day))
+    if prefix == "tay/":
+        fout.write("TaY ")
+    else:
+        fout.write("<a href=\"{resources_prefix}tay/{day}.html\">TaY</a> ".format(resources_prefix=resources_prefix, day=day))
+    if prefix == "tays/":
+        fout.write("TAYS ")
+    else:
+        fout.write("<a href=\"{resources_prefix}tays/{day}.html\">TAYS</a> ".format(resources_prefix=resources_prefix, day=day))
+    if prefix == "tty/":
+        fout.write("TTY ")
+    else:
+        fout.write("<a href=\"{resources_prefix}tty/{day}.html\">TTY</a> ".format(resources_prefix=resources_prefix, day=day))
+    fout.write("</span>\n")
+
+def write_day(day, header, outfname, last_day, restaurants, prefix, resources_prefix):
+    with open(outfname, "w", encoding="utf-8") as fout:
+
+        fout.write(file_header.format(resources_prefix=resources_prefix))
+        fout.write("<h1>{header}</h1>\n".format(header=header))
+        # print weekday links
+        fout.write("<div class=\"title\">\n")
+        write_days_header(fout, day, last_day)
+        fout.write(" <span class=\"allergy\">Näytä: ")
+        for a in allergies:
+            fout.write("<input type=\"checkbox\" name=\"allergy_{a}\" id=\"allergy_{a}\" onclick=\"highlight()\" />".format(a=a))
+            fout.write("<span title=\"{allergy_description}\">{a}</span>".format(allergy_description=allergy_descriptions[a], a=a))
+        fout.write("</span>\n")
+        write_prefix_header(fout, prefix, day+1, resources_prefix);
+        fout.write("</div>\n")
+
+        # print foods
+        foodnum = 0
+        eatable_food_numbers = {}
+        maybe_eatable_food_numbers = {}
+        for a in allergies:
+            eatable_food_numbers[a] = []
+            maybe_eatable_food_numbers[a] = []
+        css_class = "left"
+        fout.write("<div class=\"foods\"><div class=\"{css_class}\">\n".format(css_class=css_class))
+        for r in restaurants:
+            title, open_hours, week, week_foods, info = r[:5]
+            exception = r[5].replace("\n", "<br>") if len(r) > 5 and r[5] else "Ruokalistaa ei saatavilla."
+            title2, url, lazy_allergies, info_class = info[0:4]
+            if day in week_foods or day < 5:
+                if info_class != css_class:
+                    css_class = info_class
+                    fout.write("</div><div class=\"{css_class}\">\n".format(css_class=css_class))
+                url = url.replace("&", "&amp;")
+                fout.write("<h2><a href=\"{url}\">{title}</a></h2>\n".format(url=url, title=title))
+                if not day in week_foods:
+                    fout.write("<p class=\"missing\">{exception}</p>".format(exception=exception))
+                    continue
+                if week != "" and week != max_week:
+                    if week > max_week or (week == 1 and max_week == 52):
+                        # early..
+                        fout.write("<p class=\"nextweek\">Viikon {week} ruokalista:</p>".format(week=week))
+                    else:
+                        fout.write("<p class=\"missing\">Saatavilla vain viikon {week} ruokalista.</p>".format(week=week))
+                        continue
+                if len(week_foods[day]) == 0:
+                    fout.write("<p class=\"missing\">Ei ruokatietoja päivälle.</p>")
+                    continue
+                fout.write("<ul class=\"food\">\n")
+                for food in week_foods[day]:
+                    output = []
+                    total_allergies = {}
+                    maybe_allergies = {}
+                    for a in allergies:
+                        total_allergies[a] = 0
+                        maybe_allergies[a] = 0
+                    part_count = 0
+                    for part in food.split("\n"):
+                        # who cares?
+                        if re.match("Peruna|Riisi", part):
+                            continue
+	                # fries: well, maybe we do care, but we don't care about allergy stuff
+                        # and keep it in the same line as the previous food so as not to
+	                # waste visible space
+                        (part, fries) = re.subn("Tikkuperunat|Ranskalaiset perunat", "", part)
+                        fries = fries > 0
+                        part_count += 1
+
+                        # add missing () around allergies
+                        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
+                            food = match.group(1)
+                            allergy = match.group(2)
+                            # standardization
+                            allergy = re.sub("Kasvis", "K", allergy)
+                            allergy = re.sub("([MLGK]|VL)([MLGK]|[VL])", "\\1,\\2", allergy)
+                            # spaces to commas
+                            allergy = re.sub("saatavana[: ]+(.*)$", "eriks: \\1", allergy)
+                            allergy = re.sub(" +", ",", allergy)
+                            # remove double commas
+                            allergy = re.sub(",+", ",", allergy)
+                            # eriks: standardization
+                            allergy = re.sub(",?eriks:,?", ", eriks: ", allergy)
+                            # remove extra commas/spaces from beginning/end
+                            allergy = re.sub("^[, ]+", "", allergy)
+                            allergy = re.sub("[, ]+$", "", allergy)
+                            part = "{food} ({allergy})".format(food=food, allergy=allergy)
+
+                        if output and not fries:
+                            output.append("<br />\n")
+
+                        match = re.search("Saatavana myös: (.*)", part)
+                        if match:
+                            alt = match.group(1)
+                            alt = re.sub(r"^\((.*)\)$", r"\1", alt)
+                            alt = re.sub("[, ]+", r",", alt)
+                            alt = re.sub("^,+", "", alt)
+                            alt = re.sub(",+$", "", alt)
+                            part = re.sub(r"\)[- ]*Saatavana myös:.*", "eriks: {alt})".format(alt=alt), part)
+                            part = re.sub(r"[- ]*Saatavana myös:.*", "(eriks: {alt})".format(alt=alt), part)
+
+                        match = re.match(r"^(.*)(\([^\)]+\))$", part)
+                        if match:
+                            text = match.group(1)
+                            allergy = match.group(2)
+                            if fries:
+                                output.append(", {text}".format(text=text))
+                            else:
+                                output.append("{text} <span class=\"allergy\">{allergy}</span>".format(text=text, allergy=allergy))
+                            allergy = re.sub(r"^\((.*)\)$", r"\1", allergy)
+                            allergy = re.sub(" *eriks: ", "", allergy)
+                            this_allergies = set()
+                            for a in re.split("[, ]", allergy):
+                                for al in allergies:
+                                    if a == al:
+                                        this_allergies.add(a)
+                                        break
+                            if "L" in this_allergies:
+                                this_allergies.add("VL")
+                            for a in this_allergies:
+                                if a in total_allergies:
+                                    total_allergies[a] += 1
+                                if a in maybe_allergies:
+                                    maybe_allergies[a] += 1
+                            match = re.search("M", lazy_allergies)
+                            if match:
+                                if "L" in this_allergies and not "M" in this_allergies:
+                                    maybe_allergies["M"] += 1
+                        else:
+                            if lazy_allergies == "all":
+                                for a in allergies:
+                                    maybe_allergies[a] += 1
+
+                            output.append(part)
+                    allergy_output = ""
+                    for a in allergies:
+                        if total_allergies[a] == part_count:
+                            eatable_food_numbers[a].append(foodnum)
+                        elif maybe_allergies[a]== part_count:
+                            maybe_eatable_food_numbers[a].append(foodnum)
+                    fout.write("  <li id=\"f{foodnum}\">{output}</li>\n".format(foodnum=foodnum, output="".join(output)))
+                    foodnum += 1
+                fout.write("</ul>\n")
+        # write allergy scripts
+        fout.write('<script type="text/javascript" src="{resources_prefix}ruoka.js"></script>'.format(resources_prefix=resources_prefix))
+        fout.write('<script type="text/javascript">\n')
+        fout.write("var eatable_foods = [];\n")
+        fout.write("var maybe_eatable_foods = [];\n")
+        for a in allergies:
+            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".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)))
+
+def write_all_days(restaurants, prefix, title, resources_prefix):
+    try:
+        os.mkdir(prefix)
+    except OSError as err:
+        pass # hope it already exists
+    last_day = find_last_day_with_foods(restaurants);
+    for day in range(7):
+        outfname = "{prefix}{day}.html".format(prefix=prefix, day=day+1)
+        if day > last_day:
+            try:
+                os.unlink(outfname)
+            except OSError as err:
+                pass # probably did not exist
+            continue
+        header = "{day_name} - {title} vko {max_week}{max_week_daterange}".format(day_name=day_names[day], title=title,
+                max_week=max_week, max_week_daterange=max_week_daterange)
+        write_day(day, header, outfname, last_day, restaurants, prefix, 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", 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.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)
+        write_prefix_header(fout, prefix, 0, resources_prefix)
+        fout.write("</div><table border=\"1\"><tr><th>Päivä</th>")
+        for r in restaurants:
+            (title, open_hours, week, week_foods, info) = r[:5]
+            (title2, url) = info[0:2]
+            url = re.sub("&", "&nbsp;", url)
+            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]))
+            for r in restaurants:
+                (title, open_hours, week, week_foods, info) = r[:5]
+                if day in week_foods and (week == "" or week == max_week):
+                    fout.write("<td><ul>\n")
+                    for food in week_foods[day]:
+                        fout.write("<li>{food}</li>".format(food=food))
+                    fout.write("</ul></td>\n")
+                else:
+                    fout.write("<td></td>\n")
+            fout.write("</tr\n")
+        fout.write("</table>{file_footer}".format(file_footer=file_footer.format(resources_prefix=resources_prefix)))
+
+def get_restaurants_sorted(restaurants):
+    # consider writing comparator
+    out = []
+    for r in restaurants:
+        if r[4][3] == "left":
+            out.append(r)
+    for r in restaurants:
+        if r[4][3] == "right":
+            out.append(r)
+    for r in restaurants:
+        if r[4][3] == "middle" and not re.search("TAMK", r[4][0]):
+            out.append(r)
+    for r in restaurants:
+        if r[4][3] == "middle" and re.search("TAMK", r[4][0]):
+            out.append(r)
+    return out
+
+def get_restaurants_with_prefix(prefix, restaurants):
+    out = []
+    for r in restaurants:
+        if re.search(prefix, r[4][0]):
+            out.append(r)
+    return get_restaurants_sorted(out)
+
+tty_title = "TTY:n ruokalistat"
+tty = get_restaurants_with_prefix("TTY", unordered)
+write_all_days(tty, "tty/", tty_title, "../")
+write_table(tty, "tty/", tty_title, "../")
+
+tay_title = "Tampereen yliopiston ruokalistat"
+tay = get_restaurants_with_prefix("TaY", unordered)
+write_all_days(tay, "tay/", tay_title, "../")
+write_table(tay, "tay/", tay_title, "../")
+
+tays_title = "TAYS:n ruokalistat"
+tays = get_restaurants_with_prefix("TAYS", unordered)
+write_all_days(tays, "tays/", tays_title, "../")
+write_table(tays, "tays/", tays_title, "../")
+
+for r in unordered:
+    if re.search(r"^\(TaY\)", r[0]):
+        r[4][3] = "left"
+    if re.search(r"^\(TTY\)", r[0]):
+        r[4][3] = "right"
+    if re.search(r"^\(TAYS\)", r[0]):
+        r[4][3] = "middle"
+
+all_title = "Tampereen yliopistojen ruokalistat";
+all_restaurants = get_restaurants_sorted(unordered);
+# move fusion kitchen last
+#fusion = splice(@all_restaurants, 1, 1);
+#splice(@all_restaurants, 4, 0, @fusion);
+
+write_all_days(all_restaurants, "", all_title, "");
+write_table(all_restaurants, "", all_title, "");
+
+if updateException is not None:
+    print("Exception happened while fetching menus")
+    raise updateException

juvenes.pl

@@ -1,102 +0,0 @@
-use vars qw(@day_names);
-use JSON;
-
-# last two in order are $kitchen_info_id, $menu_type_id
-my @restaurant_info = (
-  [ "(TaY) Yliopiston Ravintola", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/yliopistonravintola.aspx", "M", "left", 13, 60 ],
-  [ "(TaY) Yliopiston Ravintola / VegeBar", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/yliopistonravintola.aspx", "", "left", 13, 5 ],
-  [ "(TaY) Café Campus", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/caf%C3%A9campus.aspx", "", "left", 130019, 23 ],
-  [ "(TaY) Café Pinni", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/tayp%C3%A4%C3%A4kampus/caf%C3%A9lunchpinni.aspx", "M", "middle", 130016, 60 ],
-  [ "(TAYS) Arvo", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/arvo.aspx", "M", "left", 5, 60 ],
-  [ "(TAYS) Café Lea (Fusion Kitchen)", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/cafélea.aspx", "M", "left", 50026, 3 ],
-  [ "(TAYS) Café Lea (My Salad)", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/taykaupinkampus/cafélea.aspx", "M", "left", 50026, 76 ],
-  [ "(TTY) Newton", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/newton.aspx", "", "left", 6, 60],
-  [ "(TTY) Café Konehuone / Såås bar", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/caf%C3%A9konehuone/s%C3%A5%C3%A5sbar.aspx", "", "left", 60038, 77],
-  [ "(TTY) Café Konehuone / Fusion Kitchen", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/opiskelijaravintolat/ttykampus/caf%C3%A9konehuone/fusionkitchen.aspx", "", "middle", 60038, 3 ],
-  [ "(TAMK) Ziberia", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/henkil%C3%B6st%C3%B6ravintolat/ziberia.aspx", "", "middle", 11, 60 ],
-#  [ "(TAMK) Frenckell", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/henkil%C3%B6st%C3%B6ravintolat/frenckell.aspx", "", "middle", 33, 60 ],
-  [ "(TAMK) Frenckell / Såås bar", "http://www.juvenes.fi/fi-fi/ravintolatjakahvilat/henkil%C3%B6st%C3%B6ravintolat/frenckell.aspx", "", "middle", 33, 77 ]
-);
-
-my @restaurants;
-my ($open_hours, $day_id, $cur_title);
-my ($cur_food, @cur_day_foods, @week_foods);
-
-sub finish_food {
-  chomp $cur_food;
-  if ($cur_food =~ /Liha paniini.*tai Kasvis paniini/i && $cur_title eq $pinni_title) {
-    # you get this every day, ignore
-  } else {
-    push @cur_day_foods, utf8_to_8859($cur_food) if ($cur_food ne "");
-  }
-  $cur_food = "";
-}
-
-sub finish_day {
-  push @week_foods, [@cur_day_foods];
-  @cur_day_foods = ();
-  $day_id = $day_id + 1;
-}
-
-sub get_juvenes_restaurants {
-  my $use_old = shift;
-  my $count = 0;
-  # Loops restraurants
-  foreach my $i (@restaurant_info) {
-    my @info = @{$i};
-    my $kitchen = $info[4];
-    my $menutype = $info[5];
-    $title = $info[0];
-    $cur_title = $title;
-    $open_hours = "";
-    @week_foods = ();
-    my $week = `date +%V`;
-    chomp($week);
-    # Loop weekdays
-    for (my $weekday = 1; $weekday < 7; $weekday++) {
-      my $temp_fname = "juvenes$count-$weekday.temp.js";
-      my $url = "http://www.juvenes.fi/DesktopModules/Talents.LunchMenu/LunchMenuServices.asmx/GetMenuByWeekday?KitchenId=$kitchen&MenuTypeId=$menutype&Week=$week&Weekday=$weekday&lang='fi'&format=json";
-      if (!-f $temp_fname || !$use_old) {
-        system("rm -f $temp_fname && wget -q --timeout=10 -O $temp_fname.tmp \"$url\" && mv $temp_fname.tmp $temp_fname");
-      }
-      if (-f $temp_fname) {
-        open(FILE, $temp_fname);
-        my $jsonp = do { local $/; <FILE> };
-        close(FILE);
-        # the file is encapsulated in ({"d": json}); so we have to double parse it
-        my $data = from_json(substr($jsonp, 1, -2));
-        unless ($data->{'d'} eq 'null') {
-          $data = from_json($data->{'d'});
-          my $mealoptions = $data->{'MealOptions'};
-          # loop different meals
-          foreach my $meal_info (@$mealoptions) {
-            if ($meal_info->{'ForceMajeure'} ne '') {
-              $cur_food = $meal_info->{'ForceMajeure'}; 
-            } else {
-              my $menuitems = $meal_info->{'MenuItems'};
-              # loops different foods in a meal
-              foreach my $food_info (@$menuitems) {
-                $cur_food .= "\n" if $cur_food ne ""; 
-                my $name = $food_info->{'Name'};
-                $name =~ s/^\*//;
-                $cur_food .= $name;
-                $cur_food .= " (" . $food_info->{'Diets'} . ")" if $food_info->{'Diets'};
-              }
-            }
-            if ($cur_food ne "-") {
-              finish_food();
-            } else {
-              $cur_food = "";
-            }
-          }
-        }
-        finish_day();
-      }
-    }
-    push @restaurants, [ $title, $open_hours, $week, [ @week_foods ], \@info ];
-    $count++;
-  }
-  return @restaurants;
-}
-
-1;

juvenes.py

@@ -0,0 +1,102 @@
+# encoding: UTF-8
+import pnalib
+import datetime
+import re
+import json
+
+# Last three columns are Kitchen Info ID, Menu Type ID and Concept ID. There may be multiple concepts in a single restauranta.
+# Juvenes API defines also Restaurant ID but that is not used.
+restaurant_info = [
+  [ "(TaY) Yliopiston Ravintola", 
+    "https://www.juvenes.fi/yoravintola",
+    "M", "left", 13, 60, []],
+  [ "(TaY) Yliopiston Ravintola / VegeBar",
+    "https://www.juvenes.fi/yoravintola",
+    "", "left", 13, 5, []],
+  [ "(TaY) Café Alakuppila (Paniini & Combosalaatti)",
+    "https://www.juvenes.fi/alakuppila",
+    "", "left", 130018, 58, []],
+  [ "(TaY) Café Pinni",
+    "https://www.juvenes.fi/pinni",
+    "M", "middle", 130016, 60, []],
+  [ "(TAYS) Arvo",
+    "https://www.juvenes.fi/arvo",
+    "M", "left", 5, 60, []],
+  [ "(TAYS) Café Lea (Fusion Kitchen)",
+    "https://www.juvenes.fi/lea",
+    "M", "left", 50026, 3, []],
+#  [ "(TAYS) Café Lea (My Salad)",
+#    "https://www.juvenes.fi/lea",
+#    "M", "left", 50026, 76, []],
+  [ "(TTY) Newton",
+    "https://www.juvenes.fi/newton",
+    "", "left", 6, 60, [1149]],
+  [ "(TTY) Café Konehuone / Såås bar",
+    "https://www.juvenes.fi/konehuone",
+    "", "left", 60038, 77, [3663]],
+  [ "(TTY) Café Konehuone / Fusion Kitchen",
+    "https://www.juvenes.fi/konehuone",
+    "", "middle", 60038, 3, [1674]],
+  [ "(TAMK) Ziberia (Koto my plate)",
+    "https://www.juvenes.fi/ziberia",
+    "", "middle", 11, 82, []],
+  [ "(TAMK) Ziberia (Koto)",
+    "https://www.juvenes.fi/ziberia",
+    "", "middle", 11, 79, []],
+  [ "(TAMK) Ziberia (My Salad)",
+    "https://www.juvenes.fi/ziberia",
+    "", "middle", 11, 76, []],
+  [ "(TAMK) Frenckell / Koto",
+    "https://www.juvenes.fi/frenckell",
+    "", "middle", 33, 60, []],
+  [ "(TAMK) Frenckell / Iltapäivälounas",
+    "https://www.juvenes.fi/frenckell",
+    "", "middle", 33, 85, []]
+]
+
+
+def get_restaurants(use_old, week):
+    restaurants = []
+    for count, info in enumerate(restaurant_info):
+        kitchen = info[4]
+        menutype = info[5]
+        concepts = info[6]
+        title = info[0]
+        cur_title = title
+        open_hours = ""
+        exception = None
+        week_foods = {}
+        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)
+            data = pnalib.get_json_file(url, temp_fname, use_old, allow_old=False)
+            if not data:
+                # Try to find problem
+                for concept in concepts:
+                    url = "http://www.juvenes.fi/DesktopModules/Talents.Restaurants/RestaurantsService.svc/GetConcept?menuId={concept}&lang=fi".format(concept=concept)
+                    temp_fname = "juvenes_{count}-{weekday}-{concept}.temp.js".format(count=count, weekday=weekday, concept=concept)
+                    data = pnalib.get_json_file(url, temp_fname, use_old, allow_old=False)
+                    if data and data["d"]:
+                        exception = data["d"]["OpenInfo"]["Exeption1InfoText"]
+            elif data and data["d"] != "null":
+                data = json.loads(data["d"])
+                cur_day_foods = []
+                mealoptions = data["MealOptions"]
+                for meal_info in mealoptions:
+                    cur_food = []
+                    if "ForceMajoure" in meal_info and meal_info["ForceMajoure"] != "":
+                        cur_food = [meal_info["ForceMajoure"]]
+                    else:
+                        menuitems = meal_info["MenuItems"]
+                        for food_info in menuitems:
+                            name = food_info["Name"]
+                            name = re.sub(r"^\*", "", name)
+                            if food_info["Diets"]:
+                                cur_food.append("{name} ({diets})".format(name=name, diets=food_info["Diets"]))
+                            elif name:
+                                cur_food.append(name)
+                    if cur_food != ["-"]:
+                        cur_day_foods.append("\n".join(cur_food))
+                week_foods[weekday-1] = cur_day_foods
+        restaurants.append([title, open_hours, week, week_foods, info, exception])
+    return restaurants

pikante.py

@@ -0,0 +1,27 @@
+import pnalib
+import html.parser
+# Pikante does not have any student restaurants at the moment
+
+pikante_url = "http://www.pikante.fi/lounaslistat-pdf";
+
+restaurant_info = [
+  [ "(TAYS) Finnmedin ravintola", "$pky_url", "all", "middle" ],
+  [ "(TAYS) Café Olive", "$pky_url", "all", "middle" ],
+  [ "(TAYS) Ellipsi", "$pky_url", "all", "middle" ]
+]
+
+class PikanteHTMLParser(html.parser.HTMLParser):
+    def handle_starttag(self, tag, attrs):
+        pass
+    def handle_endtag(self, tag):
+        pass
+    def handle_data(self, data):
+        pass
+
+def get_restaurants(use_old, week):
+
+    #data = pnalib.get_file(pikante_url, "pikante.html", use_old)
+    #parser = PikanteHTMLParser()
+    #parser.feed(data)
+
+    return []

pky.pl

@@ -1,169 +0,0 @@
-use vars qw(@day_names);
-
-my @short_day_names = ( "ma", "ti", "ke", "to", "pe", "la", "su" );
-
-#my $pky_url = "http://www.pky.fi/lounaslistat";
-my $pky_url = "http://www.pikante.fi/lounaslistat-pdf";
-
-my @restaurant_info = (
-  [ "(TAYS) Finn-Medi", "$pky_url", "all", "middle" ],
-  [ "(TAYS) Café Olive", "$pky_url", "all", "middle" ],
-  [ "(TAYS) Ellipsi", "$pky_url", "all", "middle" ]
-);
-
-my ($parse_func, $day_id, $week);
-my (@cur_day_foods, @week_foods);
-my ($show_next_week, $content_title);
-
-sub utf8_to_8859 {
-  $_ = shift;
-
-  s/ //g;
-  s/é/é/g;
-  s/ä/ä/g;
-  s/ö/ö/g;
-  s/Ä/Ä/g;
-  s/Ö/Ö/g;
-  return $_;
-}
-
-sub pky_finish_day {
-  push @week_foods, [@cur_day_foods];
-  @cur_day_foods = ();
-  $day_id = $day_id + 1;
-}
-
-sub pky_parse_more_food {
-  my $token = shift;
-  
-  if ($token->[0] eq 'T') {
-    my $text = utf8_to_8859($token->[1]);
-    foreach my $text (split("/", $text)) {
-      push @cur_day_foods, $text if ($text ne "");
-    }
-  } elsif ($token->[0] eq 'E') {
-    if ($token->[1] eq 'tr') {
-      pky_finish_day();
-      $parse_func = \&pky_parse_day_td;
-    }
-  }
-}
-
-sub pky_parse_day_td {
-  my $token = shift;
-  
-  if ($token->[0] eq 'E') {
-    if ($token->[1] eq 'td') {
-      $parse_func = \&pky_parse_more_food;
-    } elsif ($token->[1] eq 'table') {
-      $parse_func = \&pky_parse_to_week;
-    }
-  } elsif ($token->[0] eq 'T') {
-    my $text = $token->[1];
-    my $i = 0;
-    foreach my $day (@short_day_names) {
-      if ($text =~ /$day$/i) {
-	while ($day_id < $i) {
-	  push @week_foods, [ ];
-	  $day_id++;
-	}
-	last;
-      }
-      $i++;
-    }
-  }
-}
-
-sub pky_parse_to_monday {
-  my $token = shift;
-  
-  if ($token->[0] eq 'S' && $token->[1] eq 'tr') {
-    $parse_func = \&pky_parse_day_td;
-  } elsif ($token->[0] eq 'E' && $token->[1] eq 'table') {
-    $parse_func = \&pky_parse_to_week;
-  }
-}
-
-sub want_second_week {
-  my $week = shift;
-
-  return 1 if $day_id == 0; # week didn't start from beginning
-  
-  my @l = localtime;
-  my $this_week = strftime("%V", @l);
-  return $week == $this_week || ($l[6] == 6 && ($week%52)+1 == $this_week);
-}
-
-sub pky_parse_to_eof {
-}
-
-sub pky_parse_to_week {
-  my $token = shift;
-  
-  if ($token->[0] eq 'T' && $token->[1] =~ /Viikko (\d+)/) {
-    my $parsed_week = $1;
-    # earlier version could have shown two tables for two weeks
-    # sometimes. but the new version? dunno yet..
-    #if ($week == 0 || $show_next_week) {
-    if ($week == 0) {
-      $week = $parsed_week;
-      $day_id = 0;
-      @cur_day_foods = ();
-      @week_foods = ();
-      $parse_func = \&pky_parse_to_monday;
-    } else {
-      $parse_func = \&pky_parse_to_eof;
-    }
-  }
-}
-
-sub pky_parse_to_title {
-  my $token = shift;
-  
-  if ($token->[0] eq 'T') {
-    my $text = utf8_to_8859($token->[1]);
-    if ($text =~ /$content_title.*lounasaika/) {
-      $parse_func = \&pky_parse_to_week;
-    }
-  }
-}
-
-sub parse_pky {
-  my ($fname, $info_ref) = @_;
-  my $p = HTML::TokeParser->new($fname) or die("Can't open file $fname");
-  
-  my $title = @{$info_ref}[0];
-  $week = 0;
-  
-  $content_title = $title;
-  $content_title =~ s/^\(TAYS\) //;
-
-  $parse_func = \&pky_parse_to_title;
-  while (my $token = $p->get_token) {
-    &$parse_func($token);
-  }
-  return [ $title, "", $week, [ @week_foods ], $info_ref ];
-}
-
-sub get_pky_restaurants {
-  my $use_old;
-  ($use_old, $show_next_week) = @_;
-
-  my $temp_fname = "pky.temp.html";
-  if (!-f $temp_fname || !$use_old) {
-    system("wget -q --timeout=10 -O $temp_fname.tmp '$pky_url' && mv $temp_fname.tmp $temp_fname");
-  }
-  
-  my @restaurants = ();
-  if (-f $temp_fname) {
-    my $count = 0;
-    foreach my $i (@restaurant_info) {
-      my @info = @{$i};
-      push @restaurants, parse_pky($temp_fname, \@info);
-      $count++;
-    }
-  }
-  return @restaurants;
-}
-
-1;

pnalib.py

@@ -0,0 +1,39 @@
+import os.path
+import urllib.request
+import urllib.error
+import json
+
+def get_jsonp_file(url, temp_fname, use_old, allow_old=True):
+    try:
+        return get_file(url, temp_fname, use_old, jsonp_load, allow_old)
+    except json.decoder.JSONDecodeError as e:
+        print("Failed to parse JSON from {}".format(temp_fname))
+        raise
+
+def get_json_file(url, temp_fname, use_old, allow_old=True):
+    try:
+        return get_file(url, temp_fname, use_old, json.load, allow_old)
+    except json.decoder.JSONDecodeError as e:
+        print("Failed to parse JSON from {}".format(temp_fname))
+        raise
+
+def jsonp_load(fp):
+    return json.loads(fp.read()[1:-2])
+
+def read_all(fp):
+    return fp.read()
+
+def get_file(url, temp_fname, use_old, consumer=read_all, allow_old=True):
+    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))
+            # Juvenes may fail with error code 500 if food is not available
+            if not allow_old:
+                return None
+    try:
+        with open(temp_fname, "r", encoding="utf-8") as fin:
+            return consumer(fin)
+    except OSError as e:
+        pass

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.pl

@@ -1,89 +0,0 @@
-use vars qw(@day_names);
-use POSIX qw(strftime);
-
-
-my @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]
-);
-
-my ($cur_text, $cur_title, $parse_func, $day_id, $week);
-my (@cur_day_foods, @week_foods);
-
-sub sodexo_finish_food {
-  chomp $cur_food;
-  push @cur_day_foods, utf8_to_8859($cur_food) if ($cur_food ne "");
-  $cur_food = "";
-}
-
-sub sodexo_finish_day {
-  push @week_foods, [@cur_day_foods];
-  @cur_day_foods = ();
-  $day_id = $day_id + 1;
-}
-
-
-sub utf8_to_8859 {
-  $_ = shift;
-
-  s/ä/ä/g;
-  s/ö/ö/g;
-  s/Ä/Ä/g;
-  s/Ö/Ö/g;
-  return $_;
-}
-
-sub get_sodexo_restaurants {
-  my $use_old = shift;
-  my $count = 0;
-  # Loops restraurants
-  foreach my $i (@restaurant_info) {
-    my @info = @{$i};
-    my $kitchen = $info[4];
-    $title = $info[0];
-    $cur_title = $title;
-    $open_hours = "";
-    @week_foods = ();
-    my $week = `date +%V`;
-    chomp($week);
-    # Loop weekdays
-    for (my $weekday = 1; $weekday < 7; $weekday++) {
-
-      # Get current unix timestamp and week day
-      $s = strftime "%s", localtime;
-      $v = strftime "%w", localtime;
-      # Calculate current weekday 
-      $s = $s + ($weekday - $v)  * 86400;
-      $timestr = strftime "%Y/%m/%d", localtime($s);
-
-      my $url = "http://www.sodexo.fi/ruokalistat/output/daily_json/$kitchen/$timestr/fi";
-      my $temp_fname = "sodexo$count-$weekday.temp.js";  
-      if (!-f $temp_fname || !$use_old) {
-        system("wget -q --timeout=10 -O $temp_fname.tmp \"$url\" && mv $temp_fname.tmp $temp_fname");
-      }
-      if (-f $temp_fname) {
-        open(FILE, $temp_fname);
-        my $json = do { local $/; <FILE> };
-        close(FILE);
-        # the file is encapsulated in ({"d": json}); so we have to double parse it
-        my $data = from_json($json);
-        my $courses = $data->{'courses'};
-        # loop different meals
-        foreach my $course_info (@$courses) {
-          if ($course_info->{'category'} ne 'Aamupala') {
-            $cur_food = $course_info->{'title_fi'};
-            $cur_food .= " (" . $course_info->{'properties'} . ")" if $course_info->{'properties'};
-          }
-          sodexo_finish_food();
-        }
-        sodexo_finish_day();
-      }
-    }
-    push @restaurants, [ $title, $open_hours, $week, [ @week_foods ], \@info ];
-    $count++;
-  }
-  return @restaurants;
-}
-
-1;

sodexo.py

@@ -0,0 +1,42 @@
+import pnalib
+import datetime
+
+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, 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)
+            data = pnalib.get_json_file(url, temp_fname, use_old)
+            if not data:
+                continue
+            current_day_foods = []
+            courses = data["courses"]
+            print(data)
+            for course_info in courses:
+                if not "category" in course_info or not "title_fi" in course_info or not "properties" in course_info:
+                    continue
+                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