fix path for neatcli

This commit is contained in:
2026-06-21 15:18:56 -07:00
parent 9963dc0327
commit 149b818036

View File

@@ -4,20 +4,20 @@ set -euo pipefail
SOURCE="$HOME/ComfyUI/output" SOURCE="$HOME/ComfyUI/output"
SHARE_DIR="/mini.nas/miniShare1/Pictures" SHARE_DIR="/mini.nas/miniShare1/Pictures"
STATE_FILE="$HOME/.local/state/comfyui-sync.state" STATE_FILE="$HOME/.local/state/comfyui-sync.state"
NEATCLI="$(command -v neatcli || true)" NEATCLI="$(command -v /home/linuxbrew/.linuxbrew/bin/neatcli || true)"
RENAME_SCRIPT="$HOME/git/schmeeve-toolz/rename-ai-snaps" RENAME_SCRIPT="$HOME/git/schmeeve-toolz/rename-ai-snaps"
ORGANIZE_SCRIPT="$HOME/git/schmeeve-toolz/organize-images" ORGANIZE_SCRIPT="$HOME/git/schmeeve-toolz/organize-images"
mkdir -p "$(dirname "$STATE_FILE")" mkdir -p "$(dirname "$STATE_FILE")"
if [ ! -d "$SOURCE" ]; then if [ ! -d "$SOURCE" ]; then
echo "[comfyui-sync] ERROR: Source $SOURCE does not exist" echo "[comfyui-sync] ERROR: Source $SOURCE does not exist"
exit 1 exit 1
fi fi
if [ ! -d "$SHARE_DIR" ]; then if [ ! -d "$SHARE_DIR" ]; then
echo "[comfyui-sync] ERROR: Share dir $SHARE_DIR does not exist" echo "[comfyui-sync] ERROR: Share dir $SHARE_DIR does not exist"
exit 1 exit 1
fi fi
echo "[comfyui-sync] Starting at $(date)" echo "[comfyui-sync] Starting at $(date)"
@@ -25,47 +25,47 @@ echo "[comfyui-sync] Starting at $(date)"
current_files=$(find "$SOURCE" -maxdepth 1 -type f -printf '%f\n' | sort) current_files=$(find "$SOURCE" -maxdepth 1 -type f -printf '%f\n' | sort)
if [ -f "$STATE_FILE" ]; then if [ -f "$STATE_FILE" ]; then
new_files=$(comm -13 <(sort "$STATE_FILE") <(echo "$current_files")) new_files=$(comm -13 <(sort "$STATE_FILE") <(echo "$current_files"))
else else
echo "[comfyui-sync] First run — all files considered new." echo "[comfyui-sync] First run — all files considered new."
new_files="$current_files" new_files="$current_files"
fi fi
new_count=$(echo "$new_files" | grep -c '[^[:space:]]' || true) new_count=$(echo "$new_files" | grep -c '[^[:space:]]' || true)
if [ "$new_count" -gt 0 ]; then if [ "$new_count" -gt 0 ]; then
echo "[comfyui-sync] Copying $new_count new file(s)..." echo "[comfyui-sync] Copying $new_count new file(s)..."
while IFS= read -r f; do while IFS= read -r f; do
[ -z "$f" ] && continue [ -z "$f" ] && continue
cp "$SOURCE/$f" "$SHARE_DIR/" cp "$SOURCE/$f" "$SHARE_DIR/"
done <<< "$new_files" done <<<"$new_files"
echo "$current_files" > "$STATE_FILE" echo "$current_files" >"$STATE_FILE"
echo "[comfyui-sync] State file updated." echo "[comfyui-sync] State file updated."
else else
echo "[comfyui-sync] No new files to copy." echo "[comfyui-sync] No new files to copy."
fi fi
if [ -n "$NEATCLI" ]; then if [ -n "$NEATCLI" ]; then
echo "[comfyui-sync] Running neatcli organize --by-type -e $SHARE_DIR" echo "[comfyui-sync] Running neatcli organize --by-type -e $SHARE_DIR"
"$NEATCLI" organize --by-type -e "$SHARE_DIR" "$NEATCLI" organize --by-type -e "$SHARE_DIR"
else else
echo "[comfyui-sync] WARNING: neatcli not found, skipping organize step" echo "[comfyui-sync] WARNING: neatcli not found, skipping organize step"
fi fi
IMAGES_DIR="$SHARE_DIR/Images" IMAGES_DIR="$SHARE_DIR/Images"
if [ -d "$IMAGES_DIR" ] && [ -x "$RENAME_SCRIPT" ]; then if [ -d "$IMAGES_DIR" ] && [ -x "$RENAME_SCRIPT" ]; then
echo "[comfyui-sync] Running rename-ai-snaps on $IMAGES_DIR" echo "[comfyui-sync] Running rename-ai-snaps on $IMAGES_DIR"
cd "$IMAGES_DIR" && "$RENAME_SCRIPT" . --no-interactive cd "$IMAGES_DIR" && "$RENAME_SCRIPT" . --no-interactive
elif [ ! -x "$RENAME_SCRIPT" ]; then elif [ ! -x "$RENAME_SCRIPT" ]; then
echo "[comfyui-sync] WARNING: rename-ai-snaps not found, skipping rename step" echo "[comfyui-sync] WARNING: rename-ai-snaps not found, skipping rename step"
fi fi
if [ -d "$IMAGES_DIR" ] && [ -x "$ORGANIZE_SCRIPT" ]; then if [ -d "$IMAGES_DIR" ] && [ -x "$ORGANIZE_SCRIPT" ]; then
echo "[comfyui-sync] Running organize-images on $IMAGES_DIR" echo "[comfyui-sync] Running organize-images on $IMAGES_DIR"
"$ORGANIZE_SCRIPT" "$IMAGES_DIR" --execute "$ORGANIZE_SCRIPT" "$IMAGES_DIR" --execute
elif [ ! -x "$ORGANIZE_SCRIPT" ]; then elif [ ! -x "$ORGANIZE_SCRIPT" ]; then
echo "[comfyui-sync] WARNING: organize-images not found, skipping organize step" echo "[comfyui-sync] WARNING: organize-images not found, skipping organize step"
fi fi
echo "[comfyui-sync] Done at $(date)" echo "[comfyui-sync] Done at $(date)"