Merge pull request #88 from YunoHost-Apps/testing

Testing
2024-09-03 18:15:55 +02:00 · 2022-06-09 09:03:22 +02:00 · 2022-06-09 09:03:22 +02:00 · 0f84e69883
commit 0f84e69883
parent 3210d5803f 4f41b1eb4a
6 changed files with 47 additions and 41 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ It shall NOT be edited by hand.

 # Ampache for YunoHost

-[![Integration level](https://dash.yunohost.org/integration/ampache.svg)](https://dash.yunohost.org/appci/app/ampache) ![](https://ci-apps.yunohost.org/ci/badges/ampache.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ampache.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/ampache.svg)](https://dash.yunohost.org/appci/app/ampache) ![Working status](https://ci-apps.yunohost.org/ci/badges/ampache.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/ampache.maintain.svg)  
 [![Install Ampache with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ampache)

 *[Lire ce readme en français.](./README_fr.md)*
@ -24,13 +24,13 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 * Integrate with YunoHost users - same username and password
 * Allow one user to be the administrator (set at the installation)

-**Shipped version:** 5.4.0~ynh1
+**Shipped version:** 5.4.0~ynh2

 **Demo:** https://ampache.org/demo.html

 ## Screenshots

-![](./doc/screenshots/visualizer.png)
+![Screenshot of Ampache](./doc/screenshots/visualizer.png)

 ## Disclaimers / important information

@ -67,21 +67,22 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in

 ## Documentation and resources

-* Official app website: http://ampache.org
-* Official admin documentation: https://github.com/ampache/ampache/wiki
-* Upstream app code repository: https://github.com/ampache/ampache
-* YunoHost documentation for this app: https://yunohost.org/app_ampache
-* Report a bug: https://github.com/YunoHost-Apps/ampache_ynh/issues
+* Official app website: <http://ampache.org>
+* Official admin documentation: <https://github.com/ampache/ampache/wiki>
+* Upstream app code repository: <https://github.com/ampache/ampache>
+* YunoHost documentation for this app: <https://yunohost.org/app_ampache>
+* Report a bug: <https://github.com/YunoHost-Apps/ampache_ynh/issues>

 ## Developer info

 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/ampache_ynh/tree/testing).

 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/ampache_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade ampache -u https://github.com/YunoHost-Apps/ampache_ynh/tree/testing --debug
 ```

-**More info regarding app packaging:** https://yunohost.org/packaging_apps
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -1,10 +1,14 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Ampache pour YunoHost

-[![Niveau d'intégration](https://dash.yunohost.org/integration/ampache.svg)](https://dash.yunohost.org/appci/app/ampache) ![](https://ci-apps.yunohost.org/ci/badges/ampache.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ampache.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/ampache.svg)](https://dash.yunohost.org/appci/app/ampache) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/ampache.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/ampache.maintain.svg)  
 [![Installer Ampache avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ampache)

 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*

 > *Ce package vous permet d'installer Ampache rapidement et simplement sur un serveur YunoHost.
 Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -20,13 +24,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 * Integrate with YunoHost users - same username and password
 * Allow one user to be the administrator (set at the installation)

-**Version incluse :** 5.4.0~ynh1
+**Version incluse :** 5.4.0~ynh2

 **Démo :** https://ampache.org/demo.html

 ## Captures d'écran

-![](./doc/screenshots/visualizer.png)
+![Capture d'écran de Ampache](./doc/screenshots/visualizer.png)

 ## Avertissements / informations importantes

@ -63,21 +67,22 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour

 ## Documentations et ressources

-* Site officiel de l'app : http://ampache.org
-* Documentation officielle de l'admin : https://github.com/ampache/ampache/wiki
-* Dépôt de code officiel de l'app : https://github.com/ampache/ampache
-* Documentation YunoHost pour cette app : https://yunohost.org/app_ampache
-* Signaler un bug : https://github.com/YunoHost-Apps/ampache_ynh/issues
+* Site officiel de l'app : <http://ampache.org>
+* Documentation officielle de l'admin : <https://github.com/ampache/ampache/wiki>
+* Dépôt de code officiel de l'app : <https://github.com/ampache/ampache>
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_ampache>
+* Signaler un bug : <https://github.com/YunoHost-Apps/ampache_ynh/issues>

 ## Informations pour les développeurs

 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/ampache_ynh/tree/testing).

 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/ampache_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade ampache -u https://github.com/YunoHost-Apps/ampache_ynh/tree/testing --debug
 ```

-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
+**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>
--- a/manifest.json
+++ b/manifest.json
@ -6,7 +6,7 @@
        "en": "Web based audio/video streaming application",
        "fr": "Application de streaming audio et vidéo"
    },
-    "version": "5.4.0~ynh1",
+    "version": "5.4.0~ynh2",
    "url": "http://ampache.org",
    "upstream": {
        "license": "AGPL-3.0",
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -9,7 +9,7 @@ YNH_PHP_VERSION="8.0"
 # Composer version
 YNH_COMPOSER_VERSION="2.3.5"

-pkg_dependencies="libav-tools|ffmpeg php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-simplexml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-ldap"
+pkg_dependencies="libav-tools|ffmpeg php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-simplexml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-intl"

 #=================================================
 # EXPERIMENTAL HELPERS
--- a/scripts/install
+++ b/scripts/install
@ -132,7 +132,7 @@ ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name <
 ynh_script_progression --message="Installing $app with Composer..." --weight=45

 # Install composer
-ynh_install_composer --install_args="--ignore-platform-req=ext-intl"
+ynh_install_composer

 #=================================================
 # INSTALL MULTIMEDIA DIRECTORIES
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -19,7 +19,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin_ampache=$(ynh_app_setting_get --app=$app --key=admin)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
+#is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
@ -95,7 +95,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=3

 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path"
+	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/ampache.cfg.php"
 fi

 chmod 750 "$final_path"
@ -133,11 +133,11 @@ ynh_add_fpm_config --usage=low --footprint=low

 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-    ynh_script_progression --message="Upgrading Ampache configuration..."
+    #ynh_script_progression --message="Upgrading Ampache configuration..."

-    ynh_add_config --template="../conf/ampache.cfg.php" --destination="$final_path/config/ampache.cfg.php"
-    chmod 600 "$final_path/config/ampache.cfg.php"
-    chown $app:$app "$final_path/config/ampache.cfg.php"
+    #ynh_add_config --template="../conf/ampache.cfg.php" --destination="$final_path/config/ampache.cfg.php"
+    #chmod 600 "$final_path/config/ampache.cfg.php"
+    #chown $app:$app "$final_path/config/ampache.cfg.php"

    #=================================================
    # UPDATE AMPACHE WITH COMPOSER
@ -145,7 +145,7 @@ then
    ynh_script_progression --message="Upgrading ampache with Composer..." --weight=30

    # Install composer
-    ynh_install_composer --install_args="--ignore-platform-req=ext-intl"
+    ynh_install_composer
    ynh_composer_exec --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --commands="config discard-changes true"
 fi

@ -162,13 +162,13 @@ ynh_multimedia_build_main_dir

 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-    ynh_script_progression --message="Upgrading Ampache with cURL..." --weight=6
+    #ynh_script_progression --message="Upgrading Ampache with cURL..." --weight=6

    # Set the app as temporarily public for cURL call
-    if ! ynh_permission_has_user --permission="main" --user="visitors"
-    then
-        ynh_permission_update --permission="main" --add="visitors"
-    fi
+    #if ! ynh_permission_has_user --permission="main" --user="visitors"
+    #then
+    #    ynh_permission_update --permission="main" --add="visitors"
+    #fi

    # Reload NGINX
    ynh_systemd_action --service_name=nginx --action=reload
@ -180,12 +180,12 @@ fi
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring permissions..."
+# ynh_script_progression --message="Configuring permissions..."

-if [ $is_public -eq 0 ]
-then
-    ynh_permission_update --permission="main" --remove="visitors"
-fi
+# if [ $is_public -eq 0 ]
+# then
+#     ynh_permission_update --permission="main" --remove="visitors"
+# fi

 #=================================================
 # RELOAD NGINX