From 9a4b5b4b4da31a0b2ad11f58233dd8aaf688edac Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 3 Apr 2024 21:35:40 +0200 Subject: [PATCH 1/3] Fix #23 --- conf/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/env b/conf/env index 95412fb..ec41098 100644 --- a/conf/env +++ b/conf/env @@ -9,7 +9,7 @@ SERVER_PORT=__PORT__ MICROSERVICES_PORT=__PORT_MICROSERVICES__ MACHINE_LEARNING_HOST=127.0.0.1 MACHINE_LEARNING_PORT=__PORT_MACHINELEARNING__ -IMMICH_MACHINE_LEARNING_URL=127.0.0.1:__PORT_MACHINELEARNING__ +IMMICH_MACHINE_LEARNING_URL=http://127.0.0.1:__PORT_MACHINELEARNING__ ## Database DB_HOSTNAME=127.0.0.1 From d90b8f0576bc85ec1060bd00a1d6e130b5e73310 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 3 Apr 2024 22:01:09 +0200 Subject: [PATCH 2/3] Revert Add geonames files to app sources --- manifest.toml | 17 +---------------- scripts/_common.sh | 14 ++++++++++---- scripts/install | 3 --- scripts/upgrade | 3 --- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/manifest.toml b/manifest.toml index 874fbea..09f2512 100644 --- a/manifest.toml +++ b/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.100.0~ynh1" +version = "1.100.0~ynh2" maintainers = ["ewilly"] @@ -47,21 +47,6 @@ ram.runtime = "500M" autoupdate.strategy = "latest_github_release" - [resources.sources.geonames_cities] - url = "https://download.geonames.org/export/dump/cities500.zip" - sha256 = "afec3356a980771f20c5e96f4a877d33c97fcc331dfc6b02d6bf8a492ec43828" - in_subdir = false - - [resources.sources.geonames_divisions] - url = "https://download.geonames.org/export/dump/admin1CodesASCII.txt" - sha256 = "6eace8b269cd4c9635d8f8631857c0be2cb3fb6362495f77f17f266ef7328f11" - rename = "admin1CodesASCII.txt" - - [resources.sources.geonames_subdivisions] - url = "https://download.geonames.org/export/dump/admin2Codes.txt" - sha256 = "defbd99329530fa6b06e154662fb16a51a0c12caf41636be17597c58c5374f1c" - rename = "admin2Codes.txt" - [resources.ports] main.default = 3001 microservices.default = 3002 diff --git a/scripts/_common.sh b/scripts/_common.sh index 9b36bc4..64742f4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -155,7 +155,7 @@ myynh_install_immich() { ynh_exec_warn_less "$ynh_npm" cache clean --force # Install immich-machine-learning - cd "$source_dir/machine-learning" + cd "$source_dir/machine-learning" mkdir -p "$install_dir/app/machine-learning" $py_app_version -m venv "$install_dir/app/machine-learning/venv" ( @@ -191,9 +191,15 @@ myynh_install_immich() { sed -i -e "s@app.listen(port)@app.listen(port, '127.0.0.1')@g" "$install_dir/app/dist/main.js" # Install geonames - cp -a "$source_dir/geonames_cities/cities500.txt" "$install_dir/resources/" - cp -a "$source_dir/geonames_divisions/admin1CodesASCII.txt" "$install_dir/resources/" - cp -a "$source_dir/geonames_subdivisions/admin2Codes.txt" "$install_dir/resources/" + mkdir -p "$source_dir/geonames" + cd "$source_dir/geonames" + curl -LO "https://download.geonames.org/export/dump/cities500.zip" 2>&1 + curl -LO "https://download.geonames.org/export/dump/admin1CodesASCII.txt" 2>&1 + curl -LO "https://download.geonames.org/export/dump/admin2Codes.txt" 2>&1 + unzip "cities500.zip" + cp -a "$source_dir/geonames/cities500.txt" "$install_dir/resources/" + cp -a "$source_dir/geonames/admin1CodesASCII.txt" "$install_dir/resources/" + cp -a "$source_dir/geonames/admin2Codes.txt" "$install_dir/resources/" date --iso-8601=seconds | tr -d "\n" > "$install_dir/resources/geodata-date.txt" # Cleanup diff --git a/scripts/install b/scripts/install index e6d06bc..fb2a967 100755 --- a/scripts/install +++ b/scripts/install @@ -15,9 +15,6 @@ ynh_script_progression --message="Setting up source files..." --weight=1 source_dir="$install_dir/source" ynh_setup_source --source_id="main" --dest_dir="$source_dir" -ynh_setup_source --source_id="geonames_cities" --dest_dir="$source_dir/geonames_cities/" -ynh_setup_source --source_id="geonames_divisions" --dest_dir="$source_dir/geonames_divisions/" -ynh_setup_source --source_id="geonames_subdivisions" --dest_dir="$source_dir/geonames_subdivisions/" #================================================= # CHECK PYTHON VERSION AND COMPILE IF NEEDED diff --git a/scripts/upgrade b/scripts/upgrade index 33818a5..b0aefd7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,9 +27,6 @@ ynh_script_progression --message="Upgrading source files..." --weight=1 source_dir="$install_dir/source" ynh_setup_source --source_id="main" --dest_dir="$source_dir" --full_replace=1 -ynh_setup_source --source_id="geonames_cities" --dest_dir="$source_dir/geonames_cities/" --full_replace=1 -ynh_setup_source --source_id="geonames_divisions" --dest_dir="$source_dir/geonames_divisions/" --full_replace=1 -ynh_setup_source --source_id="geonames_subdivisions" --dest_dir="$source_dir/geonames_subdivisions/" --full_replace=1 #================================================= # CHECK PYTHON VERSION AND COMPILE IF NEEDED From 45159e11f74cab2d12994866c72f9ec6e05917fb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 3 Apr 2024 20:01:13 +0000 Subject: [PATCH 3/3] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 20ab823..27aa66d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Self-hosted photo and video management solution. - Easy-to-use and friendly interface ; -**Shipped version:** 1.100.0~ynh1 +**Shipped version:** 1.100.0~ynh2 ## Screenshots diff --git a/README_eu.md b/README_eu.md index acf1895..787695a 100644 --- a/README_eu.md +++ b/README_eu.md @@ -24,7 +24,7 @@ Self-hosted photo and video management solution. - Easy-to-use and friendly interface ; -**Paketatutako bertsioa:** 1.100.0~ynh1 +**Paketatutako bertsioa:** 1.100.0~ynh2 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 7053109..5a7f227 100644 --- a/README_fr.md +++ b/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.100.0~ynh1 +**Version incluse :** 1.100.0~ynh2 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 3654535..c96c2db 100644 --- a/README_gl.md +++ b/README_gl.md @@ -24,7 +24,7 @@ Self-hosted photo and video management solution. - Easy-to-use and friendly interface ; -**Versión proporcionada:** 1.100.0~ynh1 +**Versión proporcionada:** 1.100.0~ynh2 ## Capturas de pantalla