Merge pull request #69 from YunoHost-Apps/testing

Testing

README.md

@@ -1,17 +1,15 @@
 # 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)  
-[![Install Ampache with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=ampache)
+[![Install Ampache with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ampache)
 
 > *This package allow you to install Ampache quickly and simply on a YunoHost server.  
 If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
 
 ## Overview
-[Ampache](http://ampache.org) for the love of music. A web based audio/video 
+[Ampache](http://ampache.org) for the love of music. A web based audio/video streaming application and file manager allowing you to access your music & videos from anywhere, using almost any internet enabled device.
-streaming application and file manager allowing you to access your 
-music & videos from anywhere, using almost any internet enabled device.
 
-**Shipped version:** 4.1.1.1
+**Shipped version:** 4.2.5
 
 ## Screenshots
 
@@ -27,7 +25,7 @@ music & videos from anywhere, using almost any internet enabled device.
 ## Documentation
 
  * Official documentation: https://github.com/ampache/ampache/wiki
- * YunoHost documentation: There no other documentations, feel free to contribute.
+ * YunoHost documentation: https://yunohost.org/#/app_ampache
 
 ## YunoHost specific features
 
@@ -46,16 +44,15 @@ this package:
 
 #### Supported architectures
 
-* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ampache%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/ampache/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ampache%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/ampache/)
 * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/ampache%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/ampache/)
-* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/ampache%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/ampache/)
 
 ## Limitations
 
-* Also, the SSO authentication not fully working from user panel, we have to work about this.
+* Also, the SSO authentication not fully working from user panel, we have to work about this. In fact, it can disrupt external Ampache clients like Subsonic.
-In fact, it can disrupt external Ampache clients like Subsonic.
 
 ## Additionnal informations
+
 ### Getting started
 
  * **Add your first catalog to load music files**
@@ -90,8 +87,7 @@ In fact, it can disrupt external Ampache clients like Subsonic.
 
 ---
 
-Developers infos
+## Developers infos
-----------------
 
 Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/ampache_ynh/tree/testing).
 

check_process

@@ -14,13 +14,8 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
-		# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
-		# incorrect_path=1
 		port_already_use=0
 		change_url=1
-;;; Levels
-	# If the level 5 (Package linter) is forced to 1. Please add justifications here.
-	Level 5=auto
 ;;; Options
 Email=aymhce@gmail.com
 Notification=none

conf/ampache.cfg.php

@@ -955,14 +955,14 @@ registration_mandatory_fields = "fullname"
 transcode_m4a      = allowed
 transcode_flac     = required
 transcode_mpc      = required
-transcode_ogg      = required
+transcode_ogg      = allowed
 transcode_oga      = required
 transcode_wav      = required
 transcode_wma      = required
 transcode_aif      = required
 transcode_aiff     = required
-transcode_ape     = required
+transcode_ape      = required
-transcode_shn     = required
+transcode_shn      = required
 transcode_mp3      = allowed
 ;;; Video
 transcode_avi      = allowed

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/ampache/ampache/archive/f9ea16e7fc7a36636180241dc79f139b92bc8ff0.tar.gz
+SOURCE_URL=https://github.com/ampache/ampache/archive/4.2.5.tar.gz
-SOURCE_SUM=9cee154350b3b747b4ec6d405be768e8a3b0b1f0331a9f373c6a7c54c51f4775
+SOURCE_SUM=8cc954c997a5df722699ff165f20f06ceb095481bb20cccede0f585880d4c536
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

manifest.json

@@ -3,10 +3,10 @@
     "id": "ampache",
     "packaging_format": 1,
     "description": {
-        "en": "A web based audio/video streaming application",
+        "en": "Web based audio/video streaming application",
-        "fr": "Une application de streaming audio et vidéo"
+        "fr": "Application de streaming audio et vidéo"
     },
-    "version": "4.1.1.1~ynh1",
+    "version": "4.2.5~ynh1",
     "url": "http://ampache.org",
     "license": "AGPL-3.0",
     "maintainer": {
@@ -48,7 +48,7 @@
                 "type": "user",
                 "ask": {
                     "en": "Choose the Ampache administrator (must be an existing YunoHost user)",
-                    "fr": "Administrateur du serveur Ampache (doit etre un utilisateur Yunohost existant)"
+                    "fr": "Administrateur du serveur Ampache (doit être un utilisateur YunoHost existant)"
                 },
                 "example": "homer"
             },

scripts/_common.sh

@@ -88,7 +88,7 @@ ynh_multimedia_build_main_dir () {
 	local checksum="806a827ba1902d6911095602a9221181"
 
 	# Download yunohost.multimedia scripts
-	wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz 
+	wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz 2>&1
 
 	# Check the control sum
 	echo "${checksum} ${ynh_media_release}.tar.gz" | md5sum -c --status \

scripts/backup

@@ -20,7 +20,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=2
+ynh_print_info --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -31,7 +31,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
-ynh_script_progression --message="Declaring files to be backed up..."
+ynh_print_info --message="Declaring files to be backed up..."
 
 #=================================================
 # BACKUP THE APP MAIN DIR
@@ -54,7 +54,7 @@ ynh_backup --src_path="/etc/php/${YNH_PHP_VERSION}/fpm/pool.d/$app.conf"
 #=================================================
 # BACKUP THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Backing up the MySQL database..."
+ynh_print_info --message="Backing up the MySQL database..."
 
 ynh_mysql_dump_db --database="$db_name" > db.sql
 
@@ -62,4 +62,4 @@ ynh_mysql_dump_db --database="$db_name" > db.sql
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last
+ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."

scripts/upgrade

@@ -87,13 +87,6 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-#=================================================
-# CHECK THE PATH
-#=================================================
-
-# Normalize the URL path syntax
-path_url=$(ynh_normalize_url_path --path_url=$path_url)
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================