diff --git a/config/spicetify/Backup/login.spa b/config/spicetify/Backup/login.spa index 66843e2..3ba1b56 100755 Binary files a/config/spicetify/Backup/login.spa and b/config/spicetify/Backup/login.spa differ diff --git a/config/spicetify/Backup/xpui.spa b/config/spicetify/Backup/xpui.spa index f664168..cd182d8 100755 Binary files a/config/spicetify/Backup/xpui.spa and b/config/spicetify/Backup/xpui.spa differ diff --git a/config/spicetify/config-xpui.ini b/config/spicetify/config-xpui.ini index b50fd25..820ff92 100644 --- a/config/spicetify/config-xpui.ini +++ b/config/spicetify/config-xpui.ini @@ -27,5 +27,5 @@ sidebar_config = 1 ; DO NOT CHANGE! [Backup] -version = 1.2.8.923.g4f94bf0d +version = 1.2.9.743.g85d9593d with = 2.16.0 diff --git a/scripts/backup b/scripts/backup index 8490d1c..24290d7 100755 --- a/scripts/backup +++ b/scripts/backup @@ -144,6 +144,7 @@ for path in "${SOURCES[@]}"; do delete_old "$path" done -sync +# Sync to MEGA +# sync echo -e "${GRN}Backups done!${RST}" diff --git a/scripts/sort-wallpapers b/scripts/sort-wallpapers index 21ddc8c..62d5763 100755 --- a/scripts/sort-wallpapers +++ b/scripts/sort-wallpapers @@ -2,14 +2,41 @@ set -euo pipefail -# WALLPAPER_DIR=${HOME}/Drives/Stuff/Pictures/Waifus -WALLPAPER_DIR=${HOME}/Pictures/Screenshots +SCAN_DIR=${HOME}/Drives/Stuff/Pictures/Waifus +OUPUT_DIR=${HOME}/Drives/Stuff/Pictures/Wallpapers +# SCAN_DIR=${HOME}/Pictures/Screenshots + +franchises=( + Mario + Zelda + Persona +) + +orientations=( + Portrait + Landscape +) + +# TODO: give option to exit script while inside fzf +get_fzf() { + # run inside subshell because fzf exit with 1 when no mach has been selected + output="$( + printf "%s\n" "$@" | fzf \ + --reverse \ + --height '10' \ + --print-query \ + --cycle \ + --bind \ + "alt-1:pos(1)+accept,alt-2:pos(2)+accept,alt-3:pos(3)+accept,alt-4:pos(4)+accept,alt-5:pos(5)+accept,alt-6:pos(6)+accept,alt-7:pos(7)+accept,alt-8:pos(8)+accept,alt-9:pos(9)+accept,alt-0:pos(10)+accept" + )" + echo "$output" +} readarray -td '' wallpapers < <( - fd -ap -e jpg -e jpeg -e png -e webp \ - --max-depth 2 \ - --print0 \ - --base-directory "$WALLPAPER_DIR" + fd -ap -e jpg -e jpeg -e png -e webp \ + --max-depth 2 \ + --print0 \ + --base-directory "$SCAN_DIR" ) # open all images in imv @@ -18,12 +45,18 @@ pid=$! sleep 1 +for dir in "${orientations[@]}"; do + mkdir -p "$OUPUT_DIR/$dir" +done + for img in "${wallpapers[@]}"; do + orientation=$(get_fzf "${orientations[@]}") + franchise=$(get_fzf "${franchises[@]}") - echo "$img" - sleep ".2" + cp "$img" "$OUPUT_DIR/$orientation" - imv-msg "$pid" next + echo "$img $orientation $franchise" + imv-msg "$pid" next done imv-msg "$pid" close all