Merge pull request #73 from YunoHost-Apps/master-promotion

Upgrade master from testing

README.md

@@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Shipped version:** 1.109.2~ynh2
+**Shipped version:** 1.110.0~ynh1
 
 ## Screenshots
 

README_es.md

@@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versión actual:** 1.109.2~ynh2
+**Versión actual:** 1.110.0~ynh1
 
 ## Capturas
 

README_eu.md

@@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Paketatutako bertsioa:** 1.109.2~ynh2
+**Paketatutako bertsioa:** 1.110.0~ynh1
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -24,7 +24,7 @@ Solution d'autohébergement pour a gestion de vos photos et vidéos.
 - Interface conviviale et egronomique ;
 
 
-**Version incluse :** 1.109.2~ynh2
+**Version incluse :** 1.110.0~ynh1
 
 ## Captures d’écran
 

README_gl.md

@@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versión proporcionada:** 1.109.2~ynh2
+**Versión proporcionada:** 1.110.0~ynh1
 
 ## Capturas de pantalla
 

README_id.md

@@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**Versi terkirim:** 1.109.2~ynh2
+**Versi terkirim:** 1.110.0~ynh1
 
 ## Tangkapan Layar
 
@@ -39,7 +39,7 @@ Self-hosted photo and video management solution.
 - Website aplikasi resmi: <https://immich.app>
 - Dokumentasi pengguna resmi: <https://github.com/immich-app/immich#getting-started>
 - Dokumentasi admin resmi: <https://github.com/immich-app/immich#getting-started>
-- Repositori kode aplikasi hulu: <https://github.com/immich-app/immich>
+- Depot kode aplikasi hulu: <https://github.com/immich-app/immich>
 - Gudang YunoHost: <https://apps.yunohost.org/app/immich>
 - Laporkan bug: <https://github.com/YunoHost-Apps/immich_ynh/issues>
 

README_zh_Hans.md

@@ -24,7 +24,7 @@ Self-hosted photo and video management solution.
 - Easy-to-use and friendly interface ;
 
 
-**分发版本：** 1.109.2~ynh2
+**分发版本：** 1.110.0~ynh1
 
 ## 截图
 

manifest.toml

@@ -7,7 +7,7 @@ name = "Immich"
 description.en = "Photo and video backup solution directly from your mobile phone"
 description.fr = "Sauvegarde de photos et de vidéos directement depuis votre mobile"
 
-version = "1.109.2~ynh2"
+version = "1.110.0~ynh1"
 
 maintainers = ["ewilly"]
 
@@ -42,8 +42,8 @@ ram.runtime = "500M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/immich-app/immich/archive/refs/tags/v1.109.2.tar.gz"
-        sha256 = "c45bed3fa510d51df6e31e7bbf06bda3413aa4ef751d9c6d7596ffc49b921459"
+        url = "https://github.com/immich-app/immich/archive/refs/tags/v1.110.0.tar.gz"
+        sha256 = "aceddfef934fcbea8c4e8c8069595bd2806bd758498f94be15c99ffbc2721ad3"
 
         autoupdate.strategy = "latest_github_release"
 
@@ -107,14 +107,30 @@ ram.runtime = "500M"
         "libany-uri-escape-perl",
         "libmojolicious-perl",
         "libfile-slurper-perl",
-        "liblcms2-2"
+        "liblcms2-2",
+        "libllvm16",
+        "libllvm13",
+        "redis-server"
     ]
 
     [resources.apt.extras.postgresql]
     repo = "deb https://apt.postgresql.org/pub/repos/apt __YNH_DEBIAN_VERSION__-pgdg main 16"
     key = "https://www.postgresql.org/media/keys/ACCC4CF8.asc"
     packages = [
-        "libllvm13", "libpq5", "libpq-dev" , "postgresql-16", "postgresql-16-pgvector", "postgresql-client-16", "postgresql-common", "postgresql-client-common"
+        "libpq5",
+        "libpq-dev",
+        "postgresql-16",
+        "postgresql-16-pgvector",
+        "postgresql-client-16",
+        "postgresql-common",
+        "postgresql-client-common"
+    ]
+
+    [resources.apt.extras.jellyfin-ffmpeg]
+    repo = "deb [arch=__YNH_ARCH__] https://repo.jellyfin.org/debian __YNH_DEBIAN_VERSION__ main"
+    key = "https://repo.jellyfin.org/jellyfin_team.gpg.key"
+    packages = [
+        "jellyfin-ffmpeg6"
     ]
 
     [resources.database]

scripts/_common.sh

@@ -122,7 +122,11 @@ myynh_install_immich() {
 	# Thanks to https://github.com/arter97/immich-native
 	# Check https://github.com/immich-app/base-images/blob/main/server/Dockerfile for changes
 
-	ynh_use_nodejs
+	# Add jellyfin-ffmpeg to $PATH
+		PATH="/usr/lib/jellyfin-ffmpeg:$PATH"
+
+	# Use ynh nodejs helper
+		ynh_use_nodejs
 
 	# Use 127.0.0.1
 		cd "$source_dir"

scripts/restore

@@ -27,13 +27,6 @@ ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
 chown -R $app:$app "$data_dir"
 
-#=================================================
-# INSTALL NODEJS
-#=================================================
-ynh_script_progression --message="Reinstalling nodejs..." --weight=5
-
-ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version"
-
 #=================================================
 # CHECK PYTHON VERSION AND COMPILE IF NEEDED
 #=================================================
@@ -42,6 +35,13 @@ ynh_script_progression --message="Check Python version & compile the required on
 py_required_version=$(ynh_app_setting_get --app="$app" --key=python)
 myynh_install_python --python="$py_required_version"
 
+#=================================================
+# INSTALL NODEJS
+#=================================================
+ynh_script_progression --message="Reinstalling nodejs..." --weight=5
+
+ynh_exec_warn_less ynh_install_nodejs --nodejs_version="$nodejs_version"
+
 #=================================================
 # RESTORE THE DATABASE
 #=================================================