mpvpaper: improve perf&logic

1 files changed, 56 insertions, 39 deletions

diff --git a/mpvpaper.sh b/mpvpaper.sh
index 21c40e6..123143a 100755
--- a/mpvpaper.sh
+++ b/mpvpaper.sh
@@ -3,7 +3,7 @@ XDG_VIDEOS_DIR="${XDG_VIDEOS_DIR:-$HOME/Videos}"
 XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
 XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 WALLPAPERS="$XDG_VIDEOS_DIR/wallpapers/"
-swwwarg="--transition-type random --transition-duration 0.85 --transition-fps 160 --transition-bezier 1,0.33,0.3,1"
+# swwwarg="--transition-type random --transition-duration 0.85 --transition-fps 160 --transition-bezier 1,0.33,0.3,1"
 
 # colors
 RED='\033[0;31m'
@@ -13,42 +13,59 @@ NC='\033[0m'
 DELAY=1800
 
 while true; do
-    (while ! swww query; do swww-daemon; done) &
-    current_bg="$(cat $XDG_CACHE_HOME/current.bg)"
-    if ! [ "$current_bg" ]; then
-        echo -e "${RED}current.bg not set, regenerating it${NC}"
-        current_bg="$(find "$WALLPAPERS" | shuf -n 1)"
-        echo "$current_bg" > $XDG_CACHE_HOME/current.bg
-        echo -e "${GREEN}Regenerating wallpappath${NC}"
-    fi
-    wallpappath=$(find "$WALLPAPERS" | shuf -n 1)
-
-    if [ ! -f "$XDG_CACHE_HOME/$(basename "$current_bg").png" ]; then ffmpeg -hwaccel cuda -i "$current_bg" -y "$XDG_CACHE_HOME/$(basename $current_bg).png"; fi
-
-    # wallust run --skip-sequences $current_bg
-    # wallust run --backend kmeans --skip-sequences $current_bg & # using cache now
-    killall mpvpaper
-    swww img "$XDG_CACHE_HOME/$(basename "$current_bg").png" $swwwarg
-    # for output in $(hyprctl monitors | grep "Monitor" | awk '{print $2}'); do
-        # mpvpaper --auto-pause --mpv-options="hwdec=auto --no-audio --loop" --fork "$output" "$current_bg"
-    mpvpaper --auto-pause --mpv-options="hwdec=auto --no-audio --loop" --fork "*" "$current_bg"
-    # done
-
-    wallust run --backend full --skip-sequences "$XDG_CACHE_HOME/$(basename "$current_bg").png" &
-    hyprctl reload config-only
-    echo "$XDG_CACHE_HOME/$(basename "$current_bg").png"
-
-    swaync-client --reload-css & pywalfox update
-
-    prime-run ffmpeg -hwaccel cuda -i "$current_bg" -y "$XDG_CACHE_HOME/bg.png"
-    current_bg=$(cat "$XDG_CACHE_HOME/current.bg")
-    echo "$wallpappath" > "$XDG_CACHE_HOME/current.bg"
-    
-    # update hyprlock
-    killall -USR2 hyprlock
-
-    # generates cache for next wallpaper
-    ( prime-run ffmpeg -hwaccel cuda -i "$wallpappath" -y "$XDG_CACHE_HOME/$(basename $wallpappath).png"; nice -n 20 wallust run --backend full --skip-templates --skip-sequences "$XDG_CACHE_HOME/$(basename $wallpappath).png" ) &
-
-    nice -n 20 sleep $DELAY
+  # (while ! swww query; do swww-daemon; done) &
+  current_bg="$(cat $XDG_CACHE_HOME/current.bg)"
+  if ! [ "$current_bg" ]; then
+      echo -e "${RED}current.bg not set, regenerating it${NC}"
+      current_bg="$(find "$WALLPAPERS" | shuf -n 1)"
+      echo "$current_bg" > $XDG_CACHE_HOME/current.bg
+      echo -e "${GREEN}Regenerating wallpappath${NC}"
+  fi
+  wallpappath=$(find "$WALLPAPERS" | shuf -n 1)
+
+  if [ ! -f "$XDG_CACHE_HOME/$(basename "$current_bg").png" ]; then ffmpeg -hwaccel cuda -i "$current_bg" -y "$XDG_CACHE_HOME/$(basename $current_bg).png"; fi
+
+  # wallust run --skip-sequences $current_bg
+  # wallust run --backend kmeans --skip-sequences $current_bg & # using cache now
+  # swww img "$XDG_CACHE_HOME/$(basename "$current_bg").png" $swwwarg
+  # for output in $(hyprctl monitors | grep "Monitor" | awk '{print $2}'); do
+      # mpvpaper --auto-pause --mpv-options="hwdec=auto --no-audio --loop" --fork "$output" "$current_bg"
+
+  OLD_MPVPAPER_PIDS=$(pidof mpvpaper)
+  mpvpaper --auto-pause --mpv-options="hwdec=auto --no-audio --loop --mute" --fork "*" "$current_bg"
+
+  # Wait a brief moment to ensure new instance is running
+  sleep 0.1
+
+  # Kill old instances if they exist
+  if [ -n "$OLD_MPVPAPER_PIDS" ]; then
+      for pid in $OLD_MPVPAPER_PIDS; do
+          kill $pid 2>/dev/null
+      done
+  fi
+
+  # done
+
+  wallust run --backend full --skip-sequences "$XDG_CACHE_HOME/$(basename "$current_bg").png"
+  echo "$XDG_CACHE_HOME/$(basename "$current_bg").png"
+
+  # reload hyprland
+  hyprctl reload config-only &
+
+  swaync-client --reload-css & # & pywalfox update
+
+  gdbus call --session --dest com.mitchellh.ghostty --object-path /com/mitchellh/ghostty --method org.gtk.Actions.Activate reload-config [] [] &
+
+  # update hyprlock
+  killall -USR2 hyprlock &
+
+  # next wallpaper
+  prime-run ffmpeg -hwaccel cuda -i "$current_bg" -y "$XDG_CACHE_HOME/bg.png"
+  current_bg=$(cat "$XDG_CACHE_HOME/current.bg")
+  echo "$wallpappath" > "$XDG_CACHE_HOME/current.bg"
+
+  # generates cache for next wallpaper
+  ( prime-run ffmpeg -hwaccel cuda -i "$wallpappath" -y "$XDG_CACHE_HOME/$(basename $wallpappath).png"; nice -n 20 wallust run --backend full --skip-templates --skip-sequences "$XDG_CACHE_HOME/$(basename $wallpappath).png" ) &
+
+  nice -n 20 sleep $DELAY
 done