diff --git a/.env b/.env index 8f5df1f..c556c77 100644 --- a/.env +++ b/.env @@ -21,4 +21,5 @@ SCAN_FALLBACK=60 UPLOAD_SCAN_INTERVAL=5 UPLOAD_CONCURRENCY=4 UPLOAD_IDLE_SLEEP=3 +UPLOAD_GO_TASKS=6 DELETE_ON_SUCCESS=true diff --git a/docker-compose.yml b/docker-compose.yml index 07d51d9..34a9ad8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,6 +40,7 @@ services: - SCAN_INTERVAL=${UPLOAD_SCAN_INTERVAL:-5} - CONCURRENCY=${UPLOAD_CONCURRENCY:-4} - IDLE_SLEEP=${UPLOAD_IDLE_SLEEP:-3} + - GO_TASKS=${UPLOAD_GO_TASKS:-6} - DELETE_ON_SUCCESS=${DELETE_ON_SUCCESS:-true} - ALLOW_INSECURE_SSL=${ALLOW_INSECURE_SSL:-false} - PUID=${PUID:-1000} diff --git a/uploader.sh b/uploader.sh index c737a4e..1dd7063 100755 --- a/uploader.sh +++ b/uploader.sh @@ -10,6 +10,7 @@ DELETE_ON_SUCCESS="${DELETE_ON_SUCCESS:-true}" SCAN_INTERVAL="${SCAN_INTERVAL:-5}" # seconds between scans CONCURRENCY="${CONCURRENCY:-4}" IDLE_SLEEP="${IDLE_SLEEP:-3}" +GO_TASKS="${GO_TASKS:-6}" # immich-go internal concurrent tasks IMMICH_CHECK_PATH="${IMMICH_CHECK_PATH:-/api/server/ping}" CURL_OPTS="-sS -m 3 -o /dev/null -w %{http_code}" [ "${ALLOW_INSECURE_SSL:-false}" = "true" ] && CURL_OPTS="$CURL_OPTS -k" @@ -64,6 +65,7 @@ start_ms="$(date +%s%3N 2>/dev/null || echo "$(date +%s)000")" errf="$(mktemp -p /tmp immich_err.XXXXXX)" cmd="immich-go upload from-folder --server \"${IMMICH_URL}\" --api-key \"${IMMICH_API_KEY}\" --no-ui --recursive=false --pause-immich-jobs=false" +[ -n "${GO_TASKS:-}" ] && cmd="$cmd --concurrent-tasks ${GO_TASKS}" [ "${ALLOW_INSECURE_SSL:-false}" = "true" ] && cmd="$cmd --skip-verify-ssl" if output="$(eval "$cmd \"$f\"" 1>/dev/null 2>"$errf")"