From d793bca3eac6b933bb695e1fdb3135acaa1d9206 Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Fri, 28 Feb 2025 17:10:25 +0100 Subject: [PATCH 1/6] search video audio --- data/search_video_audio.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 data/search_video_audio.md diff --git a/data/search_video_audio.md b/data/search_video_audio.md new file mode 100644 index 0000000..9ffb6df --- /dev/null +++ b/data/search_video_audio.md @@ -0,0 +1,33 @@ +--- +title: "Search Video Audio" +tags: [ "data", "video" ] +--- + +Check subtitles available: + +```sh +url='https://videos.domainepublic.net/videos/watch/d9567d5b-1add-477c-bce3-a58cef84c28c' +yt-dlp --list-subs "$url" | grep --max-count=1 '^en' +``` + +The original language often displays with `-orig`, e.g. `en-orig (Original)`. + +``` +Language Formats +ar vtt +az vtt +bg vtt +ca vtt +cs vtt +da vtt +de vtt +el vtt +en vtt +``` + +Search youtube.com for videos on a topic, and download subtitles: + +```sh +url="$(ytfzf -I l "$search" )" && \ +yt-dlp --write-subs --sub-format 'ass/srt/best/vtt' --sub-langs "en.*" --skip-download "$url" +``` From b3258d9f5f84fa460a7d12e3e7b37cfeb044bc0c Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Sun, 2 Mar 2025 10:14:20 +0100 Subject: [PATCH 2/6] refactor db creation --- Makefile | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 114a0f3..5443326 100644 --- a/Makefile +++ b/Makefile @@ -24,35 +24,34 @@ $(foreach dir, $(categories), \ $(eval .dbs/$(dir).rec: $(wildcard $(dir)/*)) \ ) -$(databases): .dbs/%.rec: %/ +.dbs/: + mkdir $@ +$(databases): .dbs/%.rec: %/ | .dbs/ $(info making $(@F)) - @mkdir -p $(@D) for entry in $(shell find $< -type f -name "*.md") ; do \ - sed -n '2,/^---$$/ {/^---$$/d; p}' "$$entry" |\ - sed -e 's/\[ //' -e 's/ \]//' |\ - tr -d '"' ;\ - printf "wordcount: %s\n" "$$(wc -w < $$entry)" ;\ - printf "file: %s\n\n" "$$entry" ;\ + printf "file: %s\n" "$$entry" ;\ + sed -n '2,/^---$$/ {/^---$$/d; p}' "$$entry" |\ + tr -d '[]' | tr -s ' ' |\ + sed '/tags: /s/, /\ntag: /g ; s/tags:/tag:/ ; /requires/s/, /\nrequires: /g' ;\ + printf "wordcount: %s\n\n" "$$(wc -w < $$entry)" ;\ done > $@ - for entry in $(shell find $< -type f -name "*.md"); do \ - recset $@ -e "file = '$${entry}'" -f wordcount --set-add="$$(wc -w < $${entry})" ;\ - recset $@ -e "file = '$${entry}'" -f content --set-add="$$($(spill_contents) $${entry})" ;\ - done +# This two-variable read can only happen because of the quotes in the titles. db.rec: $(databases) printf '%s\n' '%rec: guide' > $@ printf '%s\n' '%key: title' >> $@ printf '%s\n' '%type: wordcount int' >> $@ - printf '%s\n\n' '%sort: title' >> $@ - recsel $^ >> $@ + printf '%s\n\n' '%sort: wordcount' >> $@ + cat $^ >> $@ recsel $@ -e "requires != ''" -CR title,requires |\ while read title requires; do \ - IFS=', ' && for provider in $$requires; do \ + for provider in "$$requires" ; do \ recset $@ -e "title = '$${provider}'" -f provides -a "$${title}" ;\ done ;\ done - $(info Created main database: $@) + sed -i 's/"//g' $@ recfix --sort $@ + $(info Created main database: $@) default += db.rec From fb157895fb03c9e748e9375ceb8e895260eda7b5 Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Sun, 2 Mar 2025 18:11:52 +0100 Subject: [PATCH 3/6] add requirements --- data/radicale.md | 1 + data/soft_https.md | 1 + 2 files changed, 2 insertions(+) diff --git a/data/radicale.md b/data/radicale.md index 2f5ab64..711bc9b 100644 --- a/data/radicale.md +++ b/data/radicale.md @@ -1,6 +1,7 @@ --- title: "radicale and nginx" tags: [ "data", "calendar" ] +required: [ "nginx", "certbot" ] --- Check before you start: diff --git a/data/soft_https.md b/data/soft_https.md index fcdab9a..077091a 100644 --- a/data/soft_https.md +++ b/data/soft_https.md @@ -1,6 +1,7 @@ --- title: "Soft Serve through https" tags: [ "data", "git server", "lfs" ] +required: [ "git", "nginx" ] --- ## `http` Setup From 1732c627345b4b372d9034e0b8d5bfe38d4fdfa7 Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Sun, 2 Mar 2025 18:15:59 +0100 Subject: [PATCH 4/6] add soft serve maintenance --- data/soft-serve/maintenance.md | 24 ++++++++++++++++++++++++ data/{ => soft-serve}/soft_https.md | 3 ++- data/soft.md | 8 ++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 data/soft-serve/maintenance.md rename data/{ => soft-serve}/soft_https.md (99%) create mode 100644 data/soft.md diff --git a/data/soft-serve/maintenance.md b/data/soft-serve/maintenance.md new file mode 100644 index 0000000..36cd1f1 --- /dev/null +++ b/data/soft-serve/maintenance.md @@ -0,0 +1,24 @@ +--- +title: "Soft Serve Maintenance" +tags: [ "data", "git server", "maintenance" ] +required: [ "git", "nginx" ] +--- + +Over time git repositories become bloated with old data, but never get cleaned. +I can't find an official way to clean up the crud, so I did this: + +```sh +usermod -aG soft-serve $USER +# Log out and back in for this to take effect. + +cd /var/lib/soft-serve/data/repos +sudo chmod -R g+w * +git config --global --add safe.directory '*' +du -sh *.git +for repo in *.git; do + git -C "$repo" gc +done +du -sh *.git +$EDITOR ~/.gitconfig +# You should remove having everything marked 'safe'. +``` diff --git a/data/soft_https.md b/data/soft-serve/soft_https.md similarity index 99% rename from data/soft_https.md rename to data/soft-serve/soft_https.md index 077091a..8dafb68 100644 --- a/data/soft_https.md +++ b/data/soft-serve/soft_https.md @@ -34,7 +34,7 @@ Restart the `soft-serve` service, then check it's working by cloning from localh git clone http://localhost:23232/${some_repo}.git ``` -## `https` Setup +### `https` Setup Put this file at `/etc/nginx/sites-enabled/$DOMAIN.tld`, then set up standard certificates with [nginx](../networking/website/nginx.md). @@ -68,3 +68,4 @@ Put this file at `/etc/nginx/sites-enabled/$DOMAIN.tld`, then set up standard ce } ``` + diff --git a/data/soft.md b/data/soft.md new file mode 100644 index 0000000..8f2c9ca --- /dev/null +++ b/data/soft.md @@ -0,0 +1,8 @@ +--- +title: "Soft-Serve" +tags: [ "data", "git server", "lfs", "TUI" ] +required: [ "git", "nginx" ] +--- + +- [Soft-Serve with https](soft-serve/soft_https.md) +- [Maintenance](soft-serve/maintenance.md) From 4e89c5ab9b9ab8272d7f3df86e326a520185c1dc Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Sun, 2 Mar 2025 22:04:04 +0100 Subject: [PATCH 5/6] more grammarlier --- system/Makefiles/help.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/Makefiles/help.md b/system/Makefiles/help.md index 2c2829a..98a1be5 100644 --- a/system/Makefiles/help.md +++ b/system/Makefiles/help.md @@ -8,13 +8,13 @@ Running `make help` will search for text which starts with `## ` and show what t ```make .PHONY: help -help: ## Print the help message +help: ## Print the help message. @awk 'BEGIN {FS = ":.*?## "} /^[0-9a-zA-Z._-]+:.*?## / {printf "\033[36m%s\033[0m : %s\n", $$1, $$2}' $(MAKEFILE_LIST) | \ sort | \ column -s ':' -t .PHONY: clean -clean: ## Remove generated files +clean: ## Remove generated files. $(RM) $(defaults) ``` From ed4b54cf7e7dd3caf58f8ed3fc9cdcb0a1c5840c Mon Sep 17 00:00:00 2001 From: Malin Freeborn Date: Mon, 3 Mar 2025 19:44:41 +0100 Subject: [PATCH 6/6] tag --- data/sc-im.md | 1 + 1 file changed, 1 insertion(+) diff --git a/data/sc-im.md b/data/sc-im.md index fdc4ef6..e500ae6 100644 --- a/data/sc-im.md +++ b/data/sc-im.md @@ -1,6 +1,7 @@ --- title: "sc-im" tags: [ "TUI", "data", "spreadsheet", ".csv" ] +required: [ "vim basics" ] --- - [Sample file](sc-im/sample.sc)