4 files changed, 47 insertions, 13 deletions

diff --git a/nginx/sites-available/vps b/nginx/sites-available/vps
index afc5714..b2e40f2 100644
--- a/nginx/sites-available/vps
+++ b/nginx/sites-available/vps
@@ -76,6 +76,10 @@ server {
     error_log /tmp/cgi info;
   }
 
+  location ^~ /links/feeds/ {
+    alias /srv/rss/feeds/;
+  }
+
   location ~ [^/]$ {
     try_files $uri @rewrite_no_slash;
   }
@@ -85,13 +89,13 @@ server {
     rewrite ^(.+)$ $1.html permanent;
   }
 
-  location ~ /$ {
-    try_files $uri @rewrite_slash;
-  }
+  #location ~ /$ {
+  #  try_files $uri @rewrite_slash;
+  #}
 
-  location @rewrite_slash {
-    rewrite ^(.+)/$ $1.html permanent;
-  }
+  #location @rewrite_slash {
+  #  rewrite ^(.+)/$ $1.html permanent;
+  #}
 
   rewrite ^/posts$ /posts/ permanent;
   location = /posts/ {
diff --git a/www/Makefile b/www/Makefile
index 699abb2..d54081b 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -4,10 +4,15 @@ ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 # build html files for public/
 build:
         cd $(ROOT_DIR)
-        @input_dir=~/log/public \
-        output_dir=/srv/http \
-        scripts/build.sh
+        export input_dir=~/log/public
+        export output_dir=/srv/http
+        @scripts/build.sh
 
 # Migrage frontmatter from '---' to HTML comment '<!-- -->'
 frontmatter:
         find content -type f -name '*.md' | xargs sed -i ':frontmatter { 1s/^---/<!--/; 1!s/^---/-->/; 1!b}; /^---/ {1b frontmatter}'
+
+rss:
+        cd /srv/rss
+        export LIST=~/log/public/links/rss.list
+        $(ROOT_DIR)/scripts/update-feeds.sh
diff --git a/www/scripts/update-feeds.sh b/www/scripts/update-feeds.sh
new file mode 100755
index 0000000..8dff837
--- /dev/null
+++ b/www/scripts/update-feeds.sh
@@ -0,0 +1,28 @@
+#! /bin/bash
+
+cd /srv/rss
+mkdir -p feeds
+
+LIST=${LIST:?}
+curlOpts='--insecure'
+
+cat "${LIST}" | while read url interval tags; do
+  feed=feeds/${url//\//%2F}
+  unset next_fetch; declare -i next_fetch=0
+
+  # Get time of next fetch
+  if [ -f $feed ]; then
+    interval=$(<<<"$interval" sed 's/m/minute/; s/h/hour/; s/d/day/;')
+    next_fetch=$(date -d "$(date -r $feed) + $interval" +'%s')
+  fi
+
+  # Do not fetch feed if interval covers current time
+  [ $(date +'%s') -lt $next_fetch ] && continue
+
+  # Set limit of HTTP connections
+  while [ $(jobs -p | wc -l) -ge 10 ]; do
+    sleep 0.5;
+  done
+
+  curl -s $curlOpts $url -o $feed || echo Fail to fetch $url >&2 &
+done
diff --git a/www/templates/header.html b/www/templates/header.html
index a77079a..d5975fd 100644
--- a/www/templates/header.html
+++ b/www/templates/header.html
@@ -4,10 +4,7 @@
     <a href="/about.html" data-tooltip="About this site">About</a> |
     <a href="/posts/">Posts</a> |
     <a href="/projects.html" data-tooltip="Not valid now...">Projects</a> |
-    <!--
-    <a href="/links.html" data-tooltip="Cool sites you might be interested">Links</a>
-    -->
-    <a href="/links.html" data-tooltip="Not valid now...">Links</a>
+    <a href="/links/" data-tooltip="Not valid now...">Links</a>
   </nav>
   <nav class="right">
     <a href="/rss.xml" data-tooltip="Not valid now...">RSS</a> |