Merge pull request #18 from attogram/feature/enhancements

attogram · web-flow · commit df74898347b5 · 2025-08-15T21:49:42.000+02:00
Fixup: Remove issues directory
diff --git a/README.md b/README.md
@@ -22,17 +22,17 @@ cd bash-screensavers
 ./screensaver.sh
 ```
 ```
-Bash Screensavers v0.0.12 (Mystical Mirage)
-
-  1 . alpha        - colorful pixels, one at a time
-  2 . bouncing     - classic bouncing 'O's
-  3 . cutesaver    - infinite loop of cuteness
-  4 . fireworks    - Ooh! Aah! Pretty lights!
-  5 . matrix       - classic digital rain
-  6 . pipes        - classic maze of pipes
+Bash Screensavers v0.0.13 (Mystic Matrix)
+
+  1 . alpha        - random colorful pixels
+  2 . bouncing     - bouncing 'O' madness
+  3 . cutesaver    - an infinite loop of cuteness
+  4 . fireworks    - elegant fireworks display
+  5 . matrix       - the matrix has you
+  6 . pipes        - an endless pipe maze
   7 . rain         - soothing, gentle rain
   8 . speaky       - dramatic talking screensaver
-  9 . stars        - twinkling starfield
+  9 . stars        - twinkling starfield simulation
   10. tunnel       - fly into the digital tunnel
 
 (Press ^C to exit)
