geminispace.info

commit 8ddb511c7be95e3b1bbb0c1b6944b38caecce09b
parent 1e7b83f93241a1ffe2fd54236812187d7d5b235c
Author: Rene Wagner <rwa@clttr.info>
Date:   Thu, 30 Mar 2023 18:47:53 +0000

shell script cosmetics, switch to jetforce master branch

Diffstat:
M
gus/excludes.py
 | 
1
+
M
infra/filter_seed_request.sh
 | 
7
++++---
M
infra/rebuild_index.sh
 | 
16
++++++++--------
M
infra/update_index.sh
 | 
14
+++++++-------
M
pyproject.toml
 | 
5
+++--

5 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/gus/excludes.py b/gus/excludes.py
@@ -10,6 +10,7 @@ EXCLUDED_URL_PREFIXES = [
     # all combinations of a tictactoe board
     "gemini://tictactoe.lanterne.chilliet.eu",
 
+    "gemini://kennedy.gemi.dev/",
     "gemini://gemi.dev/cgi-bin/",
     "gemini://auragem.space/texts/jewish",
     "gemini://auragem.space/twitch/",
diff --git a/infra/filter_seed_request.sh b/infra/filter_seed_request.sh
@@ -1,3 +1,4 @@
-BASEDIR=${1}
-cat ${BASEDIR}/seed-requests.txt | grep -iE '^gemini:\/\/[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,10}\b[-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*$' | sort | uniq > ${BASEDIR}/seed-requests.txt2
-mv ${BASEDIR}/seed-requests.txt2 ${BASEDIR}/seed-requests.txt
+#!/bin/bash
+BASEDIR="$1"
+grep -iE '^gemini:\/\/[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,10}\b[-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*$' "${BASEDIR}/seed-requests.txt" | sort | uniq > "${BASEDIR}/seed-requests.txt2"
+mv "${BASEDIR}/seed-requests.txt2" "${BASEDIR}/seed-requests.txt"
diff --git a/infra/rebuild_index.sh b/infra/rebuild_index.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
-BASEDIR=$1
+BASEDIR="$1"
 
-LOCKFILE=${BASEDIR}/crawl.lock
+LOCKFILE="${BASEDIR}/crawl.lock"
 
-touch ${LOCKFILE}
+touch "${LOCKFILE}"
 
-mkdir -p ${BASEDIR}/index.new/
+mkdir -p "${BASEDIR}/index.new/"
 systemctl --user stop gus
-cp ${BASEDIR}/index/gus.sqlite ${BASEDIR}/index.new/
+cp "${BASEDIR}/index/gus.sqlite" "${BASEDIR}/index.new/"
 systemctl --user start gus
 ~/.poetry/bin/poetry run build_index -d
-mv ${BASEDIR}/index ${BASEDIR}/index.old
-mv ${BASEDIR}/index.new ${BASEDIR}/index
+mv "${BASEDIR}/index" "${BASEDIR}/index.old"
+mv "${BASEDIR}/index.new" "${BASEDIR}/index"
 systemctl --user restart gus
 
-rm ${LOCKFILE}
+rm "${LOCKFILE}"
diff --git a/infra/update_index.sh b/infra/update_index.sh
@@ -1,20 +1,20 @@
 #!/bin/bash
-BASEDIR=$1
+BASEDIR="$1"
 
-LOCKFILE=${BASEDIR}/crawl.lock
+LOCKFILE="${BASEDIR}/crawl.lock"
 
-if [[ -f ${LOCKFILE} ]];
+if [[ -f "${LOCKFILE}" ]];
 then
     echo "Lockfile is there, exiting"
     exit
 fi
 
-touch ${LOCKFILE}
-rm ${BASEDIR}/gus.log
-${BASEDIR}/infra/filter_seed_request.sh ${BASEDIR}
+touch "${LOCKFILE}"
+rm "${BASEDIR}/gus.log"
+"${BASEDIR}/infra/filter_seed_request.sh" "${BASEDIR}"
 
 ~/.local/bin/poetry run crawl
 ~/.local/bin/poetry run build_index
 systemctl --user restart gus
 
-rm ${LOCKFILE}
+rm "${LOCKFILE}"
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,13 +6,14 @@ authors = ["Vee <vee@vnsf.xyz>", "rwa <rwa@clttr.info>"]
 license = "MIT"
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.11"
 gusmobile = { git = "https://git.sr.ht/~rwa/gusmobile", branch = "main" }
 whoosh = "^2.7.4"
-jetforce = "^0"
+jetforce = { git = "https://github.com/michael-lazar/jetforce", branch = "master" }
 jinja2 = "^3.1.2"
 peewee = "^3.13.3"
 feedparser = "^6.0.10"
+twisted = "^22.1.0"
 
 [tool.poetry.dev-dependencies]
 black = "^19.10b0"