Commit all to date.

15 files changed, 781 insertions, 0 deletions

diff --git a/web/biblio-by-month b/web/biblio-by-month
new file mode 100755
index 0000000..ee42044
--- /dev/null
+++ b/web/biblio-by-month
@@ -0,0 +1,207 @@
+#!/usr/bin/env ruby
+
+require 'date'
+
+# TODO: this.
+# Take a file as first argument, which is to be the file biblio.csv, containing
+# all books read. Then formats this as a table. It sorts the books in
+# the order [Ongoing, Completed, Yet to Read], and replaces several values with
+# ones more appropriate for viewing pleasure.
+# For the final column (index: 11, zero-indexed) we replace the contents with a
+# link. So rd/the-progress-of-a-crime becomes
+# For column 3 (Part), this is rounded as special logic.
+# <a href="https://gabbott.dev/rd/the-progress-of-a-crime>Link</a>
+
+require_relative './biblio-require'
+
+if ARGV[0] == nil then 
+  puts "<!-- No argument passed! ma-fmt-tbl Exitting early. -->\n"
+  exit
+end
+
+# def do_header(h: str): str
+# Returns the rows of the table corresponding to the header.
+def do_header(h)
+  s = "\t<tr class=\"header\">\n"
+  values = h.split($delim)
+
+  values.each_with_index do |value, idx|
+    next if idx == 0 or idx == 6 or idx == 7 or idx == 8 or idx == 9
+    s << ("\t\t<th>" + value + "</th>\n")
+  end
+
+  s << "\t</tr>\n"
+  return s
+end
+
+# Make the string look sexy, ooh la la.
+def sexify(val)
+  # Round integers if they end .00.
+  if val.end_with? ".00" then 
+    integral = val.to_i
+    unless integral == 0
+      return integral.to_s
+    end
+  end
+
+  # Transform strings.
+  if $status_transform.has_key? (val)
+    return $status_transform[val]
+  end
+  if $form_transform.has_key? (val)
+    return $form_transform[val]
+  end
+  if $ownership_transform.has_key? (val)
+    return $ownership_transform[val]
+  end
+  if $general_transform.has_key? (val)
+    return $general_transform[val]
+  end
+  return val
+end
+
+
+ret=""
+header=""
+
+# Contains the buckets into which to put the entries.
+unknown = [] # typeof(unknown) == array[str]
+known   = {} # typeof(known)   == Hash[str => array[str]]
+
+def written_month_of(ym)
+  # Takes, e.g. "2023-09" and returns "September 2023". Invariant: entry must 
+  # be of form "YYYY-MM".
+  month = ym[-2..-1]
+  ret = ""
+  month_name = Date::MONTHNAMES[month.to_i]
+  ret << month_name << " " << ym[0..3]
+  return ret
+end
+
+def wrap_entries_in_table(entries, header)
+  # Call after string made of all entries. This fn wraps them into the table.
+  ret = ""
+  ret << "<table class=\"biblio\">\n" \
+      << header \
+      << entries \
+      << "</table>\n"
+
+  return ret
+end
+
+def make_html_entry(entry) 
+  # Makes a singular entry.
+  ret = ""
+  ret << "\t<tr>\n"
+  entry.split($delim).each_with_index do |e, i|
+    next if i == 0 or i == 6 or i == 7 or i == 8 or i == 9
+    e = e.delete "\n"
+    if i == 11 and e != "N/A" then 
+      ret << "\t\t<td class=\"biblio-tr\"><a href=\"" \
+          << ENV["WEBSITE_URL"] \
+          << "/" \
+          << e \
+          << "\">Link</a></td>\n"
+    else
+      ret << "\t\t<td class=\"biblio-tr\">" \
+          << sexify(e) \
+          << "</td>\n"
+    end
+  end
+  
+  ret << "\t</tr>\n"
+  return ret
+end
+
+File.foreach(ARGV[0]).with_index do |line, line_num|
+  # 0. If entry not completed, skip, otherwise ...; [done]
+  # 1. Figure out what month the line corresponds to;
+  # 2. Chuck line into a bucket corresponding to entries in that month;
+  # 3. Sorting that bucket into the right month, and make the table out of the
+  #    entries.
+  if line_num == 0 then # Must go first, otherwise skipped by checks below.
+    header << do_header(line)
+  end
+
+  next if line == "\n" or line == "\t" or line == "" or line == " " or line == $delim
+  next if not line.include? "completed;"
+
+  finished_date = line.split($delim)[5]
+  if finished_date == "" or finished_date == "\t" or finished_date == "N/A" then 
+    unknown = unknown.append line
+  else
+    # Invariant: everything completed is either unknown date, or has at least
+    # a year and a month (but not necessarily a day). We use this, e.g. 
+    # "2023-01", as the index for the month.
+
+    index = finished_date[0..6]
+    # It is possible for the index not to be added here, so if this is the case
+    # just add the index as [] and then we directly append to what we've just 
+    # added.
+    if not known.has_key? (index) 
+      known[index] = []
+    end
+
+    # And now we can append.
+    known[index] = (known[index] << line)
+  end
+end
+
+# Sort hash, so we can simply iterate over it.
+known = known.sort.reverse.to_h
+
+# Make HTML for "Unknown"s
+unknown = unknown.map! { |entry| make_html_entry(entry) }.join ("\n")
+unknown_table = wrap_entries_in_table(unknown, header) # typeof == str
+
+unkn_ret = ""
+unkn_ret << "<h2>Unknown</h2>\n" \
+         << unknown_table
+
+kn_rets = []
+# Make HTML for each month.
+known.each do |key, values|
+  # Here, values is an array of all entries. We want to merge then together,
+  # and thereby get the table.
+  values = values.map! { |value| make_html_entry(value) }.join ("\n")
+  known_table = wrap_entries_in_table(values, header) # typeof == str
+  kn_ret = ""
+  kn_ret << "<h2>" \
+         << written_month_of(key) \
+         << "</h2>\n" \
+         << known_table
+
+  kn_rets = kn_rets.append(kn_ret)
+end
+
+
+
+
+
+
+# File.foreach(ARGV[0]).with_index do |line, line_num| 
+#   next if line == "\n" or line == "\t" or line == "" or line == " " or line == $delim
+# 
+#   # Handle the first line - the header.
+#   if line_num == 0 then 
+#     header << do_header(line)
+#   else
+#     # We need to figure out whether it is ongoing, completed, or yet to read.
+#     # To do this, we will check if the corresponding string is in the line.
+#     if line.include? "completed;" then 
+#       target = table_cmp 
+#     elsif line.include? "ongoing;" then 
+#       target = table_ongoing
+#     elsif line.include? "dropped;" then 
+#       target = table_drp
+#     else
+#       target = table_rest
+#     end
+# 
+#   end
+# end
+
+# Echo the file. 
+
+puts kn_rets
+puts unkn_ret
diff --git a/web/biblio-fmt-tbl b/web/biblio-fmt-tbl
new file mode 100755
index 0000000..0296e8b
--- /dev/null
+++ b/web/biblio-fmt-tbl
@@ -0,0 +1,181 @@
+#!/usr/bin/env ruby
+# Take a file as first argument, which is to be the file biblio.csv, containing
+# all books read. Then formats this as a table. It sorts the books in
+# the order [Ongoing, Completed, Yet to Read], and replaces several values with
+# ones more appropriate for viewing pleasure.
+# For the final column (index: 11, zero-indexed) we replace the contents with a
+# link. So rd/the-progress-of-a-crime becomes
+# For column 3 (Part), this is rounded as special logic.
+# <a href="https://gabbott.dev/rd/the-progress-of-a-crime>Link</a>
+
+require_relative './biblio-require'
+
+
+
+if ARGV[0] == nil then 
+  puts "<!-- No argument passed! ma-fmt-tbl Exitting early. -->\n"
+  exit
+end
+
+# def do_header(h: str): str
+# Returns the rows of the table corresponding to the header.
+def do_header(h)
+  s = "\t<tr class=\"header\">\n"
+  values = h.split($delim)
+
+  values.each_with_index do |value, idx|
+    next if idx == 0 or idx == 7 or idx == 8 or idx == 9
+    s << ("\t\t<th>" + value + "</th>\n")
+  end
+
+  s << "\t</tr>\n"
+  return s
+end
+
+# Make the string look sexy, ooh la la.
+def sexify(val)
+  # Round integers if they end .00.
+  if val.end_with? ".00" then 
+    integral = val.to_i
+    unless integral == 0
+      return integral.to_s
+    end
+  end
+
+  # Transform strings.
+  if $status_transform.has_key? (val)
+    return $status_transform[val]
+  end
+  if $form_transform.has_key? (val)
+    return $form_transform[val]
+  end
+  if $ownership_transform.has_key? (val)
+    return $ownership_transform[val]
+  end
+  if $general_transform.has_key? (val)
+    return $general_transform[val]
+  end
+  return val
+end
+
+
+# The tables, which are set as targets during the look
+table=""
+table_ongoing=""
+table_cmp="" # Just contains completed entries.
+table_paused=""
+table_drp=""
+table_rest=""
+table_coll=""
+
+# And the counts, for adding in counts if I want
+ctable_ongoing=0
+ctable_cmp=0
+ctable_paused=0
+ctable_drp=0
+ctable_rest=0
+ctable_coll=0
+
+# And the header, don't forget!
+header=""
+
+File.foreach(ARGV[0]).with_index do |line, line_num| 
+  next if line == "\n" or line == "\t" or line == "" or line == " " or line == $delim
+
+  # Handle the first line - the header.
+  if line_num == 0 then 
+    header << do_header(line)
+  else
+    # We need to figure out whether it is ongoing, completed, or yet to read.
+    # To do this, we will check if the corresponding string is in the line.
+    if line.include? "completed;" then 
+      target = table_cmp 
+      ctable_cmp += 1
+    elsif line.include? "ongoing;" then 
+      target = table_ongoing
+      ctable_ongoing += 1
+    elsif line.include? "paused;" then 
+      target = table_paused
+      ctable_paused += 1
+    elsif line.include? "dropped;" then 
+      target = table_drp
+      ctable_drp += 1
+    elsif line.include? "collection;" then
+      target = table_coll
+      ctable_coll += 1
+    else
+      target = table_rest
+      ctable_rest += 1
+    end
+
+    target << "\t<tr>\n"
+    line.split($delim).each_with_index do |entry, idx|
+      # We want to skip: Status, Ownership, Bought, Cost as they just take up
+      # space. Here we are skipping by the relevant index.
+      next if idx == 0 or idx == 7 or idx == 8 or idx == 9
+
+      entry = entry.delete "\n"
+      if idx == 11 and entry != "N/A" then 
+        # Review column: transform it to contain a link.
+        target << "\t\t<td class=\"biblio-tr\"><a href=\"" \
+               << ENV["WEBSITE_URL"] \
+               << "/" \
+               << entry \
+               << "\">Link</a></td>\n" 
+      else
+        target << "\t\t<td class=\"biblio-tr\">" \
+               << sexify(entry) \
+               << "</td>\n"
+      end
+    end
+    target << "\t</tr>\n"
+  end
+end
+
+# Instead of one table, split into <h2>Currently Reading</h2><table></table>, 
+# <h2>Completed</h2><table></table> and <h2>Not read or
+# reference</h2><table></table>.
+table << "<h2>Currently Reading</h2>\n"
+table << "<p>There are " << ctable_ongoing.to_s << " entries in this table.</p>\n"
+table << "<table class=\"biblio\">\n"
+table << header
+table << table_ongoing
+table << "</table>\n\n"
+
+table << "<h2>Completed</h2>\n"
+table << "<p>There are " << ctable_cmp.to_s << " entries in this table.</p>\n"
+table << "<table class=\"biblio\">\n"
+table << header
+table << table_cmp
+table << "</table>\n\n"
+
+table << "<h2>Paused</h2>\n"
+table << "<p>There are " << ctable_paused.to_s << " entries in this table.</p>\n"
+table << "<table class=\"biblio\">\n"
+table << header
+table << table_paused
+table << "</table>\n\n"
+
+table << "<h2>Collections of Works</h2>\n"
+table << "<table class=\"biblio\">\n"
+table << header
+table << table_coll
+table << "</table>\n\n"
+
+table << "<h2>Dropped</h2>\n"
+table << "<p>There are " << ctable_drp.to_s << " entries in this table.</p>\n"
+table << "<table class=\"biblio\">\n"
+table << header
+table << table_drp
+table << "</table>\n\n"
+
+table << "<h2>Not read or reference</h2>\n"
+table << "<p>There are " << ctable_rest.to_s << " entries in this table.</p>\n"
+table << "<table class=\"biblio\">\n"
+table << header
+table << table_rest
+table << "</table>\n\n"
+
+# Echo the file. 
+puts table
+
diff --git a/web/biblio-require.rb b/web/biblio-require.rb
new file mode 100755
index 0000000..65ca235
--- /dev/null
+++ b/web/biblio-require.rb
@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+$status_transform = {
+  "yet-to-read" => "Not yet read",
+  "completed" => "Completed",
+  "ordered" => "On Order",
+  "ongoing" => "Currently Reading",
+  "reference" => "Reference",
+  "not-owned" => "Not owned.",
+  "dropped" => "Dropped",
+  "collection" => "Collection",
+  "paused" => "Paused"
+}
+
+$form_transform = {
+  "audiobook" => "Audiobook",
+  "physical" => "Physical Book",
+  "virtual" => "PDF", # Deprecated attribute - use pdf instead.
+  "pdf" => "PDF",
+  "epub" => "EPUB",
+  "light-novel" => "LN",
+  "manga" => "Manga"
+
+}
+
+$ownership_transform = {
+  "owned" => "Owned",
+  "borrowed" => "Borrowed",
+  "not-owned" => "Not owned"
+}
+
+$general_transform = {
+  "N/A" => ""
+}
+
+$delim = ";"
diff --git a/web/bsu b/web/bsu
new file mode 100755
index 0000000..d00dee8
--- /dev/null
+++ b/web/bsu
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Bring Sally Up: make an update to Bring Sally Up, and it will create a commit 
+# for that change. It won't push without `-u`, in case the commit can be
+# amended.
+
+FILEPATH="$HOME/web/www/gabbott.dev/gabbott.dev/blog/pushups/bring-sally-up.html"
+ORIGHASH="$(sha256sum "$FILEPATH")"
+
+nvim "$FILEPATH"
+if [ "$(sha256sum "$FILEPATH")" = "$ORIGHASH" ] ; then
+	echo "No changes made, hence no commit will be made"
+	exit 0
+else 
+	git commit -m "Bring Sally Up: entry for $(date +%Y-%m-%d)"
+	# TODO: handle `-u`.
+fi
+
+
diff --git a/web/fmt-as-table b/web/fmt-as-table
new file mode 100755
index 0000000..c7064b5
--- /dev/null
+++ b/web/fmt-as-table
@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+# fmt-as-table ORIGIN HEADER OPTION
+# ORIGIN: the file to format as a table. Each row must be newline-delimited, 
+#         and each column tab-delimited. Anything following a # is treated as 
+#         a comment and ignored.
+# HEADER: the headers. This must be passed as a single string with each column
+#         tab-delimited.
+# OPTION: a string specifying output format options, comma-delimited. Currently
+# supported are: 
+#       collapsible(summary)  Create a <details> tag surrounding it, to make
+#                             the table collapsible. `summary` must be a string
+#                             which contains the text to place in the <summary>
+#                             tag of the <details>.
+
+
+if ARGV[0] == nil or ARGV[1] == nil then 
+  puts "No argument passed! Exitting early.\n"
+  exit
+end
+
+## Handle options
+is_collapsible = false
+collapsible_summary = ""
+
+
+
+option=""
+if ARGV[2] != nil then 
+  option=ARGV[2]
+end
+
+options=option.split ","
+options.each do |opt| 
+  if opt[0..10] == "collapsible" then 
+    is_collapsible = true
+    collapsible_summary = opt.split("(")[1].split(")")[0]
+  end
+end
+
+table=""
+
+if is_collapsible then
+  table << "<details>\n"
+  table << "<summary>" << collapsible_summary << "</summary>\n"
+end
+
+# Sort out the header.
+table << "<table>\n"
+table << "\t<tr class=\"header\">\n"
+ARGV[1].split("\t").each do |entry|
+  table << ("\t\t<th>" + entry + "</th>\n")
+end
+table << "\t</tr>\n\n"
+
+# Now sort out the actual file.
+
+File.foreach(ARGV[0]).with_index do |line, line_num| 
+  next if line[0] == '#'
+  next if line == "\n" or line == "\t" or line == ""
+  table << "\t<tr>\n"
+  line.split("\t").each do |entry|
+    table << ("\t\t<td>" + entry.delete("\n") + "</td>\n")
+  end
+  table << "\t</tr>\n"
+end
+
+table << "</table>\n"
+
+if is_collapsible then 
+  table << "</details>"
+end
+
+# Echo the file. 
+puts table
+
diff --git a/web/links b/web/links
new file mode 100755
index 0000000..534ab9b
--- /dev/null
+++ b/web/links
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Edit links.
+
+nvim "$WEBSITE_PATH/links.html"
+ws-push
diff --git a/web/ma-fmt-tbl b/web/ma-fmt-tbl
new file mode 100755
index 0000000..639ecf1
--- /dev/null
+++ b/web/ma-fmt-tbl
@@ -0,0 +1,73 @@
+#!/usr/bin/env ruby
+# Takes a file as first argument, and formats that table which should
+# be in tab delimited form with optional comment lines beginning with # 
+# into a table for HTML.
+# The second argument is a known quantity - because we also need to calculate
+# the final fields of each entry.
+
+def kph(time)
+  time = time.to_i
+  time_h = time / (60.0 * 60.0)
+  distance = 0.47
+  return distance / time_h
+end
+
+def mph(time)
+  return kph(time) * 0.6213712
+end
+
+if ARGV[0] == nil then 
+  puts "<!-- No argument passed! ma-fmt-tbl Exitting early. -->\n"
+  exit
+end
+
+
+table=""
+
+# Sort out the header.
+table << "<table>\n"
+table << "\t<tr class=\"header\">\n"
+table << "\t\t<th>Date</th>\n"
+table << "\t\t<th>Set</th>\n"
+table << "\t\t<th>Time Taken (s)</th>\n"
+table << "\t\t<th>Heart Rate (bpm)</th>\n"
+table << "\t\t<th>Stops</th>\n"
+table << "\t\t<th>Begin Time</th>\n"
+table << "\t\t<th>End Time</th>\n"
+table << "\t\t<th>Kph</th>\n"
+table << "\t\t<th>Mph</th>\n"
+table << "\t</tr>\n"
+
+
+# Now sort out the actual file.
+
+File.foreach(ARGV[0]).with_index do |line, line_num| 
+  next if line[0] == '#'
+  next if line == "\n" or line == "\t" or line == "" or line == " "
+  table << "\t<tr>\n"
+  line.split("\t").each do |entry|
+    table << ("\t\t<td>" + entry.delete("\n") + "</td>\n")
+  end
+
+  splits = line.split("\t")
+  splits_len = splits.length
+  time = splits[2]
+  kph_v = kph(time)
+  mph_v = mph(time)
+  while splits_len < 7
+    # In case any entries are missing, pad to that amount.
+    table << "\t\t<td></td>\n"
+    splits_len += 1
+  end
+
+  table << ("\t\t<td>" + kph_v.round(2).to_s + "</td>\n")
+  table << ("\t\t<td>" + mph_v.round(2).to_s + "</td>\n")
+
+  table << "\t</tr>\n"
+end
+
+table << "</table>\n"
+
+# Echo the file. 
+puts table
+
diff --git a/web/mkblog b/web/mkblog
new file mode 100755
index 0000000..ea91535
--- /dev/null
+++ b/web/mkblog
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Make a blog entry. Either a new entry, or edit an existing entry.
+
+
+TEMPLATE="$BLOG_PATH/template.html"
+ENTRIES_DIR="$BLOG_PATH/entries"
+FILE="$ENTRIES_DIR/$1.html"
+
+# Handle if no parameters passed. #
+if [ -z "$1" ] ; then
+	nvim "$ENTRIES_DIR"
+	exit 0
+fi
+
+# If parameter passed. # 
+if [ ! -f "$FILE" ] ; then 
+	# We have a new blog entry. Copy template and edit that.
+	cp "$TEMPLATE" "$FILE"
+	nvim "$FILE"
+else
+	nvim "$FILE"
+fi
diff --git a/web/mount-ave b/web/mount-ave
new file mode 100755
index 0000000..e3b9ad9
--- /dev/null
+++ b/web/mount-ave
@@ -0,0 +1,34 @@
+#!/bin/sh
+# Updates the Mount Avenue tracker - to do this, an entry must be made in 
+# trk/mount-avenue, and then this is copied over to the website where a new 
+# entry is made, by replacing the contents of <!-- ma:begin --> and 
+# <!-- ma:end -->.
+
+# Constants # 
+WEBPAGE_PATH="$BLOG_PATH/training/mount-ave.html"
+DELIMITER_BEGIN="<!-- ma:begin -->"
+DELIMITER_END="<!-- ma:end -->"
+TABLE_FILE='/tmp/ma-tbl-formatted'
+
+trk_path="$(orgdresolv "ORGD_TRK_PATH")"/mount-avenue
+
+
+# Modify the document and check for changes.
+hash_before="$(sha256sum "$trk_path")"
+trk mount-avenue
+hash_after="$(sha256sum "$trk_path")"
+
+if [ "$hash_before" = "$hash_after" ] ; then 
+	echo "No changes made - exitting early."
+	exit 0
+fi
+table_formatted="$(ma-fmt-tbl "$trk_path")"
+
+echo "$table_formatted" > "$TABLE_FILE"
+sed -i -ne "/$DELIMITER_BEGIN/ {p; r $TABLE_FILE" -e ":a; n; /$DELIMITER_END/ {p; b}; ba}; p" "$WEBPAGE_PATH"
+
+# Commit and push the changes
+cd "$(dirname "$WEBPAGE_PATH")"
+git add "$(basename "$WEBPAGE_PATH")"
+git commit -m "Mount Avenue: updated $(date +"%Y-%m-%d %H:%M")"
+git-push-all
diff --git a/web/mount-ave-speeds b/web/mount-ave-speeds
new file mode 100755
index 0000000..bc2df4e
--- /dev/null
+++ b/web/mount-ave-speeds
@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+# Run as 
+# mount-ave-speeds <time-in-secs>
+# And get back the kph and mph. 
+
+time = ARGV[0].to_i
+km2m_constant = 0.6213712
+time_h = time / (60.0 * 60.0)
+km     = 0.47
+
+kph    = (km / time_h)
+mph    = kph * km2m_constant 
+
+print "Time taken: ", time, "\n"
+print "KPH:        ", kph.round(2), "\n"
+print "MPH:        ", mph.round(2), "\n"
+
+
diff --git a/web/now b/web/now
new file mode 100755
index 0000000..5304d28
--- /dev/null
+++ b/web/now
@@ -0,0 +1,5 @@
+#!/bin/sh
+# now: edit the now document, similar to mer.
+
+$EDITOR "$WEBSITE_PATH/now.html"
+ws-push
diff --git a/web/training b/web/training
new file mode 100755
index 0000000..c60edd2
--- /dev/null
+++ b/web/training
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Updates the training/general page of the website for the day. 
+# To do this, an entry is added in trk/training and then is copied over into
+# the website, formatted correctly, and a commit made.
+
+ORIGIN="$(orgdresolv "ORGD_TRK_PATH")"/training
+DEST="$BLOG_PATH/training/general.html"
+
+
+ws-replace "<!-- training:begin -->" "<!-- training:end -->" "$ORIGIN" "$DEST" "Training" "txt" "training-format-table" "$(date +"%Y-%m")"
diff --git a/web/training-format-table b/web/training-format-table
new file mode 100755
index 0000000..4638578
--- /dev/null
+++ b/web/training-format-table
@@ -0,0 +1,12 @@
+#!/bin/sh
+# training-format-table ORIGIN_FILE
+# This will also iterate over every month, and create the relevant table
+# headers, before passing to fmt-as-table.
+# TODO: make it automated for each month, but for now, it can be manually added
+# months.
+
+# 2023-10
+fmt-as-table "$1/2023-10" "Index	Date	Sit-ups	Planks	Squats	Ball Squats	Comments" "collapsible(2023-10)"
+
+# 2023-11
+fmt-as-table "$1/2023-11" "Index	Date	Press-ups	Planks	Dumbbells	Ball Squats	Comments" "collapsible(2023-11)"
diff --git a/web/ws-push b/web/ws-push
new file mode 100755
index 0000000..768e9ef
--- /dev/null
+++ b/web/ws-push
@@ -0,0 +1,19 @@
+#!/bin/sh
+# ws-push
+# Run without arguments. Pushed the local copy of the website to the server.
+
+if [ -z "$REMOTE_URL" ] ; then
+	echo "REMOTE_URL not set!"
+	exit 1
+fi
+
+if [ -z "$WS_REMOTE_ACCT" ] ; then 
+	echo "WS_REMOTE_ACCT not set!"
+	exit 2
+fi
+
+SERVER_PATH="/var/rsync-www"
+SERVER_DEST="$WS_REMOTE_ACCT:$SERVER_PATH"
+LOCAL_PATH="$HOME/web/www/" # Don't forget the trailing slash!
+
+rsync -azPv --delete "$LOCAL_PATH" "$SERVER_DEST"
diff --git a/web/ws-replace b/web/ws-replace
new file mode 100755
index 0000000..6870033
--- /dev/null
+++ b/web/ws-replace
@@ -0,0 +1,65 @@
+#!/bin/sh
+# Takes:
+# ws-replace begin end origin dest commitident txt|csv script
+# Begin:       <!-- ident:begin -->
+# End:         <!-- ident:end -->
+# Origin:      $HOME/docs/wr/orgd/kt/biblio.csv
+# Dest:        $WEBSITE_PATH/rd/index.html
+# Commitident: Biblio (: updated ...)
+# Txt|Csv:     csv
+# script:      biblio-by-month
+# File         If Origin gives a directory (as for example, the script called 
+#              will update a whole directory), then File gives the exact file 
+#              to modify.
+# If `txt`:
+#   Removes all comments; treats each line as an entry,
+#   and tab as the delimiter. Edits are made with: $EDITOR
+#   or $VISUAL or nvim or vim or vi.
+# If `csv`:
+#   Calls out to an external script, $SCRIPT to generate
+#   the HTML.
+# Both then substitute the HTML in.
+
+DELIMITER_BEGIN="$1"
+DELIMITER_END="$2"
+ORIGIN="$3"
+DEST="$4"
+COMMITIDENT="$5"
+TXTCSV="$6"
+SCRIPT="$7"
+TABLE_FILE="/tmp/$5-formatted"
+FILE="$8"
+
+# Work out $EDITWITH
+if [ "$TXTCSV" = "txt" ] ; then
+	EDITWITH="$EDITOR"
+	# TODO: add VISUAL, nvim, vim, vi...
+else
+	EDITWITH="sc-im"
+fi
+
+if [ -z "$FILE" ] ; then 
+	hash_before="$(sha256sum $ORIGIN)"
+	$EDITWITH "$ORIGIN"
+	hash_after="$(sha256sum $ORIGIN)"
+else
+	# As $ORIGIN is a directory, so here we specify the exact file.
+	hash_before="$(sha256sum "$ORIGIN/$FILE")"
+	$EDITWITH "$ORIGIN/$FILE"
+	hash_after="$(sha256sum "$ORIGIN/$FILE")"
+fi
+
+if [ "$hash_before" = "$hash_after" ] ; then 
+	echo "No changes made - quitting early!"
+	exit 0
+fi
+
+echo "Changes will be made."
+
+formatted="$($SCRIPT "$ORIGIN")"
+echo "$formatted" > "$TABLE_FILE"
+sed -i -ne "/$DELIMITER_BEGIN/ {p; r $TABLE_FILE" -e ":a; n; /$DELIMITER_END/ {p; b}; ba}; p" "$DEST"
+
+# Commit and push the changes
+ws-push
+