Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 15:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use API-first Piwigo sync runtime with fallback

Browse Source
This commit is contained in:
Terranom674
2026-08-17 21:31:40 +02:00
parent 0a341385fc
commit 16e4c334bb
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
runtime/sync.sh
View File

@@ -9,9 +9,6 @@ PIWIGO_SYNC_OVERRIDE_VALUE="${PIWIGO_SYNC_OVERRIDE-}"
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "$CONFIG_FILE" source "$CONFIG_FILE"
# Existing connection configs created before the source-share-aware activity gate
# do not contain NC_ACTIVITY_VIEW yet. Keep them compatible without requiring a
# manual config migration.
NC_ACTIVITY_VIEW="${NC_ACTIVITY_VIEW:-piwigo_showcase_activity}" NC_ACTIVITY_VIEW="${NC_ACTIVITY_VIEW:-piwigo_showcase_activity}"
NC_DB_VIEW="${NC_DB_VIEW:-piwigo_showcase_sources}" NC_DB_VIEW="${NC_DB_VIEW:-piwigo_showcase_sources}"
@@ -29,6 +26,17 @@ LOCK_FILE="$STATE_DIR/sync.lock"
ACTIVITY_STATE="$STATE_DIR/activity.json" ACTIVITY_STATE="$STATE_DIR/activity.json"
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
CONNECTION_ID="${CONNECTION_ID:-}"
if [[ -z "$CONNECTION_ID" ]]; then
CONFIG_BASENAME="$(basename -- "$CONFIG_FILE")"
if [[ "$CONFIG_BASENAME" =~ ^connection-([0-9]+)\.conf$ ]]; then
CONNECTION_ID="${BASH_REMATCH[1]}"
else
echo "Connector-ID konnte nicht aus $CONFIG_FILE ermittelt werden." >&2
exit 1
fi
fi
exec 9>"$LOCK_FILE" exec 9>"$LOCK_FILE"
flock -n 9 || exit 0 flock -n 9 || exit 0
@@ -114,14 +122,10 @@ python3 "$SCRIPT_DIR/lib/shadow_tree.py" \
--manifest "$MANIFEST" --destination "$GALLERY_ROOT" --state "$MAP_FILE" --manifest "$MANIFEST" --destination "$GALLERY_ROOT" --state "$MAP_FILE"
if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then if [[ "${PIWIGO_SYNC_ENABLED:-0}" == "1" ]]; then
[[ -r "${PIWIGO_SYNC_PASSWORD_FILE:?}" ]] || { php "$SCRIPT_DIR/lib/piwigo-sync.php" \
echo "Piwigo-Passwortdatei fehlt oder ist nicht lesbar." >&2 --piwigo-root="$PIWIGO_ROOT" \
exit 1 --connection-id="$CONNECTION_ID" \
} --base-url="http://127.0.0.1"
perl "$SCRIPT_DIR/lib/piwigo-db-sync.pl" \
--base-url="http://127.0.0.1" \
--username="${PIWIGO_SYNC_USER:?}" \
--password-file="$PIWIGO_SYNC_PASSWORD_FILE"
fi fi
python3 "$SCRIPT_DIR/lib/activity_gate.py" commit \ python3 "$SCRIPT_DIR/lib/activity_gate.py" commit \