Merge branch 'main' into testing

again...

README.md

@@ -2,11 +2,15 @@
 ## **Find songs nobody knows exist!** 
 A small wrapper and custom list for fortune/misfortune that picks a random Teto song of the day from any of almost 28,000 original, finished songs with videos on VocaDB.  Your original fortune command will remain untouched, tetosong just tells it to use a custom directory.
 
+## **Enable Audio to Hear "Teto Song of the Day!" in your terminal from Utau, SynthV, or SynthV2 Teto!**
+Sound plays based on the song you get!  Utau for Utau! SV for SV!
+
 https://github.com/user-attachments/assets/bc2a9909-d24a-43fa-882a-5e785cda3020
 
 ## **Now With Optional Automatic Updates!** 
 Disabled by default, opt-in during setup to enable a systemd user service and timer to update the script and song list every Sunday at 5AM UTC.  I check for new songs and push new tetofortunes from my server every Sunday at 3AM UTC
 
+
 ## **Dependencies**
 
 ### install.sh and tetosong

automakefortune/automakefortune.sh

@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+cd $HOME
+yes | rm -r tetosong
+git clone git@github.com:eric5949/tetosong.git
+cd tetosong
+ARTIST=140308 # 116 is Kasane Teto
+CHILDREN="true" # If we want child voicebanks, we do so we can get all songs from utau, sv, and sv2
+START=0 # Start at the beginning of the recordset. if i wanted to make the file in chunks to use the api less i would use this and max to get the songs in chunks.  They say dont use it "thousands of times a day", getting every teto song is 280 times. I think I'm ok.  maybe.
+RESULTS=100 # Max results. Limit is 100.
+MAX=30000 # when to stop, there's as of 4-23-26 over 28,000 songs featuring Kasane Teto in the recordset i have selected.
+if [ ! -f dates/${ARTIST}var.json ]; then # var.json has our latest date, we use it to know where to stop going back, past it the songs already exist in the fortune file.
+    echo '{"lastDate": "2000-04-21T00:00:00Z"}' > dates/${ARTIST}var.json #  if it doesn't exist, we create it with a default date back in 2000.
+fi
+PREVDATE=$(jq -r '.lastDate' dates/${ARTIST}var.json)
+AFTERDATE=$(date -u -d "$PREVDATE + 1 Second" +"%Y-%m-%dT%H:%M:%SZ")
+echo "Result: $AFTERDATE"
+#rm tetofortunes var.json tetofortunes.dat # during testing we will remove everything, or if we want to regenerate the fortune file from scratch.
+# setting the latest date.  just pulling the latest song from the api and setting the createDate as the latest date in var.json for use when we update the fortune file again, dont want to add the same songs twice. idk how I'll handle broken links and such, maybe just regenerate the whole thing periodically.
+CURLURL="https://vocadb.net/api/songs?songTypes=Original&afterDate=${AFTERDATE}&&artistId%5B%5D=${ARTIST}&childVoicebanks=${CHILDREN}&onlyWithPvs=true&status=Finished&start=0&maxResults=1&sort=PublishDate&fields=PVs"
+echo "CURLURL: $CURLURL"
+DATA=$(curl -X 'GET' \
+$CURLURL \
+    -H 'accept: application/json')
+# making sure there are songs to add.
+SONGS=$(echo "$DATA" | jq -c '.items | length')
+if [ "$SONGS" -eq 0 ]; then
+  echo "Result is empty. No more songs."
+  exit 0
+fi
+DATE=$(date -u +%Y-%m-%dT00:00:00Z)
+echo "DATE: $DATE"
+echo "{\"lastDate\": \"$DATE\"}" > dates/${ARTIST}var.json
+# looping the api to get all songs we need.
+while true; do
+    CURLURL="https://vocadb.net/api/songs?songTypes=Original&afterDate=${AFTERDATE}&&artistId%5B%5D=${ARTIST}&childVoicebanks=${CHILDREN}&onlyWithPvs=true&status=Finished&start=${START}&maxResults=${RESULTS}&sort=PublishDate&fields=PVs"
+    DATA=$(curl -X 'GET' \
+    $CURLURL \
+        -H 'accept: application/json')
+    SONGS=$(echo "$DATA" | jq -r '.items | length')
+    if [ "$SONGS" -eq 0 ]; then
+      echo "Result is empty. No more songs."
+      break
+    else
+      START=$((START + SONGS))
+      echo "Found songs! Processing... (Total fetched: $START)"
+      echo "$DATA" | jq -r '.items[] | [.artistString, .defaultName, .pvs[0].url] | @tsv' | while IFS=$'\t' read -r artist name url; do
+          echo "TETO SONG OF THE DAY!"
+          echo ""
+          echo "$artist -- $name"
+          echo ""
+          echo "$url"
+          echo ""
+          echo "▼・ᴗ・▼"
+          echo "\`"
+      done >> vocafortunes/vocadb/$ARTIST
+      if [ "$START" -ge "$MAX" ]; then
+        echo "Reached max results. Stopping."
+        break
+      fi
+      echo "Done!"
+    fi
+done
+
+readarray -d '`' tetosongs < vocafortunes/vocadb/$ARTIST
+
+readarray -td '' dups < <(
+  (( ${#tetosongs[@]} == 0 )) ||
+    printf '%s\0' "${tetosongs[@]}" |
+      LC_ALL=C sort -z |
+      LC_ALL=C uniq -zd
+)
+readarray -td '' uniq < <(
+  (( ${#tetosongs[@]} == 0 )) ||
+    printf '%s\0' "${tetosongs[@]}" |
+      LC_ALL=C sort -z |
+      LC_ALL=C uniq -zu
+)
+
+echo ${#tetosongs[@]}
+if ((${#dups[@]} > 0)); then
+  echo >&2 "array has duplicates:"
+  echo ${#dups[@]}
+fi
+if ((${#uniq[@]} > 0)); then
+  echo >&2 "Uniques:"
+  echo ${#uniq[@]}
+fi
+
+printf >&2 '%s' "${dups[@]}" > dups
+printf >&2 '%s' "${uniq[@]}" > uniq
+
+cat uniq > fixed
+cat dups >> fixed
+sed -i '1,/^TETO SONG OF THE DAY!/{/^TETO SONG OF THE DAY!$/!d}' fixed
+rm vocafortunes/vocadb/$ARTIST
+rm uniq dups
+mv fixed vocafortunes/vocadb/$ARTIST
+# create the fortune database from tetofortunes
+git add vocafortunes/vocadb/$ARTIST dates/${ARTIST}var.json
+git commit -m "Update fortune files"
+git push -u origin main

automakefortune/makefortune.service

@@ -0,0 +1,7 @@
+[Unit]
+Description=tetofortunes autoupdater
+Wants=makefortune.timer
+
+[Service]
+Type=oneshot
+ExecStart=%h/.local/bin/automakefortune.sh

automakefortune/makefortune.timer

@@ -0,0 +1,10 @@
+[Unit]
+Description=Run automakefortune.sh once a week
+
+[Timer]
+OnCalendar=Sun *-*-* 03:00:00
+Persistent=true
+Unit=makefortune.service
+
+[Install]
+WantedBy=timers.target

autoupdater/tetosong.service

@@ -4,4 +4,4 @@ Wants=tetosong.timer
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/bash -c "curl -s file:///home/eric/GitHub/TetoSongOfTheDay/autoupdater/updater.sh | bash"
+ExecStart=/usr/bin/bash -c "curl -s https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/autoupdater/updater.sh | bash"

autoupdater/updater.sh

@@ -1,15 +1,27 @@
 #!/usr/bin/bash
+#
+#  Updated 5-1-2026 to use new vocafortunes script instead of fortune/misfortune
+#
+#
 # download custom fortunes and config file
 echo "Updating tetosong..."
 # check if the config file exists, if not download it and prompt the user for options.
-if [ ! -f ~/.local/share/tetosong/tetosong.config ]; then
-    echo "Config file not found, downloading default..."
-    curl -sLo ~/.local/share/tetosong/tetosong.config https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong.config
-fi
+
+#### remove files from old version
+rm -rf ~/.local/share/tetosong/fortunes/
+# add new files
 mkdir -p ~/.local/share/tetosong
-curl -sLo ~/.local/share/tetosong/tetofortunes https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetofortunes
-curl -sLo ~/.local/share/tetosong/tetofortunes.dat https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetofortunes.dat
-curl -sLo ~/.local/share/tetosong/sv2SOTD.wav https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/sv2SOTD.wav
+mkdir -p ~/.local/share/tetosong/vocafortunes
+mkdir -p ~/.local/share/tetosong/vocafortunes/vocadb
+curl -sLo ~/.local/share/tetosong/vocafortunes/vocadb/140308 https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/vocafortunes/vocadb/140308
+AUDIO="$(. ~/.local/share/tetosong/tetosong.config; echo $AUDIO)"
+if [ "$AUDIO" = "YES" ]; then
+    curl -sLo ~/.local/share/tetosong/SOTD.zip https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/audio/teto/SOTD.zip
+    mkdir -p ~/.local/share/tetosong/audio/
+    mkdir -p ~/.local/share/tetosong/audio/teto/
+    unzip -o ~/.local/share/tetosong/SOTD.zip -d ~/.local/share/tetosong/audio/teto/
+    rm ~/.local/share/tetosong/SOTD.zip
+fi
 
 # set up autoupdater
 # # i use systemd, so i use systemd timers.  I'll figure out something for non-systemd users later.
@@ -30,5 +42,7 @@ fi
 echo "writing tetosong to ~/.local/bin"
 mkdir -p ~/.local/bin
 curl -sLo ~/.local/bin/tetosong https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong
+curl -sLo ~/.local/bin/tetosong https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/vocafortune
 chmod +x ~/.local/bin/tetosong
-echo "Update complete"
+chmod +x ~/.local/bin/vocafortune
+echo "Make sure ~/.local/bin is in your PATH and you can get your Teto Song Of the Day by typing in tetosong or adding it to your bashrc :)"

dates/140308var.json

@@ -0,0 +1 @@
+{"lastDate": "2026-05-02T00:00:00Z"}

installer.sh

@@ -1,38 +1,40 @@
-#!/usr/bin/bash
-# check which fortune command is installed if any.
-if ! [ -x "$(command -v fortune)" ]; then
-  echo 'fortune is not installed, checking for misfortune'm
-  if ! [ -x "$(command -v misfortune)" ]; then
-      echo 'neither program is installed, exiting'
-      exit 1
-    else
-      echo 'misfortune found'
-  fi
-else
-    echo 'fortune found'
-fi
+#!/usr/bin/env bash
+#
+#  Updated 5-1-2026 to use new vocafortunes script instead of fortune/misfortune
+#
+#
+#
 
 # download custom fortunes and config file
 echo "Downloading custom fortunes and config file..."
 # download the config file and prompt the user for options.
-
+mkdir -p ~/.local/share/tetosong
 curl -sLo ~/.local/share/tetosong/tetosong.config https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong.config
 read -p "Do you want to hear Teto in your terminal? (y/n) " yn
 case $yn in
-    [Yy]* ) sed -i 's|^AUDIO=.*|AUDIO="YES"|' ~/.local/share/tetosong/tetosong.config ;;
+    [Yy]* )
+    sed -i 's|^AUDIO=.*|AUDIO="YES"|' ~/.local/share/tetosong/tetosong.config
+    curl -sLo /tmp/SOTD.zip https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/audio/teto/SOTD.zip
+    mkdir -p ~/.local/share/tetosong/audio/
+    mkdir -p ~/.local/share/tetosong/audio/teto/
+    unzip -o /tmp/SOTD.zip -d ~/.local/share/tetosong/audio/teto/
+    rm /tmp/SOTD.zip
+    ;;
     [Nn]* ) sed -i 's|^AUDIO=.*|AUDIO="NO"|' ~/.local/share/tetosong/tetosong.config ;;
     * ) echo "Please answer yes or no.";;
 esac
 read -p "Do you want to enable automatic updates? (y/n) " yn
 case $yn in
-    [Yy]* ) sed -i 's|^AUTOUPDATE=.*|AUTOUPDATE="YES"|' ~/.local/share/tetosong/tetosong.config ;;
+    [Yy]* )
+    sed -i 's|^AUTOUPDATE=.*|AUTOUPDATE="YES"|' ~/.local/share/tetosong/tetosong.config ;;
     [Nn]* ) sed -i 's|^AUTOUPDATE=.*|AUTOUPDATE="NO"|' ~/.local/share/tetosong/tetosong.config ;;
     * ) echo "Please answer yes or no.";;
 esac
-mkdir -p ~/.local/share/tetosong
-curl -sLo ~/.local/share/tetosong/tetofortunes https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetofortunes
-curl -sLo ~/.local/share/tetosong/tetofortunes.dat https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetofortunes.dat
-curl -sLo ~/.local/share/tetosong/sv2SOTD.wav https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/sv2SOTD.wav
+
+mkdir -p ~/.local/share/tetosong/vocafortunes
+mkdir -p ~/.local/share/tetosong/vocafortunes/vocadb
+curl -sLo ~/.local/share/tetosong/vocafortunes/vocadb/140308 https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/vocafortunes/vocadb/140308
+
 
 # set up autoupdater
 # i use systemd, so i use systemd timers.  I'll figure out something for non-systemd users later.
@@ -53,5 +55,7 @@ fi
 echo "writing tetosong to ~/.local/bin"
 mkdir -p ~/.local/bin
 curl -sLo ~/.local/bin/tetosong https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong
+curl -sLo ~/.local/bin/vocafortune https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/vocafortune
 chmod +x ~/.local/bin/tetosong
+chmod +x ~/.local/bin/vocafortune
 echo "Make sure ~/.local/bin is in your PATH and you can get your Teto Song Of the Day by typing in tetosong or adding it to your bashrc :)"

makefortune.sh

@@ -4,10 +4,10 @@ CHILDREN="true" # If we want child voicebanks, we do so we can get all songs fro
 START=0 # Start at the beginning of the recordset. if i wanted to make the file in chunks to use the api less i would use this and max to get the songs in chunks.  They say dont use it "thousands of times a day", getting every teto song is 280 times. I think I'm ok.  maybe.
 RESULTS=100 # Max results. Limit is 100.
 MAX=30000 # when to stop, there's as of 4-23-26 over 28,000 songs featuring Kasane Teto in the recordset i have selected.
-if [ ! -f var.json ]; then # var.json has our latest date, we use it to know where to stop going back, past it the songs already exist in the fortune file.
-    echo '{"lastDate": "2000-04-21T00:00:00Z"}' > var.json #  if it doesn't exist, we create it with a default date back in 2000.
+if [ ! -f dates/${ARTIST}var.json ]; then # var.json has our latest date, we use it to know where to stop going back, past it the songs already exist in the fortune file.
+    echo '{"lastDate": "2000-04-21T00:00:00Z"}' > dates/${ARTIST}var.json #  if it doesn't exist, we create it with a default date back in 2000.
 fi
-PREVDATE=$(jq -r '.lastDate' var.json)
+PREVDATE=$(jq -r '.lastDate' dates/${ARTIST}var.json)
 AFTERDATE=$(date -u -d "$PREVDATE + 1 Second" +"%Y-%m-%dT%H:%M:%SZ")
 echo "Result: $AFTERDATE"
 #rm tetofortunes var.json tetofortunes.dat # during testing we will remove everything, or if we want to regenerate the fortune file from scratch.
@@ -23,9 +23,9 @@ if [ "$SONGS" -eq 0 ]; then
   echo "Result is empty. No more songs."
   exit 0
 fi
-DATE=$(echo "$DATA" | jq -r '.items[0].publishDate')
+DATE=$(date -u +%Y-%m-%dT00:00:00Z)
 echo "DATE: $DATE"
-echo "{\"lastDate\": \"$DATE\"}" > var.json
+echo "{\"lastDate\": \"$DATE\"}" > dates/${ARTIST}var.json
 # looping the api to get all songs we need.
 while true; do
     CURLURL="https://vocadb.net/api/songs?songTypes=Original&afterDate=${AFTERDATE}&&artistId%5B%5D=${ARTIST}&childVoicebanks=${CHILDREN}&onlyWithPvs=true&status=Finished&start=${START}&maxResults=${RESULTS}&sort=PublishDate&fields=PVs"
@@ -47,8 +47,8 @@ while true; do
           echo "$url"
           echo ""
           echo "▼・ᴗ・▼"
-          echo "%"
-      done >> tetofortunes
+          echo "\`"
+      done >> vocafortunes/vocadb/$ARTIST
       if [ "$START" -ge "$MAX" ]; then
         echo "Reached max results. Stopping."
         break
@@ -56,6 +56,42 @@ while true; do
       echo "Done!"
     fi
 done
+
+readarray -d '`' tetosongs < vocafortunes/vocadb/$ARTIST
+
+readarray -td '' dups < <(
+  (( ${#tetosongs[@]} == 0 )) ||
+    printf '%s\0' "${tetosongs[@]}" |
+      LC_ALL=C sort -z |
+      LC_ALL=C uniq -zd
+)
+readarray -td '' uniq < <(
+  (( ${#tetosongs[@]} == 0 )) ||
+    printf '%s\0' "${tetosongs[@]}" |
+      LC_ALL=C sort -z |
+      LC_ALL=C uniq -zu
+)
+
+echo ${#tetosongs[@]}
+if ((${#dups[@]} > 0)); then
+  echo >&2 "array has duplicates:"
+  echo ${#dups[@]}
+fi
+if ((${#uniq[@]} > 0)); then
+  echo >&2 "Uniques:"
+  echo ${#uniq[@]}
+fi
+
+printf >&2 '%s' "${dups[@]}" > dups
+printf >&2 '%s' "${uniq[@]}" > uniq
+
+cat uniq > fixed
+cat dups >> fixed
+sed -i '1,/^TETO SONG OF THE DAY!/{/^TETO SONG OF THE DAY!$/!d}' fixed
+rm vocafortunes/vocadb/$ARTIST
+rm uniq dups
+mv fixed vocafortunes/vocadb/$ARTIST
+
 # create the fortune database from tetofortunes
-rm tetofortunes.dat # delete the old database if it extists.
-strfile -c % tetofortunes tetofortunes.dat
+#rm tetofortunes.dat # delete the old database if it extists.
+#strfile -c % tetofortunes tetofortunes.dat

tetosong

@@ -1,13 +1,18 @@
 #!/usr/bin/bash
+#
+#   Updated 5-1-26 to use new vocafortune script and not require fortune/misfortune.
+#
+#
+
 # argument handling
 while [[ $# -gt 0 ]]; do
     case $1 in
-        -u|--update)
-            echo "Downloading tetosong updater..."
-            bash <(curl -s https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/autoupdater/updater.sh)
-            shift
-            exit 0
-            ;;
+        	-u|--update)
+        		echo "Downloading tetosong updater..."
+        		bash <(curl -s https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/autoupdater/updater.sh)
+        		shift
+        		exit 0
+        		;;
         -h|--help)
             echo "--- TETOSONG HELP ---"
             echo ""
@@ -25,26 +30,23 @@ done
 
 # check if the config file exists, if not download it
 if [ ! -f ~/.local/share/tetosong/tetosong.config ]; then
-    echo "Config file not found, downloading default..."
-    curl -sLo ~/.local/share/tetosong/tetosong.config https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong.config
+	echo "Config file not found, downloading default..."
+	curl -sLo ~/.local/share/tetosong/tetosong.config https://raw.githubusercontent.com/eric5949/tetosong/refs/heads/main/tetosong.config
 fi
 # check if the user wants to play audio
 AUDIO="$(. ~/.local/share/tetosong/tetosong.config; echo $AUDIO)"
 
-# check which fortune command is installed if any and then run it
-if ! [ -x "$(command -v fortune)" ]; then
-  if ! [ -x "$(command -v misfortune)" ]; then
-      echo 'No fortune commmand is installed, exiting!'
-      exit 1
-  else
-      if [ "$AUDIO" = "YES" ]; then
-          nohup ffplay -nodisp -autoexit -v quiet ~/.local/share/tetosong/sv2SOTD.wav 2>/dev/null >/dev/null &
-      fi
-    misfortune ~/.local/share/tetosong/* # fortune doesnt care if you give it a directory, apparently misfortune does. watch this be a problem when i go to add SynthV Teto in a separate file.
-  fi
-else
-    if [ "$AUDIO" = "YES" ]; then
-        nohup ffplay -nodisp -autoexit -v quiet ~/.local/share/tetosong/sv2SOTD.wav 2>/dev/null >/dev/null &
+vocafortune >> /tmp/fortune
+if [ "$AUDIO" = "YES" ]; then
+    if grep -q "SV2" /tmp/fortune; then
+        nohup ffplay -nodisp -autoexit -v quiet ~/.local/share/tetosong/audio/teto/sv2SOTD.wav 2>/dev/null >/dev/null &
+    elif grep -q "SV" /tmp/fortune; then
+        nohup ffplay -nodisp -autoexit -v quiet ~/.local/share/tetosong/audio/teto/svSOTD.wav 2>/dev/null >/dev/null &
+    elif grep -q "重音テト" /tmp/fortune; then
+        nohup ffplay -nodisp -autoexit -v quiet ~/.local/share/tetosong/audio/teto/utSOTD.wav 2>/dev/null >/dev/null &
+    else
+        nohup ffplay -nodisp -autoexit -v quiet ~/.local/share/tetosong/audio/teto/sv2SOTD.wav 2>/dev/null >/dev/null &
     fi
-    fortune ~/.local/share/tetosong
 fi
+    cat /tmp/fortune
+    rm /tmp/fortune

var.json

@@ -1 +0,0 @@
-{"lastDate": "2026-04-24T00:00:00Z"}

vocafortune

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#  VOCAFORTUNE! Make tetosong not need fortune anymore!
+while [ $# -gt 0 ]; do export "${1#-}"="$2"; shift 2; done # now it can be -l ./vocafortunes like a proper program!!!! #  argument handling  # i can use this anywhere!!!!!!! save this you!!!!!!
+#fortune script
+shopt -s globstar
+if [ -z "$l" ]; then export "DIR"="$HOME/.local/share/tetosong/vocafortunes/**"; else export "DIR"="$l/**"; fi
+for file in $DIR; do if [[ -f "$file" ]]; then readarray -td '`' temp < "$file"; array+=("${temp[@]}"); fi; done
+export "ITEMS"="${#array[@]}"
+export "CHOICE"="$(shuf -i 1-$ITEMS -n 1)"
+echo "${array[$CHOICE]}"