Fixing waifus and adding refined rename script

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lolcat"]
+	path = lolcat
+	url = https://github.com/sevi-kun/lolcat.git

README.md

@@ -12,6 +12,22 @@ Just a little script and some 256x images for some terminal shine UwU.
 
 Just place this folder somewhere, and add the path of the motd.sh to your .bashrc.
 
+```
+git clone https://git.nussnougate.net/Lexeloid/.motd.git
+```
+
+### lolcat
+
+> For faster lolcat we use a C implementation from [jaseg](https://github.com/jaseg/lolcat).
+
+```
+git submodule init
+git submodule update
+cd lolcat
+make
+```
+
+
 ## Limitations
 
 At the moment, it only works in the kitty terminal.

motd.py

@@ -0,0 +1,85 @@
+#!/bin/python
+
+from functools import cache
+import os
+import random
+#import ueberzug.lib.v0 as ueberzug
+import subprocess
+import time
+import fnmatch
+from curses.textpad import Textbox, rectangle
+
+modpath     = os.path.dirname(__file__)
+cachefile   = "/tmp/waifu.cache"
+resolution  = 256
+center      = True
+lolcat      = False
+unameArg    = "-sr"
+uptimeArg   = "--pretty"
+terminal    = os.get_terminal_size()
+minTermW    = 200
+#unameColor  = "\033[1;38;5;93m"
+#uptimeColor = "\033[1;38;5;99m"
+
+#print len([name for name in os.listdir(f'{modpath}/waifus') if os.path.isfile(name)])
+DIR=modpath + '/waifus'
+#print(len([name for name in os.listdir(DIR) if os.path.isfile(os.path.join(DIR, name))]))
+
+#filter waifus
+waifulist = os.listdir(DIR)
+waifus_raw = fnmatch.filter(waifulist, '*.256.png')
+waifus = list(waifus_raw)
+waifuindex = random.randint(1, len(waifus))
+
+
+
+
+
+#print(modpath)
+
+#######################
+
+#If term Kitty
+print(len(waifus))
+
+if random.randint(0,1) == 0:
+    if os.path.getsize(cachefile) != 0:
+        f = open(cachefile, 'r')
+        waifuindex = f.read()
+        print(int(waifuindex))
+        #print(len(waifus))
+    #Else Add File
+    ###############  
+    if int(waifuindex) < len(waifus):
+        waifu = waifus[int(waifuindex)]
+        waifuindex = int(waifuindex) + 1
+        f = open(cachefile, 'w')
+        f.write(str(waifuindex))
+    else:
+        waifuindex = random.randint(1, len(waifus))
+        f = open(cachefile, 'w')
+        f.write(str(waifuindex))
+        waifu = waifus[int(waifuindex)] 
+else:
+    waifu = waifus[int(waifuindex)]
+#######################
+
+#Declare static methods
+@staticmethod
+def showImage():
+    subprocess.run(["/usr/bin/kitty", "icat", DIR+"/"+waifu])
+
+def showUname(unameArg):
+    os.system("/usr/bin/uname " + unameArg)
+
+
+
+def showUptime(uptimeArg):
+    os.system("/usr/bin/uptime " + uptimeArg)
+
+#def doLolcat():
+#	if __name__ == '__main__':
+#		showUname(unameArg)
+#		showUptime(uptimeArg)
+
+showImage()

motd.sh

@@ -1,41 +1,56 @@
-# Fancy waifu motd
+#####################################################################
+#                                                                   #
+#                       Fancy waifu motd                            #
+#                                                                   #
+#####################################################################
 
-MOTDPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"          # path to motd folder
-CACHEFILE="/tmp/waifu.cache"          # to cache waifu state
-RESOLUTION=256                        # resolution of waifu
-CENTER=true                           # center motd?
-LOLCAT=false                           # use lolcat? (start delay)
-UNAMEARG="-sr"                        # uname arguments
-UPTIMEARG="--pretty"                  # uptime arguments
-tput_cols=$(/usr/bin/tput cols)       # terminal columns
-MINTERMWIDTH=200                      # minimal width of term, to display motd
-UNAMECOLOR="\033[1;38;5;93m"
-UPTIMECOLOR="\033[1;38;5;99m"
 
-WAIFUS=$(($(ls $MOTDPATH/waifus/*.256.png | wc -w) - 1))   # count of waifus
+##### User config
+#####################################################################
+RESOLUTION=128                                                      # resolution of waifu
+CENTER=true                                                         # center motd?
+LOLCAT=true                                                         # use lolcat? (start delay)
+UNAMEARG="-sr"                                                      # uname arguments
+UPTIMEARG="--pretty"                                                # uptime arguments
+MINTERMWIDTH=100                                                    # minimal width of term, to display motd (change depending on resolution, 0 to disable)
+MOTDCOLOR="\033[0m"                                                 # Bash color code for motd text (no lolcat)
+UNAMECOLOR="\033[0m"                                                # Bash color code for uname (no lolcat)
+UPTIMECOLOR="\033[0m"                                               # Bash color code for uptime (no lolcat)
+#####################################################################
+
+
+##### Script config
+#####################################################################
+CACHEFILE="$HOME/.cache/waifu.cache"                                # to cache waifu state
+MOTDPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"    # path to motd folder
+tput_cols=$(/usr/bin/tput cols)                                     # terminal columns
+WAIFUS=$(($(ls $MOTDPATH/waifus/*.256.png | wc -w) - 1))            # count of waifus
+lx="$MOTDPATH/lolcat/lolcat"                                        # lolcat
+#####################################################################
+
 
 function output() {
   val=0
   if [ $1 == "true" ]; then val=$(($val + 1)); fi
   if [ $2 == "true" ]; then val=$(($val + 2)); fi
-  if [ -f "/usr/games/lolcat" ]; then lx="/usr/games/lolcat"; else lx="/usr/bin/lolcat"; fi
   case "$val" in
     0)
+      echo -en $UPTIMECOLOR
       /bin/cat $MOTDPATH/motd
+      echo -en $UNAMECOLOR
       uname $UNAMEARG
+      echo -en $UPTIMECOLOR
       uptime $UPTIMEARG
       ;;
 
     1)
       /bin/cat $MOTDPATH/motd | $lx
-      echo "test"
-      echo -en $UNAMECOLOR
       uname $UNAMEARG | $lx
-      echo -en $UPTIMECOLOR
       uptime $UPTIMEARG | $lx
       ;;
 
     2)
+      echo -en $MOTDCOLOR
       /bin/cat $MOTDPATH/motd | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }'
       echo -en $UNAMECOLOR
       uname $UNAMEARG | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }'
@@ -44,9 +59,7 @@ function output() {
       ;;
     3)
       /bin/cat $MOTDPATH/motd | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }' | $lx
-      echo -en $UNAMECOLOR
       uname $UNAMEARG | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }' | $lx
-      echo -en $UPTIMECOLOR
       uptime $UPTIMEARG | awk '{ z = '$tput_cols' - length; y = int(z / 2); x = z - y; printf "%*s%s%*s\n", x, "", $0, y, ""; }' | $lx
       ;;
   esac
@@ -54,8 +67,8 @@ function output() {
 printf  '\033[0m' #reset colors
 }
 
-# if [ $tput_cols -gt $MINTERMWIDTH ]
+ if [ $tput_cols -gt $MINTERMWIDTH ]
-# then
+ then
   if [ $TERM == "xterm-kitty" ]
   then
     if [ $((0 + RANDOM % 2)) -eq 0 ]
@@ -81,4 +94,4 @@ printf  '\033[0m' #reset colors
     fi
   fi
   output $LOLCAT $CENTER
-# fi
+ fi

waifus/count.py

@@ -0,0 +1,13 @@
+# This script checks if corresponding png in format waifu-<count>.<res>.png exists. Values for <res> can be 64, 128, 256.
+
+
+import sys
+import os
+
+count = 513
+
+for i in range(1, count + 1):
+    for res in [64, 128, 256]:
+        filename = "waifu-" + str(i) + "." + str(res) + ".png"
+        if not os.path.exists(filename):
+            print(filename)

waifus/rename.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+shopt -s nullglob  # Prevent errors if no files match
+
+# Create a temporary directory
+temp_dir=$(mktemp -d)
+
+# Associative array to store unique image bases
+declare -A unique_images
+
+# Extract base names without resolution suffix
+for file in *.64.png; do
+    base="${file%.64.png}"
+    unique_images["$base"]=1
+done
+
+# Convert keys to sorted array
+unique_bases=("${!unique_images[@]}")
+IFS=$'\n' sorted_bases=($(sort <<<"${unique_bases[*]}"))
+unset IFS
+
+# Renaming process
+counter=0
+for base in "${sorted_bases[@]}"; do
+    for res in 64 128 256; do
+        old_file="${base}.${res}.png"
+        new_file="${temp_dir}/waifu-${counter}.${res}.png"
+
+        if [[ -f "$old_file" ]]; then
+            mv "$old_file" "$new_file"
+            echo "Copied: $old_file -> $new_file"
+        fi
+    done
+    ((counter++))
+done
+
+# Move the renamed files back
+echo "Moving new files back..."
+mv "${temp_dir}"/* .
+
+# Remove the temporary directory
+rmdir "${temp_dir}"
+
+echo "Renaming complete and safe!"
+