Raincloud/synology-thumbgen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle nested dirs

Browse Source
This commit is contained in:
Raincloud
2026-03-22 13:35:25 -06:00
parent 53430f768f
commit d2239a670c
6 changed files with 3188 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nascleanup.sh
+42 -31
View File
@@ -28,6 +28,38 @@ flatten_indexer_layout() {
done
}
# Copy one thumbgen tree: PARENT/eaDir_tmp -> PARENT/@eaDir (psthumbgen uses per-folder eaDir_tmp).
promote_one_eadir_tmp() {
local EADIR_TMP="$1"
local PARENT TARGET_AT SRC_JPG DST_JPG
PARENT="$(dirname "$EADIR_TMP")"
TARGET_AT="$PARENT/@eaDir"
[ -d "$EADIR_TMP" ] || return 0
chmod -R 755 "$EADIR_TMP" 2>/dev/null || true
find "$EADIR_TMP" -type f -exec chmod 644 '{}' \; 2>/dev/null || true
echo " -> Flattening eaDir_tmp (indexer may have added .../<file>/@eaDir/) before copy: $EADIR_TMP"
flatten_indexer_layout "$EADIR_TMP"
echo " -> Replacing $EADIR_TMP -> $TARGET_AT"
SRC_JPG=$(find "$EADIR_TMP" -type f -name 'SYNO*.jpg' 2>/dev/null | wc -l | tr -d '[:space:]')
rm -rf "$TARGET_AT"
mkdir -p "$TARGET_AT"
if ! cp -R "$EADIR_TMP/." "$TARGET_AT/"; then
echo "ERROR: eaDir_tmp -> @eaDir copy failed (see cp messages above)."
exit 1
fi
echo " -> Flattening @eaDir after copy (same layout fix)"
flatten_indexer_layout "$TARGET_AT"
DST_JPG=$(find "$TARGET_AT" -type f -name 'SYNO*.jpg' 2>/dev/null | wc -l | tr -d '[:space:]')
if [ "$SRC_JPG" -gt 0 ] && [ "$DST_JPG" -ne "$SRC_JPG" ]; then
echo "ERROR: Promote incomplete: $DST_JPG SYNO*.jpg in @eaDir vs $SRC_JPG in eaDir_tmp (expected equal)."
exit 1
fi
chmod -R 755 "$EADIR_TMP" 2>/dev/null || true
find "$EADIR_TMP" -type f -exec chmod u+w '{}' \; 2>/dev/null || true
find "$EADIR_TMP" -type d -exec chmod u+w '{}' \; 2>/dev/null || true
rm -rf "$EADIR_TMP" 2>/dev/null || sudo -n rm -rf "$EADIR_TMP" 2>/dev/null || true
}
echo "=== Enhanced Synology Thumbnail Cleanup ==="
echo "Target directory: $TARGET_DIR"
@@ -77,39 +109,18 @@ find "$TARGET_DIR" -path '*/@eaDir/*' -type f -exec chmod 644 '{}' \; 2>/dev/nul
# Now remove them (2>/dev/null: races when parents disappear mid-find)
find "$TARGET_DIR" -type d -name '@eaDir' -exec rm -rf '{}' \; 2>/dev/null || true
# 5. Promote only TARGET_DIR/eaDir_tmp -> TARGET_DIR/@eaDir (thumbgen layout; not nested */eaDir_tmp)
# 5. Promote every .../eaDir_tmp -> .../@eaDir (thumbgen writes eaDir_tmp next to each video folder, not only TARGET_DIR/eaDir_tmp)
echo "=== Installing custom thumbnails ==="
EADIR_TMP="$TARGET_DIR/eaDir_tmp"
if [ -d "$EADIR_TMP" ]; then
chmod -R 755 "$EADIR_TMP" 2>/dev/null || true
find "$EADIR_TMP" -type f -exec chmod 644 '{}' \; 2>/dev/null || true
echo " -> Flattening eaDir_tmp (indexer may have added .../<file>/@eaDir/) before copy"
flatten_indexer_layout "$EADIR_TMP"
TARGET_AT="$TARGET_DIR/@eaDir"
echo " -> Replacing $EADIR_TMP -> $TARGET_AT"
SRC_JPG=$(find "$EADIR_TMP" -type f -name 'SYNO*.jpg' 2>/dev/null | wc -l | tr -d '[:space:]')
rm -rf "$TARGET_AT"
mkdir -p "$TARGET_AT"
if ! cp -R "$EADIR_TMP/." "$TARGET_AT/"; then
echo "ERROR: eaDir_tmp -> @eaDir copy failed (see cp messages above)."
exit 1
fi
echo " -> Flattening @eaDir after copy (same layout fix)"
flatten_indexer_layout "$TARGET_AT"
DST_JPG=$(find "$TARGET_AT" -type f -name 'SYNO*.jpg' 2>/dev/null | wc -l | tr -d '[:space:]')
if [ "$SRC_JPG" -gt 0 ] && [ "$DST_JPG" -ne "$SRC_JPG" ]; then
echo "ERROR: Promote incomplete: $DST_JPG SYNO*.jpg in @eaDir vs $SRC_JPG in eaDir_tmp (expected equal)."
exit 1
fi
chmod -R 755 "$EADIR_TMP" 2>/dev/null || true
find "$EADIR_TMP" -type f -exec chmod u+w '{}' \; 2>/dev/null || true
find "$EADIR_TMP" -type d -exec chmod u+w '{}' \; 2>/dev/null || true
rm -rf "$EADIR_TMP" 2>/dev/null || sudo -n rm -rf "$EADIR_TMP" 2>/dev/null || true
else
echo " -> No $EADIR_TMP; skipping install step"
INSTALL_ANY=0
while IFS= read -r -d '' EADIR_TMP; do
INSTALL_ANY=1
promote_one_eadir_tmp "$EADIR_TMP"
done < <(find "$TARGET_DIR" -type d -name 'eaDir_tmp' -print0)
if [ "$INSTALL_ANY" -eq 0 ]; then
echo " -> No eaDir_tmp under $TARGET_DIR; skipping install step"
fi
echo "=== Removing stray nested eaDir_tmp directories ==="
find "$TARGET_DIR" -mindepth 2 -type d -name 'eaDir_tmp' -exec rm -rf '{}' \; 2>/dev/null || true
echo "=== Removing any leftover eaDir_tmp directories ==="
find "$TARGET_DIR" -type d -name 'eaDir_tmp' -exec rm -rf '{}' \; 2>/dev/null || true
# 6. Protect custom thumbnails with read-only permissions
echo "=== Adding indexing exclusion hints ==="