commit 43b38cba4842828e8ce41f9304b82c2342d37e31 parent 76c1296df30339442b54d4e1faea15bbd3ae65bb Author: JayVii <jayvii[AT]posteo[DOT]de> Date: Sat, 29 Mar 2025 12:33:25 +0100 feat: restructure entire project - move perlanet config files to subdirectory. - move scripts to subdirectory. - move template files to subdirectory. - clean up scripts. - clean up templates. - create "breaking news" section for pulse feed Diffstat:
| D | 00_flash.yaml | | | 25 | ------------------------- |
| D | 01_pulse.yaml | | | 60 | ------------------------------------------------------------ |
| D | 02_tide.yaml | | | 72 | ------------------------------------------------------------------------ |
| D | 99_net.yaml | | | 33 | --------------------------------- |
| A | Makefile | | | 2 | ++ |
| M | assets/css/custom.css | | | 5 | +++++ |
| D | assets/js/mark_old.js | | | 22 | ---------------------- |
| R | manifest.json -> assets/manifest.json | | | 0 | |
| D | fetch_and_rewrite.sh | | | 189 | ------------------------------------------------------------------------------- |
| D | fetch_favicon.sh | | | 69 | --------------------------------------------------------------------- |
| M | index.php | | | 4 | ++-- |
| A | perlanetrc/00_flash.yaml | | | 27 | +++++++++++++++++++++++++++ |
| A | perlanetrc/01_pulse.yaml | | | 66 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | perlanetrc/02_tide.yaml | | | 75 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | perlanetrc/99_net.yaml | | | 36 | ++++++++++++++++++++++++++++++++++++ |
| A | perlanetrc/mini-flash.yaml | | | 21 | +++++++++++++++++++++ |
| D | rewrite.txt | | | 1 | - |
| D | run.sh | | | 76 | ---------------------------------------------------------------------------- |
| A | scripts/run.sh | | | 83 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | scripts/yaml.sh | | | 76 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| D | template.tt | | | 112 | ------------------------------------------------------------------------------- |
| A | templates/index.tt | | | 114 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| A | templates/mini.tt | | | 66 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
23 files changed, 573 insertions(+), 661 deletions(-)
diff --git a/00_flash.yaml b/00_flash.yaml @@ -1,25 +0,0 @@ -title: Flash -description: Breaking news. -url: https://news.jayvii.de/flash.html -entries: 500 -entries_per_feed: 5 -entries_sort_order: "issued" -author: - name: JayVii - email: jayvii+newsplanet[AT]posteo[DOT]de -opml_file: flash.opml.xml -page: - file: flash.html - template: template.tt -feed: - file: flash.xml - format: RSS -cache_dir: /tmp/newsplanet/flash -feeds: - - title: Tagesschau - url: https://www.tagesschau.de/infoservices/eilmeldungen-100~rss2.xml - web: https://www.tagesschau.de/infoservices/eilmeldungen-100.html - - title: Süddeutsche Zeitung - url: https://rss.sueddeutsche.de/rss/Eilmeldungen - web: https://www.sueddeutsche.de - diff --git a/01_pulse.yaml b/01_pulse.yaml @@ -1,60 +0,0 @@ -title: Pulse -description: Current news with high frequency. -url: https://news.jayvii.de/pulse.html -entries: 500 -entries_per_feed: 15 -entries_sort_order: "issued" -author: - name: JayVii - email: jayvii+newsplanet[AT]posteo[DOT]de -opml_file: pulse.opml.xml -page: - file: pulse.html - template: template.tt -feed: - file: pulse.xml - format: RSS -cache_dir: /tmp/newsplanet/pulse -feeds: - - title: Tagesschau (Inland) - url: https://www.tagesschau.de/inland/index~rss2.xml - web: https://www.tagesschau.de/inland - - title: Tagesschau (Ausland) - url: https://www.tagesschau.de/ausland/index~rss2.xml - web: https://www.tagesschau.de/ausland - - title: Tagesschau (Wirtschaft) - url: https://www.tagesschau.de/wirtschaft/index~rss2.xml - web: https://www.tagesschau.de/wirtschaft - - title: Deutschlandfunk (Wirtschaft) - url: https://www.deutschlandfunk.de/wirtschaft-106.rss - web: https://www.deutschlandfunk.de/wirtschaft-106.html - - title: Deutschlandfunk (Politik) - url: https://www.deutschlandfunk.de/politikportal-100.rss - web: https://www.deutschlandfunk.de/politikportal-100.html - - title: ZDFheute (Politik) - url: https://www.zdf.de/rss/zdf/nachrichten/politik - web: https://www.zdf.de/nachrichten/politik - # - title: ZDFheute (Wirtschaft) - # url: https://www.zdf.de/rss/zdf/nachrichten/wirtschaft - # web: https://www.zdf.de/nachrichten/wirtschaft - - title: Deutsche Welle (Wirtschaft) - url: https://rss.dw.com/atom/rss-de-eco - web: https://www.dw.com/de/wirtschaft/s-1503 - - title: RND (Wirtschaft) - url: https://www.rnd.de/arc/outboundfeeds/rss/category/wirtschaft/ - web: https://www.rnd.de/wirtschaft/ - - title: RND (Politik) - url: https://www.rnd.de/arc/outboundfeeds/rss/category/politik/ - web: https://www.rnd.de/politik/ - - title: nd (Politik) - url: https://www.nd-aktuell.de/rss/politik.xml - web: https://www.nd-aktuell.de/rubrik/politik/ - - title: nd (Wirtschaft) - url: https://www.nd-aktuell.de/rss/wirtschaft-umwelt.xml - web: https://www.nd-aktuell.de/rubrik/wirtschaft/ - - title: Taz (Politik) - url: https://taz.de/Politik/!p4615;rss/ - web: https://taz.de/Politik/!p4615/ - - title: Taz (Öko) - url: https://taz.de/Oeko/!p4610;rss/ - web: https://taz.de/Oeko/!p4610/ diff --git a/02_tide.yaml b/02_tide.yaml @@ -1,72 +0,0 @@ -title: Tide -description: News, long reads and debate with low frequency. -url: https://news.jayvii.de/tide.html -entries: 500 -entries_per_feed: 20 -entries_sort_order: "issued" -author: - name: JayVii - email: jayvii+newsplanet[AT]posteo[DOT]de -opml_file: tide.opml.xml -page: - file: tide.html - template: template.tt -feed: - file: tide.xml - format: RSS -cache_dir: /tmp/newsplanet/tide -feeds: - - title: Der Freitag (Grünes Wissen) - url: https://www.freitag.de/gruenes-wissen/@@RSS - web: https://www.freitag.de/gruenes-wissen/ - - title: Der Freitag (Politik) - url: https://www.freitag.de/politik/@@RSS - web: https://www.freitag.de/politik/ - - title: Der Freitag (Wirtschaft) - url: https://www.freitag.de/wirtschaft/@@RSS - web: https://www.freitag.de/wirtschaft/ - - title: WOZ (International) - url: https://www.woz.ch/t/international/feed/ - web: https://www.woz.ch/t/international/ - - title: ND (Commune) - url: https://www.nd-aktuell.de/rss/nd-commune.xml - web: https://www.nd-aktuell.de/rubrik/nd-commune - - title: Blätter - url: https://www.blaetter.de/rss.xml - web: https://www.blaetter.de/ - - title: Correctiv (Wirtschaft) - url: https://correctiv.org/wirtschaft/feed/ - web: https://correctiv.org/wirtschaft/ - - title: Correctiv (Europa) - url: https://correctiv.org/europa-aktuelles/feed/ - web: https://correctiv.org/europa-aktuelles/ - - title: JACOBIN (DE) - url: https://jacobin.de/rss.xml - web: https://jacobin.de/ - - title: Surplus - url: https://www.surplusmagazin.de/rss/ - web: https://www.surplusmagazin.de/ - - title: NOEMAMAG - url: https://www.noemamag.com/?feed=noemarss - web: https://www.noemamag.com/ - - title: Missy (Politik und Protest) - url: https://missy-magazine.de/blog/category/politik-und-protest/feed/ - web: https://missy-magazine.de/blog/category/politik-und-protest/ - - title: an.schläge - url: https://anschlaege.at/feed/ - web: https://anschlaege.at/ - - title: Analyse und Kritik - url: https://www.akweb.de/feed/ - web: https://www.akweb.de/ - - title: Rosa Luxemburg - url: https://zeitschrift-luxemburg.de/rss.xml - web: https://zeitschrift-luxemburg.de/ - - title: New Left Review - url: https://newleftreview.org/feed - web: https://newleftreview.org/ - - title: Monthly Review - url: https://monthlyreview.org/feed/ - web: https://monthlyreview.org/ - - title: Le Monde (EN) - url: https://www.lemonde.fr/en/rss/une.xml - web: https://www.lemonde.fr/en/ diff --git a/99_net.yaml b/99_net.yaml @@ -1,33 +0,0 @@ -title: Net -description: News from the inference between IT and politics. -url: https://news.jayvii.de/net.html -entries: 500 -entries_per_feed: 25 -entries_sort_order: "issued" -author: - name: JayVii - email: jayvii+newsplanet[AT]posteo[DOT]de -opml_file: net.opml.xml -page: - file: net.html - template: template.tt -feed: - file: net.xml - format: RSS -cache_dir: /tmp/newsplanet/net -feeds: - - title: Netzpolitik.ORG - url: https://netzpolitik.org/feed/ - web: https://netzpolitik.org - - title: Heise Online - url: https://www.heise.de/rss/heise-Rubrik-Netzpolitik-atom.xml - web: https://www.heise.de/newsticker/netzpolitik/ - - title: Golem - url: https://rss.golem.de/rss.php?feed=RSS1.0&ms=netzpolitik - web: https://www.golem.de/specials/netzpolitik/ - - title: Taz (Netzökonomie) - url: https://taz.de/Oeko/Netzoekonomie/!p4627;rss/ - web: https://taz.de/Oeko/Netzoekonomie/!p4627/ - - title: Disconnect - url: https://disconnect.blog/feed - web: https://disconnect.blog/ diff --git a/Makefile b/Makefile @@ -0,0 +1,2 @@ +fetch-yaml-parser: + wget https://github.com/jasperes/bash-yaml/raw/refs/heads/master/script/yaml.sh -O ./scripts/yaml.sh diff --git a/assets/css/custom.css b/assets/css/custom.css @@ -55,3 +55,8 @@ a.button > img { table { width: 100%; } +.subfeed { + width: 100%; + height: 200px; + border: none; +} diff --git a/assets/js/mark_old.js b/assets/js/mark_old.js @@ -1,22 +0,0 @@ -function mark_as_old(obj) { - // get current time - let now = new Date(); - - // get object time data attribute - let time = new Date(obj.getAttribute("data")); - - // check whether object is older than 24 hours - if ((now - time) > (24 * 60 * 60 * 1000)) { - obj.classList.add("inactive"); - } else { - obj.classList.remove("inactive"); - } -} - -function check_articles() { - // find all article sections - let articles = document.querySelectorAll("section"); - - // mark old articles as inactive - articles.forEach(mark_as_old); -} diff --git a/manifest.json b/assets/manifest.json diff --git a/fetch_and_rewrite.sh b/fetch_and_rewrite.sh @@ -1,189 +0,0 @@ -#!/usr/bin/env bash - -# Config ----------------------------------------------------------------------- - -# cache directory -cache_dir="/tmp/newsplanet/rewrites" -file_name=$(echo "$1" | sed -e 's/https*:\/\///' -e 's/\//_/g') -cache_file="${cache_dir}/${file_name}" - -# ensure all required directories exist -mkdir -p ./rewrites/ -mkdir -p "${cache_dir}" - -# Functions -------------------------------------------------------------------- - -read_xml () { - local IFS=\> - read -d \< ENTITY CONTENT -} - -write_xml () { - cat ${1} | sed -E \ - -e 's/^(\/.*$)/<\1>/g' \ - -e 's/^([^<].*)\s*=>\s*(.*$)/<\1>\2/g' \ - -e 's/^([^<]+$)/<\1>/g' \ - -e 's/\s+(\/)*\s*>/\1>/g' \ - -e '/^[[:space:]]*$/d' | \ - tee ${2} > /dev/null -} - -reverse() { - tac <(echo "$@" | tr ' ' '\n') | tr '\n' ' ' -} - -get_dateline_of_guid() { -# 1: dguid, 2: cache_file.new - - # get line numbers of GUID lines - guid_line=$( - grep -E "guid\s*=>\s*${1}" -n "${2}" | \ - sed -E -e 's/^([0-9]+):.*/\1/g' - ) - - # get <pubDate> lines - date_lines=$( - grep -e "^pubDate" -n "${2}" | sed -E -e 's/^([0-9]+):.*/\1/g' - ) - - # get <item></item> lines - item_line_start=$( - grep -e "^item" -n "${2}" | sed -E -e 's/^([0-9]+):.*/\1/g' - ) - item_line_stop=$( - grep -e "^\/item" -n "${2}" | sed -E -e 's/^([0-9]+):.*/\1/g' - ) - - # get emcompasing item lines - ## assign the last SMALLER line as the start-line of the affected item - for i in $item_line_start; do - if [ $i -lt $guid_line ]; then - item_start=$i - fi - done - ## assign the first GREATER line as the stop-line of the affected item - for i in $(reverse $item_line_stop); do - if [ $i -gt $guid_line ]; then - item_stop=$i - fi - done - - # get pubDate line that needs to be replaced - for i in $date_lines; do - if [ $i -gt $item_start ] && [ $i -lt $item_stop ]; then - date_line=$i - fi - done - - # return line of date-line - echo "$date_line" - -} - -# Script ----------------------------------------------------------------------- - -# Create User output -echo "Processing ${1}..." - -# Fetch given XML Feed -wget --quiet "$1" -O "$cache_file" - -# parse XML file -while read_xml; do - if [[ ! -z $CONTENT ]]; then - echo "$ENTITY => $CONTENT" - else - echo "$ENTITY" - fi -done < "${cache_file}" | tee "${cache_file}.new" > /dev/null - -# ensure that new file has closing </rss> -if [ $(grep -e "^rss" -c "${cache_file}.new") -gt 0 ] && - [ $(grep -e "^/rss" -c "${cache_file}.new") -eq 0 ]; then - echo "/rss" >> "${cache_file}.new" -fi - -# compare old to new file -if [ -f "${cache_file}.old" ]; then - - # find GUID lines in new and old XML files - guids_new=$( - grep -e "^guid =>" "${cache_file}.new" | \ - sed -e 's/^.*=>\s*//g' - ) - guids_old=$( - grep -e "^guid =>" "${cache_file}.old" | \ - sed -e 's/^.*=>\s*//g' - ) - - # find new GUID lines in new XML file - dguids=$( - diff "${cache_file}.old" "${cache_file}.new" | \ - grep -e "^> guid" | \ - sed -e 's/^>.*=>\s*//g' - ) - - # transfer dates of GUIDs in old file to the new file - for guid_old in $guids_old; do - - # if current old GUID is not present in new GUIDs, skip it! - if [ -z $(echo "$guids_new" | grep "$guid_old") ]; then - continue - fi - - # get line number of old and new GUID line - date_line_old=$(get_dateline_of_guid "$guid_old" "${cache_file}.old") - date_line_new=$(get_dateline_of_guid "$guid_old" "${cache_file}.new") - - # replace date in affected line of new file - if [ ! -z $date_line_old ] && [ ! -z $date_line_new ]; then - old_date=$( - awk "NR==$date_line_old" "${cache_file}.old" | sed -e 's/^.*=>\s*//' - ) - sed -e "${date_line_new}s/=>[^\/]*/=> ${old_date}/" -i "${cache_file}.new" - fi - - done - - # generate new dates for newly appearing GUIDs - for dguid in $dguids; do - - # get line number of new GUID lines - date_line=$(get_dateline_of_guid "$dguid" "${cache_file}.new") - - # replace date in affected line - if [ ! -z $date_line ]; then - - # generate a new date line that is some time between now and the date - # listed in the original XML - - ## get original date - orig_date=$( - awk "NR==$date_line" "${cache_file}.new" | sed -e 's/^.*=>\s*//' - ) - - ## produce timestamps - orig_ts=$(date +%s --date "$orig_date") - now_ts=$(date +%s) - - ## scale new date between a random point in time between both timestamps - ### produce an approx. uniformly distributed number ~ U(0,10000) - diff_ts=$(($orig_ts - $now_ts)) - rnd=$(shuf -i 1-10000 -n 1) - new_ts=$(($now_ts + (($rnd * $diff_ts) / 10000))) - new_date=$(LC_ALL=en date "+%a, %d %b %Y %H:%M:%S %z" --date "@${new_ts}") - - ## insert new date into newly cached file - sed -e "${date_line}s/=>[^\/]*/=> ${new_date}/" -i "${cache_file}.new" - fi - - done - - # write new XML file - echo " Writing into ./rewrites/${file_name}" - mkdir -p "./rewrites/" - write_xml "${cache_file}.new" "./rewrites/${file_name}" - -fi - -mv "${cache_file}.new" "${cache_file}.old" diff --git a/fetch_favicon.sh b/fetch_favicon.sh @@ -1,69 +0,0 @@ -#!/usr/bin/env sh - -# fetch input config file, fall back to "general" -if [ -z $1 ]; then - CONFIG="centre.yaml" -else - CONFIG="$1" -fi - -# read yaml file -URLS=`grep -E "^\s*-*\ web:" "$CONFIG" | sed -e 's/^.*web:\ //g'` - -# get domains -DOMAINS=` - echo "$URLS" | sed -E -e 's/https:\/\/([^\/]*).*$/\2/g' | sort | uniq -` - -# Ensure directory exists -mkdir -p ./assets/site-icons/ - -# loop through websites -for DOMAIN in $DOMAINS; do - - # User output - printf "Fetching favicon for ${DOMAIN}...\n" - - # Only refresh favicons every 24hours - if [ -f "./assets/site-icons/${DOMAIN}" ]; then - NOW=`date +%s` - TST=`date -r "assets/site-icons/${DOMAIN}" +%s` - DIF=`echo "$NOW - $TST" | bc` - if [ $DIF -lt 86400 ]; then - printf "Skipping!\n" - continue; # skip for-loop item - fi - fi - - # read HTML of webpage - HTML=`curl --silent --location "$DOMAIN"` - - # Fetch Favicon reference from HTML - ICN_URI=` - echo "$HTML" | \ - grep "rel=\"[^\"]*icon[^\"]*\"" | \ - grep -v ".svg" | \ - tail -n 1 | \ - sed -E -e 's/^.*href=\"([^\"]*)\".*$/\1/' - ` - - # Post-Process favicon url in order to prepare the download - ICN_URL=` - echo "$ICN_URI" | \ - sed -E \ - -e "s/^\//https:\/\/$DOMAIN\//" \ - -e "s/^(\.+)/https:\/\/$DOMAIN\/\1/" - ` - - # Download Favicon to assets folder - # If no favicon URL could be found, link a fallback icon - if [ ! -z $ICN_URL ]; then - curl --silent --location \ - --output "./assets/site-icons/${DOMAIN}" \ - "$ICN_URL" - else - cp ./assets/fallback-site-icon.png ./assets/site-icons/${DOMAIN} - fi - -done - diff --git a/index.php b/index.php @@ -1,5 +1,5 @@ <!-- SPDX-License-Identifier: AGPL-3.0-or-later - SPDX-FileCopyrightText: 2021-2024 JayVii <jayvii[AT]posteo[DOT]de> + SPDX-FileCopyrightText: 2021-2025 JayVii <jayvii[AT]posteo[DOT]de> --> <!DOCTYPE html> @@ -49,7 +49,7 @@ <table> <?php - foreach (glob("[0-9a-z_]*.yaml") as $yamlfile) { + foreach (glob("perlanetrc/[0-9]*_[a-z]*.yaml") as $yamlfile) { $yaml = explode(PHP_EOL, file_get_contents($yamlfile)); $title_arr = array_values(preg_grep("/^title:.*$/", $yaml)); $title = preg_replace("/^title:\s*/", "", $title_arr[0]); diff --git a/perlanetrc/00_flash.yaml b/perlanetrc/00_flash.yaml @@ -0,0 +1,27 @@ +title: Flash +description: Breaking news. +url: https://news.jayvii.de/flash.html +entries: 500 +entries_per_feed: 5 +entries_sort_order: "issued" +entries_age: 21600 +author: + name: JayVii + email: jayvii+newsplanet[AT]posteo[DOT]de +opml_file: flash.opml.xml +page: + file: flash.html + template: templates/index.tt +feed: + file: flash.xml + format: RSS +manifest: + file: assets/manifest.json +cache_dir: /tmp/newsplanet/flash +feeds: + - title: Tagesschau + url: https://www.tagesschau.de/infoservices/eilmeldungen-100~rss2.xml + web: https://www.tagesschau.de/infoservices/eilmeldungen-100.html + - title: Süddeutsche Zeitung + url: https://rss.sueddeutsche.de/rss/Eilmeldungen + web: https://www.sueddeutsche.de diff --git a/perlanetrc/01_pulse.yaml b/perlanetrc/01_pulse.yaml @@ -0,0 +1,66 @@ +title: Pulse +description: Current news with high frequency. +url: https://news.jayvii.de/pulse.html +entries: 500 +entries_per_feed: 15 +entries_sort_order: "issued" +entries_age: 86400 +author: + name: JayVii + email: jayvii+newsplanet[AT]posteo[DOT]de +opml_file: pulse.opml.xml +page: + file: pulse.html + template: templates/index.tt +feed: + file: pulse.xml + format: RSS +manifest: + file: assets/manifest.json +sub_feed: + file: flash.mini.html + title: Breaking News +cache_dir: /tmp/newsplanet/pulse +feeds: + - title: Tagesschau (Inland) + url: https://www.tagesschau.de/inland/index~rss2.xml + web: https://www.tagesschau.de/inland + - title: Tagesschau (Ausland) + url: https://www.tagesschau.de/ausland/index~rss2.xml + web: https://www.tagesschau.de/ausland + - title: Tagesschau (Wirtschaft) + url: https://www.tagesschau.de/wirtschaft/index~rss2.xml + web: https://www.tagesschau.de/wirtschaft + - title: Deutschlandfunk (Wirtschaft) + url: https://www.deutschlandfunk.de/wirtschaft-106.rss + web: https://www.deutschlandfunk.de/wirtschaft-106.html + - title: Deutschlandfunk (Politik) + url: https://www.deutschlandfunk.de/politikportal-100.rss + web: https://www.deutschlandfunk.de/politikportal-100.html + - title: ZDFheute (Politik) + url: https://www.zdf.de/rss/zdf/nachrichten/politik + web: https://www.zdf.de/nachrichten/politik + # - title: ZDFheute (Wirtschaft) + # url: https://www.zdf.de/rss/zdf/nachrichten/wirtschaft + # web: https://www.zdf.de/nachrichten/wirtschaft + - title: Deutsche Welle (Wirtschaft) + url: https://rss.dw.com/atom/rss-de-eco + web: https://www.dw.com/de/wirtschaft/s-1503 + - title: RND (Wirtschaft) + url: https://www.rnd.de/arc/outboundfeeds/rss/category/wirtschaft/ + web: https://www.rnd.de/wirtschaft/ + - title: RND (Politik) + url: https://www.rnd.de/arc/outboundfeeds/rss/category/politik/ + web: https://www.rnd.de/politik/ + - title: nd (Politik) + url: https://www.nd-aktuell.de/rss/politik.xml + web: https://www.nd-aktuell.de/rubrik/politik/ + - title: nd (Wirtschaft) + url: https://www.nd-aktuell.de/rss/wirtschaft-umwelt.xml + web: https://www.nd-aktuell.de/rubrik/wirtschaft/ + - title: Taz (Politik) + url: https://taz.de/Politik/!p4615;rss/ + web: https://taz.de/Politik/!p4615/ + - title: Taz (Öko) + url: https://taz.de/Oeko/!p4610;rss/ + web: https://taz.de/Oeko/!p4610/ diff --git a/perlanetrc/02_tide.yaml b/perlanetrc/02_tide.yaml @@ -0,0 +1,75 @@ +title: Tide +description: News, long reads and debate with low frequency. +url: https://news.jayvii.de/tide.html +entries: 500 +entries_per_feed: 20 +entries_sort_order: "issued" +entries_age: 259200 +author: + name: JayVii + email: jayvii+newsplanet[AT]posteo[DOT]de +opml_file: tide.opml.xml +page: + file: tide.html + template: templates/index.tt +feed: + file: tide.xml + format: RSS +manifest: + file: assets/manifest.json +cache_dir: /tmp/newsplanet/tide +feeds: + - title: Der Freitag (Grünes Wissen) + url: https://www.freitag.de/gruenes-wissen/@@RSS + web: https://www.freitag.de/gruenes-wissen/ + - title: Der Freitag (Politik) + url: https://www.freitag.de/politik/@@RSS + web: https://www.freitag.de/politik/ + - title: Der Freitag (Wirtschaft) + url: https://www.freitag.de/wirtschaft/@@RSS + web: https://www.freitag.de/wirtschaft/ + - title: WOZ (International) + url: https://www.woz.ch/t/international/feed/ + web: https://www.woz.ch/t/international/ + - title: ND (Commune) + url: https://www.nd-aktuell.de/rss/nd-commune.xml + web: https://www.nd-aktuell.de/rubrik/nd-commune + - title: Blätter + url: https://www.blaetter.de/rss.xml + web: https://www.blaetter.de/ + - title: Correctiv (Wirtschaft) + url: https://correctiv.org/wirtschaft/feed/ + web: https://correctiv.org/wirtschaft/ + - title: Correctiv (Europa) + url: https://correctiv.org/europa-aktuelles/feed/ + web: https://correctiv.org/europa-aktuelles/ + - title: JACOBIN (DE) + url: https://jacobin.de/rss.xml + web: https://jacobin.de/ + - title: Surplus + url: https://www.surplusmagazin.de/rss/ + web: https://www.surplusmagazin.de/ + - title: NOEMAMAG + url: https://www.noemamag.com/?feed=noemarss + web: https://www.noemamag.com/ + - title: Missy (Politik und Protest) + url: https://missy-magazine.de/blog/category/politik-und-protest/feed/ + web: https://missy-magazine.de/blog/category/politik-und-protest/ + - title: an.schläge + url: https://anschlaege.at/feed/ + web: https://anschlaege.at/ + - title: Analyse und Kritik + url: https://www.akweb.de/feed/ + web: https://www.akweb.de/ + - title: Rosa Luxemburg + url: https://zeitschrift-luxemburg.de/rss.xml + web: https://zeitschrift-luxemburg.de/ + - title: New Left Review + url: https://newleftreview.org/feed + web: https://newleftreview.org/ + - title: Monthly Review + url: https://monthlyreview.org/feed/ + web: https://monthlyreview.org/ + - title: Le Monde (EN) + url: https://www.lemonde.fr/en/rss/une.xml + web: https://www.lemonde.fr/en/ diff --git a/perlanetrc/99_net.yaml b/perlanetrc/99_net.yaml @@ -0,0 +1,36 @@ +title: Net +description: News from the inference between IT and politics. +url: https://news.jayvii.de/net.html +entries: 500 +entries_per_feed: 25 +entries_sort_order: "issued" +entries_age: 259200 +author: + name: JayVii + email: jayvii+newsplanet[AT]posteo[DOT]de +opml_file: net.opml.xml +page: + file: net.html + template: templates/index.tt +feed: + file: net.xml + format: RSS +manifest: + file: assets/manifest.json +cache_dir: /tmp/newsplanet/net +feeds: + - title: Netzpolitik.ORG + url: https://netzpolitik.org/feed/ + web: https://netzpolitik.org + - title: Heise Online + url: https://www.heise.de/rss/heise-Rubrik-Netzpolitik-atom.xml + web: https://www.heise.de/newsticker/netzpolitik/ + - title: Golem + url: https://rss.golem.de/rss.php?feed=RSS1.0&ms=netzpolitik + web: https://www.golem.de/specials/netzpolitik/ + - title: Taz (Netzökonomie) + url: https://taz.de/Oeko/Netzoekonomie/!p4627;rss/ + web: https://taz.de/Oeko/Netzoekonomie/!p4627/ + - title: Disconnect + url: https://disconnect.blog/feed + web: https://disconnect.blog/ diff --git a/perlanetrc/mini-flash.yaml b/perlanetrc/mini-flash.yaml @@ -0,0 +1,21 @@ +title: Flash +description: Breaking news. +url: https://news.jayvii.de/flash.html +entries: 500 +entries_per_feed: 4 +entries_sort_order: "issued" +entries_age: 21600 +author: + name: JayVii + email: jayvii+newsplanet[AT]posteo[DOT]de +page: + file: flash.mini.html + template: templates/mini.tt +feed: + file: flash.mini.xml + format: RSS +feeds: + - title: Flash + url: file:./flash.xml + web: https://news.jayvii.de/flash.html + diff --git a/rewrite.txt b/rewrite.txt @@ -1 +0,0 @@ - diff --git a/run.sh b/run.sh @@ -1,76 +0,0 @@ -#!/usr/bin/env sh - -# fetch input config file, fall back to "centre" -if [ -z $1 ]; then - CONFIG="01_pulse.yaml" -else - CONFIG="$1" -fi - -# Gather various information from config file -printf "Gather information from ${CONFIG}...\n" -HTML=`grep -E '^\s+file:.*?\.html\s*$' "$CONFIG" | awk '{ print $NF }'` -XML=`grep -E '^\s+file:.*?\.xml\s*$' "$CONFIG" | awk '{ print $NF }'` -OPML=`grep -E '^opml_file:.*?\.xml\s*$' "$CONFIG" | awk '{ print $NF }'` -TITLES=`grep -E "^\s*-*\ title:" "$CONFIG" | sed -e 's/^.*title:\ //g'` -# URLS=`grep -E "^\s*-*\ url:" "$CONFIG" | sed -e 's/^.*url:\ //g'` -WEBS=`grep -E "^\s*-*\ web:" "$CONFIG" | sed -e 's/^.*web:\ //g'` -NFEEDS=`echo "$TITLES" | wc -l` - -# Generate site -printf "Fetching feeds and generating html...\n" -perlanet "$CONFIG" - -# remove images and iframes from article previews -printf "Removing images and iframes...\n" -sed -E -e 's/<img[^>]*>//g' -e 's/<iframe[^>]*>//g' \ - -e 's/<figure[^>]*>//g' -e 's/<\/figure>//g' -i "$HTML" - -# remove linebreaks and empty paragraphs as well as inline-links ("more...") -printf "Clean up HTML...\n" -sed -E \ - -e 's/<br[^a-z]*[^>]*>//g' \ - -e 's/<p[^a-z]*[^>]*><\/p>//g' \ - -e 's/<a\ [^<]+<\/a><\!--end-->/<\!--end-->/g' \ - -i "$HTML" - -# insert link to rss/xml file -printf "Inserting RSS feed file...\n" -sed -E -e "s/<\!--XML-->/\"$XML\"/g" -i "$HTML" - -# insert link to opml/xml file -printf "Inserting OPML feed file...\n" -sed -E -e "s/<\!--OPML-->/\"$OPML\"/g" -i "$HTML" - -# insert link to manifest JSON file -printf "Inserting manifest file...\n" -MANIFEST=`echo "$HTML" | sed -e 's/html/json/'` -sed -E -e "s/<\!--MANIFEST-->/\"$MANIFEST\"/" -i "$HTML" - -# insert favicon image buttons -# printf "Inserting favicons...\n" -# sed -E -e 's/<\!--IMG\ src=\"https:\/\/([^\/]*)[^\"]*(\"[^>]*>)-->/<img src=\"assets\/site-icons\/\1\2 \1/g' -i "$HTML" - -# insert feed domain -sed -E \ - -e 's/<\!--IMG\ src=\"https:\/\/([^\/]+)[^\"]*(\"[^>]*>)-->/\1/g' \ - -i "$HTML" - -# Insert feeds list -printf "Inserting feeds list...\n" -FEEDS="<ul>" -for i in `seq 1 1 $NFEEDS`; do - TITLE=`echo "$TITLES" | sed -n "${i},${i}p"` - WEB=`echo "$WEBS" | sed -n "${i},${i}p"` - FEEDS="${FEEDS}<li><a rel=\"nofollow\" target=\"_blank\" href=\"${WEB}\">${TITLE}</a></li>" -done -FEEDS=`echo "${FEEDS}</ul>" | sed -e 's/\//\\\\\//g' -ze 's/\n//g'` -sed -E -e "s/<\!--FEEDS-->/$FEEDS/" -i "$HTML" - -# Insert Update time -printf "Inserting update time...\n" -DATE=`date +%c` -sed -E -e "s/<\!--UPDATED-->/${DATE}/" -i "$HTML" - -# Re-download favicons -# ./fetch_favicon.sh "$CONFIG" diff --git a/scripts/run.sh b/scripts/run.sh @@ -0,0 +1,83 @@ +#!/usr/bin/env bash + +# fetch input config file, fall back to "centre" +if [ -z $1 ]; then + config="01_pulse.yaml" +else + config="$1" +fi + +# Gather various information from config file +printf "Gather information from ${config}...\n" +source "./scripts/yaml.sh" > /dev/null +eval "$(parse_yaml ${config})" + +# Generate site +printf "Fetching feeds and generating html...\n" +perlanet "$config" + +# remove images and iframes from article previews +printf "Removing images and iframes...\n" +sed -E -e 's/<img[^>]*>//g' -e 's/<iframe[^>]*>//g' \ + -e 's/<figure[^>]*>//g' -e 's/<\/figure>//g' -i "$page_file" + +# remove linebreaks and empty paragraphs as well as inline-links ("more...") +printf "Clean up HTML...\n" +sed -E \ + -e 's/<br[^a-z]*[^>]*>//g' \ + -e 's/<p[^a-z]*[^>]*><\/p>//g' \ + -e 's/<a\ [^<]+<\/a><\!--end-->/<\!--end-->/g' \ + -i "$page_file" + +# insert link to rss/xml file +printf "Inserting RSS feed file...\n" +sed -E -e "s/<\!--XML-->/\"$feed_file\"/g" -i "$page_file" + +# insert link to opml/xml file +printf "Inserting OPML feed file...\n" +sed -E -e "s/<\!--OPML-->/\"$opml_file\"/g" -i "$page_file" + +# insert link to manifest JSON file +printf "Inserting manifest file...\n" +manifest_file=$(echo "$manifest_file" | sed -e 's/\//\\\//g') +sed -E -e "s/<\!--MANIFEST-->/\"$manifest_file\"/" -i "$page_file" + +# insert feed domains +sed -E \ + -e 's/<\!--DOMAIN\ src=\"https:\/\/([^\/]+)[^\"]*(\"[^>]*>)-->/\1/g' \ + -i "$page_file" + +# Insert feeds list +# printf "Inserting feeds list...\n" +# feeds="<ul>" +# for i in $(seq 0 1 $((${#feeds__title[@]} - 1))); do +# feeds="${feeds}<li><a rel=\"nofollow\" target=\"_blank\" href=\"${feeds__web[$i]}\">${feeds__title[$i]}</a></li>" +# done +# feeds=`echo "${feeds}</ul>" | sed -e 's/\//\\\\\//g' -ze 's/\n//g'` +# sed -E -e "s/<\!--FEEDS-->/$feeds/" -i "$page_file" + +# Insert Update time +printf "Inserting update time...\n" +now=`date +%c` +sed -E -e "s/<\!--UPDATED-->/${now}/" -i "$page_file" + +# mark posts older than threshold as "inactive" +printf "Mark older posts as inactive...\n" +dates=$(grep "<section data=" $page_file | sed -E -e 's/^.*?"([^"]+)".*$/\1/g') +now=$(date +%s) +for date in $dates; do + secs=$(date +%s --date "$date") + if [ $(($now - $secs)) -gt $entries_age ]; then + sed -E -e "s/(<section data=\"$date\")/\1 class=\"inactive\"/g" \ + -i $page_file + fi +done + +# insert important feed at the top +if [ ! -z $sub_feed_file ]; then + printf "Insert sub-feed if there are active entries...\n" + if [ $(grep "<section" $sub_feed_file | grep -cv "inactive") -gt 0 ]; then + sub_feed_injection="<blockquote><strong>$sub_feed_title<\/strong><iframe class=\"subfeed\" src=\"$sub_feed_file\"><\/iframe><\/blockquote>" + sed -e "s/<\!--SUBFEED-->/$sub_feed_injection/g" -i $page_file + fi +fi diff --git a/scripts/yaml.sh b/scripts/yaml.sh @@ -0,0 +1,76 @@ +#!/usr/bin/env bash +# shellcheck disable=SC1003 + +# Based on https://gist.github.com/pkuczynski/8665367 + +parse_yaml() { + local yaml_file=$1 + local prefix=$2 + local s + local w + local fs + + s='[[:space:]]*' + w='[a-zA-Z0-9_.-]*' + fs="$(echo @ | tr @ '\034')" + + ( + sed -e '/- [^\“]'"[^\']"'.*: /s|\([ ]*\)- \([[:space:]]*\)|\1-\'$'\n'' \1\2|g' | + sed -ne '/^--/s|--||g; s|\"|\\\"|g; s/[[:space:]]*$//g;' \ + -e 's/\$/\\\$/g' \ + -e "/#.*[\"\']/!s| #.*||g; /^#/s|#.*||g;" \ + -e "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \ + -e "s|^\($s\)\($w\)${s}[:-]$s\(.*\)$s\$|\1$fs\2$fs\3|p" | + awk -F"$fs" '{ + indent = length($1)/2; + if (length($2) == 0) { conj[indent]="+";} else {conj[indent]="";} + vname[indent] = $2; + for (i in vname) {if (i > indent) {delete vname[i]}} + if (length($3) > 0) { + vn=""; for (i=0; i<indent; i++) {vn=(vn)(vname[i])("_")} + printf("%s%s%s%s=(\"%s\")\n", "'"$prefix"'",vn, $2, conj[indent-1], $3); + } + }' | + sed -e 's/_=/+=/g' | + awk 'BEGIN { + FS="="; + OFS="=" + } + /(-|\.).*=/ { + gsub("-|\\.", "_", $1) + } + { print }' + ) <"$yaml_file" +} + +unset_variables() { + # Pulls out the variable names and unsets them. + #shellcheck disable=SC2048,SC2206 #Permit variables without quotes + local variable_string=($*) + unset variables + variables=() + for variable in "${variable_string[@]}"; do + tmpvar=$(echo "$variable" | grep '=' | sed 's/=.*//' | sed 's/+.*//') + variables+=("$tmpvar") + done + for variable in "${variables[@]}"; do + if [ -n "$variable" ]; then + unset "$variable" + fi + done +} + +create_variables() { + local yaml_file="$1" + local prefix="$2" + local yaml_string + yaml_string="$(parse_yaml "$yaml_file" "$prefix")" + unset_variables "${yaml_string}" + eval "${yaml_string}" +} + +# Execute parse_yaml() direct from command line + +if [ "x" != "x${1}" ] && [ "x--debug" != "x${1}" ]; then + parse_yaml "${1}" "${2}" +fi diff --git a/template.tt b/template.tt @@ -1,112 +0,0 @@ -<!-- SPDX-License-Identifier: AGPL-3.0-or-later - SPDX-FileCopyrightText: 2021-2024 JayVii <jayvii[AT]posteo[DOT]de> ---> - -<!DOCTYPE html> -<html> - <head> - <meta charset="utf-8"> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <title>[% feed.title %]</title> - <meta name="description" content="[% feed.description %]"> - [% IF feed.author %] - <meta name="author" content="[% feed.author %]"> - [% END %] - <link rel="icon" type="image/png" href="assets/favicon.png"> - <link rel="icon" type="image/png" sizes="16x16" href="assets/favicon_16.png"> - <link rel="icon" type="image/png" sizes="32x32" href="assets/favicon_32.png"> - <link rel="icon" type="image/png" sizes="64x64" href="assets/favicon_64.png"> - <link rel="icon" type="image/png" sizes="128x128" href="assets/favicon_128.png"> - <link rel="apple-touch-icon" href="assets/favicon.png"> - <link rel="stylesheet" type="text/css" href="assets/css/simple.min.css"> - <link rel="stylesheet" type="text/css" href="assets/css/custom.css"> - <script async src="assets/js/mark_as_old.js"></script> - <link rel="alternate" title="[%feed.title %]" type="application/atom+xml" href="rss.xml"> - <link crossorigin="use-credentials" rel="manifest" href=<!--MANIFEST-->> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <meta name="robots" content="noindex"> - </head> - - <body onload="check_articles();"> - - <header> - <nav> - <!-- "Overview" --> - <a href="/">Overview</a> - <!-- RSS Button --> - <a href=<!--XML-->>RSS</a> - <!-- OPML Button --> - <a href=<!--OPML-->>OPML</a> - <!-- Privacy Policy --> - <a href="https://www.jayvii.de/privacy/#newsjayviide" target="_blank"> - Privacy - </a> - </nav> - <!-- Feed Title --> - <h1>[% feed.title | html %]</h1> - <p>[% feed.description | html %]</p> - </header> - - <main> - - <!-- - This is updated by find-and-replace - WORKAROUND: [% feed.modified %] is hardcoded to UTC - --> - <p> - <!--UPDATED--> - </p> - - <!-- This is updated by find-and-replace--> - <details> - <summary style="width:100%;">Feeds</summary> - <div class="button-row"> - <a href=<!--XML--> class="button" title="Subscribe to all these feeds via your own RSS reader">Subscribe via RSS</a> - <a href=<!--OPML--> class="button" title="Import all these feeds into your own RSS reader">Download OPML</a> - </div> - - <div style="margin-left:1em;"> - <!--FEEDS--> - </div> - </details> - - <!-- Content Entries --> - [% FOREACH entry IN feed.entries %] - <section data="[% entry.issued | html %]"> - <h3> - <a href="[% entry.link | url | html %]" target="_blank" rel="nofollow"> - [% entry.title | html %] - </a> - </h3> - <div class="article_content"> - [% IF entry.summary.body %] - <p><!--start-->[% entry.summary.body %]<!--end--></p> - [% ELSE %] - <!--start-->[% entry.content.body %]<!--end--> - [% END %] - </div> - - <div class="button-row"> - <a - class="button" - target="_blank" - rel="nofollow" - href="[% entry.link | url | html %]" - style="width:auto;min-width:65px;" - > - <!-- leave ALT empty because the text is right next to it --> - <!--IMG src="[% entry.link | url | html %]" alt="">--> - </a> - [% IF entry.issued %] - <stretch class="button"> - [% entry.issued | html %] - </stretch> - [% END %] - </div> - - </section> - [% END %] - - </main> - </body> -</html> diff --git a/templates/index.tt b/templates/index.tt @@ -0,0 +1,114 @@ +<!-- SPDX-License-Identifier: AGPL-3.0-or-later + SPDX-FileCopyrightText: 2021-2024 JayVii <jayvii[AT]posteo[DOT]de> +--> + +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>[% feed.title %]</title> + <meta name="description" content="[% feed.description %]"> + [% IF feed.author %] + <meta name="author" content="[% feed.author %]"> + [% END %] + <link rel="icon" type="image/png" href="assets/favicon.png"> + <link rel="icon" type="image/png" sizes="16x16" href="assets/favicon_16.png"> + <link rel="icon" type="image/png" sizes="32x32" href="assets/favicon_32.png"> + <link rel="icon" type="image/png" sizes="64x64" href="assets/favicon_64.png"> + <link rel="icon" type="image/png" sizes="128x128" href="assets/favicon_128.png"> + <link rel="apple-touch-icon" href="assets/favicon.png"> + <link rel="stylesheet" type="text/css" href="assets/css/simple.min.css"> + <link rel="stylesheet" type="text/css" href="assets/css/custom.css"> + <link rel="alternate" title="[%feed.title %]" type="application/atom+xml" href="<!--XML-->"> + <link rel="alternate" title="[%feed.title %]" type="application/opml+xml" href="<!--OPML-->"> + <link crossorigin="use-credentials" rel="manifest" href="<!--MANIFEST-->"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="robots" content="noindex"> + </head> + + <body onload="check_articles();"> + + <header> + <nav> + <!-- "Overview" --> + <a href="/">Overview</a> + <!-- RSS Button --> + <a href="<!--XML-->" title="Subscribe to all these feeds via your own RSS reader">RSS</a> + <!-- OPML Button --> + <a href="<!--OPML-->" title="Import all these feeds into your own RSS reader">OPML</a> + <!-- Privacy Policy --> + <a href="https://www.jayvii.de/privacy/#newsjayviide" target="_blank"> + Privacy + </a> + </nav> + <!-- Feed Title --> + <h1>[% feed.title | html %]</h1> + <p>[% feed.description | html %]</p> + </header> + + <main> + + <!-- + This is updated by find-and-replace + WORKAROUND: [% feed.modified %] is hardcoded to UTC + --> + <p> + <!--UPDATED--> + </p> + + <!-- This is updated by find-and-replace--> + <!-- <details> --> + <!-- <summary style="width:100%;">Feeds</summary> --> + <!-- <div class="button-row"> --> + <!-- <a href=<!--XML--> class="button" title="Subscribe to all these feeds via your own RSS reader">Subscribe via RSS</a> --> + <!-- <a href=<!--OPML--> class="button" title="Import all these feeds into your own RSS reader">Download OPML</a> --> + <!-- </div> --> + + <div style="margin-left:1em;"> + <!--FEEDS--> + </div> + </details> + + <!-- Sub Feed Entries --> + <!--SUBFEED--> + + <!-- Content Entries --> + [% FOREACH entry IN feed.entries %] + <section data="[% entry.issued | html %]"> + <h3> + <a href="[% entry.link | url | html %]" target="_blank" rel="nofollow"> + [% entry.title | html %] + </a> + </h3> + <div class="article_content"> + [% IF entry.summary.body %] + <p><!--start-->[% entry.summary.body %]<!--end--></p> + [% ELSE %] + <!--start-->[% entry.content.body %]<!--end--> + [% END %] + </div> + + <div class="button-row"> + <a + class="button" + target="_blank" + rel="nofollow" + href="[% entry.link | url | html %]" + style="width:auto;min-width:65px;" + > + <!--DOMAIN src="[% entry.link | url | html %]" alt="">--> + </a> + [% IF entry.issued %] + <stretch class="button"> + [% entry.issued | html %] + </stretch> + [% END %] + </div> + + </section> + [% END %] + + </main> + </body> +</html> diff --git a/templates/mini.tt b/templates/mini.tt @@ -0,0 +1,66 @@ +<!-- SPDX-License-Identifier: AGPL-3.0-or-later + SPDX-FileCopyrightText: 2021-2024 JayVii <jayvii[AT]posteo[DOT]de> +--> + +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>[% feed.title %]</title> + <meta name="description" content="[% feed.description %]"> + [% IF feed.author %] + <meta name="author" content="[% feed.author %]"> + [% END %] + <link rel="icon" type="image/png" href="assets/favicon.png"> + <link rel="icon" type="image/png" sizes="16x16" href="assets/favicon_16.png"> + <link rel="icon" type="image/png" sizes="32x32" href="assets/favicon_32.png"> + <link rel="icon" type="image/png" sizes="64x64" href="assets/favicon_64.png"> + <link rel="icon" type="image/png" sizes="128x128" href="assets/favicon_128.png"> + <link rel="apple-touch-icon" href="assets/favicon.png"> + <link rel="stylesheet" type="text/css" href="assets/css/simple.min.css"> + <link rel="stylesheet" type="text/css" href="assets/css/custom.css"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="robots" content="noindex"> + <style> + section { + margin-top: 0px; + margin-bottom: 1em; + padding-bottom: 1em; + } + .inactive { + display: none; + } + </style> + </head> + + <body> + + <main> + + <!-- Content Entries --> + [% FOREACH entry IN feed.entries %] + <section data="[% entry.issued | html %]"> + <a + target="_blank" + rel="nofollow" + href="[% entry.link | url | html %]" + > + <strong>[% entry.title | html %]</strong> + </a> + <div style="width:100%;"> + <mark> + <!--DOMAIN src="[% entry.link | url | html %]" alt="">--> + </mark> + [% IF entry.issued %] + <mark style="margin-left:0.5em;"> + [% entry.issued | html %] + </mark> + [% END %] + </div> + </section> + [% END %] + + </main> + </body> +</html>