From 223a33d099b1ec9ced8c5a31d7bea24151e98720 Mon Sep 17 00:00:00 2001
From: MickLesk <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 12 Oct 2026 20:24:53 +0200
Subject: [PATCH] Immich: restore geodata/countryInfo.txt on update and pin
 3.3.1

Updates run between the 3.3.0 pin and #17823 wrote countryInfo.txt into
app/ instead of geodata/, so metadata extraction failed and new uploads
never got thumbnails. The download sat inside the release block, so a
plain update could not repair it until the next pin. 3.3.1 only bumps
version fields in the manifests.
---
 ct/immich.sh              | 15 ++++++++++++++-
 install/immich-install.sh |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ct/immich.sh b/ct/immich.sh
index 759ee287c..9bbc3557e 100644
--- a/ct/immich.sh
+++ b/ct/immich.sh
@@ -77,7 +77,7 @@ EOF
   BASE_DIR=${STAGING_DIR}/base-images
   SOURCE_DIR=${STAGING_DIR}/image-source
   cd /tmp
-  RELEASE="v3.3.0"
+  RELEASE="v3.3.1"
   if [[ -f ~/.intel_version ]]; then
     INTEL_SRC="https://raw.githubusercontent.com/immich-app/immich/${RELEASE}/machine-learning"
     curl -fsSL "${INTEL_SRC}/scripts/install-intel-runtime.sh" -o ./intel-runtime 2>/dev/null ||
@@ -114,6 +114,19 @@ EOF
     msg_ok "Image-processing libraries up to date"
   fi
 
+  # 3.3.0 reads geodata/countryInfo.txt; the update before #17823 saved it into app/ instead.
+  if [[ -d /opt/immich/geodata && ! -s /opt/immich/geodata/countryInfo.txt ]]; then
+    msg_info "Restoring geodata/countryInfo.txt"
+    if [[ -s /opt/immich/app/countryInfo.txt ]]; then
+      mv /opt/immich/app/countryInfo.txt /opt/immich/geodata/countryInfo.txt
+    else
+      curl_with_retry "https://download.geonames.org/export/dump/countryInfo.txt" /opt/immich/geodata/countryInfo.txt
+    fi
+    chown immich:immich /opt/immich/geodata/countryInfo.txt
+    systemctl restart immich-web
+    msg_ok "Restored geodata/countryInfo.txt"
+  fi
+
   if check_for_gh_release "Immich" "immich-app/immich" "${RELEASE}" "each release is tested individually before the version is updated. Please do not open issues for this"; then
     msg_warn "The update takes 5-15 minutes, do not interrupt it"
     PREV_IMMICH="$(cat ~/.immich)"
diff --git a/install/immich-install.sh b/install/immich-install.sh
index 35017ecd9..71b84403b 100644
--- a/install/immich-install.sh
+++ b/install/immich-install.sh
@@ -13,7 +13,7 @@ setting_up_container
 network_check
 update_os
 
-RELEASE="v3.3.0"
+RELEASE="v3.3.1"
 if lscpu | grep -q 'GenuineIntel'; then
   echo ""
   echo ""