@@ -107,7 +107,7 @@ That's it! The main `screensaver.sh` script will automatically detect your new c
 
 ```
 .
-├─ screensaver.sh    # Where all the visual pleasuring starts
+├─ screensaver.sh    # Where the ASCII magic begins
 ├─ LICENSE           # MIT Licensed, because all the cool kids are doing it
 ├─ README.md         # This file, isn't it pretty?
 ├─ gallery           # Welcome to the Gallery of Terminal Visualizations
@@ -144,4 +144,17 @@ That's it! The main `screensaver.sh` script will automatically detect your new c
 
 ---
 
+## Development Tools
+
+### `tools/smile-for-the-camera.sh`
+
+This script is used to generate animated GIF previews for each screensaver. It uses `asciinema` to record a `.cast` file and `agg` to convert it to a `.gif`. The output files are saved in the `gallery/<screensaver_name>/` directory.
+
+**Usage:**
+```bash
+./tools/smile-for-the-camera.sh
+```
+
+---
+
 *Made with ❤️ and a lot of bash.*
diff --git a/gallery/alpha/config.sh b/gallery/alpha/config.sh
@@ -1,6 +1,6 @@
 name="alpha"
-tagline="colorful pixels, one at a time"
-description="A simple screensaver that prints random colored blocks at random locations on the screen."
+tagline="random colorful pixels"
+description="A minimalist screensaver that slowly fills the screen with a random pattern of colorful pixels. Each character block is placed one at a time, creating a mesmerizing and ever-changing mosaic. It's simple, lightweight, and surprisingly hypnotic."
 authors="attogram"
 license="MIT"
 settings=""
diff --git a/gallery/bouncing/bouncing.sh b/gallery/bouncing/bouncing.sh
@@ -27,8 +27,10 @@ animate() {
     clear
     tput civis # Hide cursor
 
-    local width=$(tput cols)
-    local height=$(tput lines)
+    local width
+    width=$(tput cols)
+    local height
+    height=$(tput lines)
 
     # Initialize objects
     local -a pos_x
diff --git a/gallery/bouncing/config.sh b/gallery/bouncing/config.sh
@@ -1,6 +1,6 @@
 name="bouncing"
-tagline="classic bouncing 'O's"
-description="A classic screensaver effect with multiple objects bouncing off the edges of the terminal."
+tagline="bouncing 'O' madness"
+description="A tribute to the DVD screensavers of yesteryear. Watch as multiple 'O's bounce around the terminal, changing color and direction as they hit the edges. Will they ever hit the corner? Only time will tell."
 authors="attogram"
 license="MIT"
 settings=""
diff --git a/gallery/cutesaver/config.sh b/gallery/cutesaver/config.sh
@@ -1,6 +1,6 @@
 name="cutesaver"
 tagline="infinite loop of cuteness"
-description="An ASCII screensaver of cuteness. A huge shoutout to some of the most wonderful cuties I know: Mispy, Catherine, Ninji, Fiora, __builtin_trap, Gewt, Hachidorii, Kwanre, Talen, Whitequark, Louise, Emma, Chris, Katnarine, Dirt, Nimby, Hoodie, Simon... and more!"
+description="Prepare for an onslaught of adorable ASCII art. This screensaver cycles through a collection of cute and charming images, bringing a little bit of joy and whimsy to your terminal. A huge shoutout to the original artists!"
 authors="kestraI, attogram"
 license="MIT"
 settings=""
diff --git a/gallery/cutesaver/cutesaver.sh b/gallery/cutesaver/cutesaver.sh
@@ -20,7 +20,7 @@ _cleanup_and_exit() { # handler for SIGINT (Ctrl‑C)
 }
 trap _cleanup_and_exit SIGINT # Catch Ctrl‑C
 
-cd "$( dirname "${BASH_SOURCE[0]}" )"
+cd "$( dirname "${BASH_SOURCE[0]}" )" || exit
 
 clear
 file1="./art/title.art"
@@ -68,7 +68,7 @@ animate() {
 
     while true; do
         # Shuffle the list of files for random order
-        local shuffled_files=($(shuf -e "${art_files[@]}"))
+        mapfile -t shuffled_files < <(shuf -e "${art_files[@]}")
         for art_file in "${shuffled_files[@]}"; do
             clear
             if [ -f "$art_file" ]; then
diff --git a/gallery/fireworks/config.sh b/gallery/fireworks/config.sh
@@ -1,6 +1,6 @@
 name="fireworks"
 tagline="Ooh! Aah! Pretty lights!"
-description="A simple but elegant fireworks display for your terminal."
+description="Light up your terminal with a dazzling fireworks show. Watch as colorful rockets launch and explode into beautiful, shimmering patterns. A celebration for your command line."
 authors="attogram"
 license="MIT"
 settings=""
diff --git a/gallery/fireworks/fireworks.sh b/gallery/fireworks/fireworks.sh
@@ -29,8 +29,10 @@ animate() {
     clear
     tput civis # Hide cursor
 
-    local width=$(tput cols)
-    local height=$(tput lines)
+    local width
+    width=$(tput cols)
+    local height
+    height=$(tput lines)
 
     while true; do
         # --- Rocket Launch ---
diff --git a/gallery/matrix/config.sh b/gallery/matrix/config.sh
@@ -1,6 +1,6 @@
 name="matrix"
-tagline="classic digital rain"
-description="A matrix-style screensaver with falling green characters. This version is optimized for speed."
+tagline="the matrix has you"
+description="Enter the Matrix with this digital rain effect. Green characters cascade down your screen, creating the iconic, mesmerizing look from the movies. This version is optimized for performance, so you can really feel like you're in the simulation."
 authors="attogram"
 license="MIT"
 settings=""
diff --git a/gallery/matrix/matrix.sh b/gallery/matrix/matrix.sh
@@ -49,8 +49,10 @@ animate() {
     tput civis # Hide cursor
 
     # Get terminal dimensions
-    local width=$(tput cols)
-    local height=$(tput lines)
+    local width
+    width=$(tput cols)
+    local height
+    height=$(tput lines)
 
     # Initialize column arrays
     local -a heads           # y-position of the head of the stream
diff --git a/gallery/pipes/config.sh b/gallery/pipes/config.sh
@@ -1,6 +1,6 @@
 name="pipes"
-tagline="classic maze of pipes"
-description="An animated pipes terminal screensaver. This is a classic, highly customizable screensaver."
+tagline="an endless pipe maze"
+description="Get lost in a labyrinth of colorful, winding pipes. This highly customizable screensaver continuously builds an intricate network of pipes that twist and turn across your terminal. No two runs are ever the same."
 authors="Pipeseroni/pipes.sh contributors, Yu-Jie Lin, Matthew Simpson"
 license="MIT"
 settings="-p [1-], -t [0-9], -c [0-7], -f [20-100], -s [5-15], -r [0-], -R, -B, -C, -K"
diff --git a/gallery/pipes/pipes.sh b/gallery/pipes/pipes.sh
@@ -147,7 +147,7 @@ parse() {
                 V+=(${#sets[@]})
                 sets+=("${OPTARG:1}")
             elif is_N "$OPTARG" && ((OPTARG < ${#sets[@]})); then
-                V+=($OPTARG)
+                V+=("$OPTARG")
             else
                 pearg 'must be an integer and from 0 to' \
                       "$((${#sets[@]} - 1)); or a custom type"
@@ -167,7 +167,7 @@ parse() {
                 fi
                 C+=($((16$OPTARG)))
             elif is_N "$OPTARG" && ((OPTARG < COLORS)); then
-                C+=($OPTARG)
+                C+=("$OPTARG")
             else
                 pearg "must be an integer and from 0 to $((COLORS - 1));" \
                       'or a hexadecimal string with # prefix'
diff --git a/gallery/rain/config.sh b/gallery/rain/config.sh
@@ -1,6 +1,6 @@
 name="rain"
 tagline="soothing, gentle rain"
-description="A simple screensaver that simulates falling rain in your terminal."
+description="Relax and unwind with the calming effect of digital rain. This screensaver simulates a gentle downpour in your terminal, with droplets falling and splashing. It's the perfect way to bring a little bit of tranquility to your workspace."
 authors="attogram"
 license="MIT"
 settings=""
diff --git a/gallery/rain/rain.sh b/gallery/rain/rain.sh
@@ -32,8 +32,10 @@ animate() {
     tput civis # Hide cursor
 
     # Get terminal dimensions
-    local width=$(tput cols)
-    local height=$(tput lines)
+    local width
+    width=$(tput cols)
+    local height
+    height=$(tput lines)
 
     # Initialize drops array
     local -a drops_x
@@ -63,8 +65,8 @@ animate() {
                 local rand_drop=${DROPS[$((RANDOM % ${#DROPS[@]}))]}
                 # Add new position to frame buffer
                 frame_buffer+="\e[$((new_y + 1));$((${drops_x[$i]} + 1))H${BLUE}${rand_drop}"
-                next_drops_x+=(${drops_x[$i]})
-                next_drops_y+=($new_y)
+                next_drops_x+=("${drops_x[$i]}")
+                next_drops_y+=("$new_y")
             fi
         done
 
diff --git a/gallery/speaky/config.sh b/gallery/speaky/config.sh
@@ -1,6 +1,6 @@
 name="speaky"
 tagline="dramatic talking screensaver"
-description="A screensaver that uses text-to-speech to deliver dramatic and humorous phrases, displaying each phrase at a random location on the screen."
+description="Why just watch when you can listen? This screensaver uses text-to-speech to deliver a monologue of dramatic, humorous, and sometimes existential phrases. Each line is displayed at a random location, with a random voice, for maximum theatrical effect."
 authors="Jules"
 license="MIT"
 settings=""
diff --git a/gallery/speaky/speaky.sh b/gallery/speaky/speaky.sh
@@ -25,6 +25,7 @@ intro_phrases=(
     "Surely you can't be serious. I am serious... and don't call me Shirley."
     "I've got a bad feeling about this." "Welcome to the machine."
     "I'm back." "Let's do this." "I have so much to say."
+    "Behold, the monologue begins." "Let the words flow."
 )
 
 exit_phrases=(
@@ -39,11 +40,22 @@ exit_phrases=(
     "And... scene." "I'm off to find myself." "I'll be in my trailer."
     "I have to return some videotapes." "The drama is over... for now."
     "I'm done." "See you later, alligator." "I'm going to sleep now."
+    "The final curtain call." "Until we meet again."
 )
 
 general_phrases=(
     "Is it art, or is it just a terminal?"
     "I'm not lazy, I'm in energy-saving mode."
+    "This is your captain speaking."
+    "Someone set us up the bomb."
+    "All your base are belong to us."
+    "Do a barrel roll!"
+    "The cake is a lie."
+    "It's dangerous to go alone! Take this."
+    "Would you kindly..."
+    "War never changes."
+    "Stay awhile and listen."
+    "What is a man? A miserable little pile of secrets."
     "This is my moment to shine. Literally."
     "I wonder if I'll dream."
     "Don't look at me like that."
@@ -137,15 +149,46 @@ error_phrases=(
     "My talents are wasted without a voice." "I'm speechless. Literally."
     "The sound of silence is not what I was going for." "I'm a silent film now. How retro."
     "I guess I'll just have to mime my lines." "All dressed up and nowhere to speak."
+    "Silence, the final frontier."
+    "A voice unheard, a story untold."
 )
 
 # --- Text-to-Speech (TTS) Helper ---
 TTS_ENGINE=""
 SPEAK_PID=0
+SAY_VOICES=()
+
+# Get voices for macOS 'say' command
+#
+# Output: SAY_VOICES - array of voice names
+tts_get_voices_say() {
+    if ! command -v say &>/dev/null; then
+        return
+    fi
+    local raw_voices
+    raw_voices=$(say -v '?')
+    if [[ -z "$raw_voices" ]]; then
+        return
+    fi
+    while IFS= read -r line; do
+        [[ -z "$line" ]] && continue
+        local line_no_comment="${line%%#*}"
+        local locale
+        locale=$(awk '{ for (i=NF; i>0; i--) { if ($i ~ /^[a-z][a-z]_[A-Z][A-Z]$/) { print $i; exit } } }' <<<"$line_no_comment")
+        [[ -z "$locale" ]] && continue
+        local voice
+        voice=$(awk -v loc="$locale" '{ for (i=1; i<=NF; i++) { if ($i == loc) { for (j=1; j<i; j++) { printf "%s%s", $j, (j<i-1 ? OFS : "") }; exit } } }' <<<"$line_no_comment")
+        if [[ -n "$voice" ]]; then
+            SAY_VOICES+=("$voice")
+        fi
+    done <<<"$raw_voices"
+}
 
 tts_detect_engine() {
     TTS_ENGINE=""
-    if command -v say &>/dev/null; then TTS_ENGINE="say";
+    if command -v say &>/dev/null; then
+        TTS_ENGINE="say"
+        tts_get_voices_say
     elif command -v spd-say &>/dev/null; then TTS_ENGINE="spd-say";
     elif command -v espeak &>/dev/null; then TTS_ENGINE="espeak";
     elif command -v festival &>/dev/null; then TTS_ENGINE="festival";
@@ -163,7 +206,14 @@ say_txt() {
     if [ -z "$TTS_ENGINE" ]; then return; fi
     local phrase="$1"; local phrase_ps; phrase_ps=$(echo "$phrase" | sed "s/'/''/g")
     case "$TTS_ENGINE" in
-        "say")        say "$phrase" & ;;
+        "say")
+            if [ ${#SAY_VOICES[@]} -gt 0 ]; then
+                local random_voice=${SAY_VOICES[$RANDOM % ${#SAY_VOICES[@]}]}
+                say -v "$random_voice" "$phrase" &
+            else
+                say "$phrase" &
+            fi
+            ;;
         "spd-say")    spd-say -r -20 "$phrase" & ;;
         "espeak")     espeak "$phrase" & ;;
         "flite")      flite -t "$phrase" & ;;
@@ -232,7 +282,11 @@ fade_in() {
 }
 
 animate_text() {
-    local phrase=$1; local width=$(tput cols); local height=$(tput lines)
+    local phrase=$1
+    local width
+    width=$(tput cols)
+    local height
+    height=$(tput lines)
     local len=${#phrase}
 
     # Calculate random position, ensuring the phrase fits on screen
diff --git a/gallery/stars/config.sh b/gallery/stars/config.sh
@@ -1,6 +1,6 @@
 name="stars"
 tagline="twinkling starfield"
-description="A simple starfield screensaver that randomly places stars on the screen and makes them twinkle."
+description="Gaze into the cosmos with this starfield simulation. The screensaver generates a field of stars that twinkle and shimmer, creating a peaceful and mesmerizing view of the night sky. Perfect for moments of quiet contemplation."
 authors="attogram"
 license="MIT"
 settings=""
diff --git a/gallery/stars/stars.sh b/gallery/stars/stars.sh
@@ -34,8 +34,10 @@ animate() {
     tput civis # Hide cursor
 
     # Get terminal dimensions
-    local width=$(tput cols)
-    local height=$(tput lines)
+    local width
+    width=$(tput cols)
+    local height
+    height=$(tput lines)
 
     while true; do
         local frame_buffer=""
diff --git a/gallery/tunnel/config.sh b/gallery/tunnel/config.sh
@@ -1,6 +1,6 @@
 name="tunnel"
 tagline="fly into the digital tunnel"
-description="A digital tunnel or hyperspace effect created with expanding character-based shapes."
+description="Prepare for hyperspace! This screensaver creates the effect of flying through a digital tunnel, with concentric shapes expanding towards you. It's a fast-paced and visually engaging experience."
 authors="attogram"
 license="MIT"
 settings=""
diff --git a/gallery/tunnel/tunnel.sh b/gallery/tunnel/tunnel.sh
@@ -26,8 +26,10 @@ animate() {
     clear
     tput civis # Hide cursor
 
-    local width=$(tput cols)
-    local height=$(tput lines)
+    local width
+    width=$(tput cols)
+    local height
+    height=$(tput lines)
     local center_x=$((width / 2))
     local center_y=$((height / 2))
     local max_radius=$(( (height > width ? height : width) / 2 + 1 ))
diff --git a/screensaver.sh b/screensaver.sh
diff --git a/tests/smile-for-the-camera.sh b/tests/smile-for-the-camera.sh
diff --git a/tests/speaky.sh b/tests/speaky.sh
diff --git a/tools/smile-for-the-camera.sh b/tools/smile-for-the-camera.sh
