diff options
| -rw-r--r-- | food.js | 4 | ||||
| -rwxr-xr-x | init.sh | 6 | ||||
| -rw-r--r-- | server.js | 2 |
3 files changed, 7 insertions, 5 deletions
@@ -3,8 +3,8 @@ const open = require("./Functions/open.js"); const { weekdayToNumber } = require("./Functions/dateFuncs.js"); function* scrapeFood(data) -{ - const foodRegex = /<title>(\w{2} (?:\d\d?\.){2}\d{4})<\/title><description><!\[CDATA\[(Lounas) ?:? ?(.*?)(Kasvislounas) ?:? ?(.*?)]]><\/description>/gm; +{ + const foodRegex = /<title>(\w{2} (?:\d\d?\.){2}\d{4})<\/title><description><!\[CDATA\[(Lounas) ?:? ?(.*?)<br>(Kasvislounas) ?:? ?(.*?)]]><\/description>/ const foods = data.matchAll(foodRegex); for(const food of foods) { @@ -2,7 +2,7 @@ exec 1>>/var/slogs exec 2>>/var/slogs echo "" -echo "# Init running" +echo "# Init running at $(date)" echo "# Waiting for connection..." while ! ping 'example.org' -c 1; do @@ -26,6 +26,8 @@ while echo "# node server.js:"; do # Sleep below, so that the loop can't cause too big a load to the server, if the server terminates very fast. sleep 5 - echo "SERVER TERMINATED!" + echo "# Server terminated at $(date)" echo "--------" + echo "" + echo "" done @@ -283,7 +283,7 @@ async function buildMain(args) res["food-header"] = `Kouluruoka ${weekdays[day]}`; res["food"] = "Päivän ruoka puuttuu tietokannasta."; } - if (vege[0] !== undefined) { + if ((vege[0] !== undefined) && (vege[0].food !== res["food"])) { res["vege-header"] = vege[0].header; res["vege"] = vege[0].food; } else { |