From c5d3e4619a6817842dc5ad959363ae5ef542ef16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 3 Nov 2020 22:29:16 +0100 Subject: [PATCH 1/8] Update README.md --- README.md | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d06fe36..9f4fc06 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,7 @@ 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 -streaming application and file manager allowing you to access your -music & videos from anywhere, using almost any internet enabled device. +[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. **Shipped version:** 4.1.1.1 @@ -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. -In fact, it can disrupt external Ampache clients like Subsonic. +* 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. ## 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). From 310f964a365f4b796b43e4f0a8f5664a90d03109 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 21 Dec 2020 14:24:36 +0100 Subject: [PATCH 2/8] Remove ynh_normalize_url_path --- check_process | 5 ----- 1 file changed, 5 deletions(-) diff --git a/check_process b/check_process index ddc484f..84ec4ce 100644 --- a/check_process +++ b/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 From 2928adaec0864112a594bbecc3f5067b1f18316f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 21 Dec 2020 14:25:25 +0100 Subject: [PATCH 3/8] Use ynh_print_info instead of ynh_script_progression --- scripts/backup | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/backup b/scripts/backup index cd4a549..59d0489 100644 --- a/scripts/backup +++ b/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)." From 8d3403e3e1b2ead35701c0fe9eacc9eb39607ef4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 21 Dec 2020 14:25:48 +0100 Subject: [PATCH 4/8] Fix linter warnings --- scripts/_common.sh | 2 +- scripts/upgrade | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 242294a..981bf56 100644 --- a/scripts/_common.sh +++ b/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 \ diff --git a/scripts/upgrade b/scripts/upgrade index 94244fd..09e49b2 100644 --- a/scripts/upgrade +++ b/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 #================================================= From 1b971844c3cb5d3c2dfa1db98c74848501370f06 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 21 Dec 2020 14:26:43 +0100 Subject: [PATCH 5/8] Set badge to SVG --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f4fc06..751e8da 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # 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.* From dd01c73613cbcc1c038d3d3269ed6ef5b840f757 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 21 Dec 2020 14:28:43 +0100 Subject: [PATCH 6/8] Upgrade to v. 4.2.5 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 751e8da..a196dbd 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview [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. -**Shipped version:** 4.1.1.1 +**Shipped version:** 4.2.5 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 0d2dafa..041c788 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ampache/ampache/archive/f9ea16e7fc7a36636180241dc79f139b92bc8ff0.tar.gz -SOURCE_SUM=9cee154350b3b747b4ec6d405be768e8a3b0b1f0331a9f373c6a7c54c51f4775 +SOURCE_URL=https://github.com/ampache/ampache/archive/4.2.5.tar.gz +SOURCE_SUM=8cc954c997a5df722699ff165f20f06ceb095481bb20cccede0f585880d4c536 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 3638c5b..932247e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A web based audio/video streaming application", "fr": "Une 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": { From ca567de094c1572f0741622161e50df70ad63efc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 21 Dec 2020 14:30:55 +0100 Subject: [PATCH 7/8] Set transcode_ogg to allowed cf. issue #68 --- conf/ampache.cfg.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/ampache.cfg.php b/conf/ampache.cfg.php index c8a1ebd..646ef82 100644 --- a/conf/ampache.cfg.php +++ b/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_shn = required +transcode_ape = required +transcode_shn = required transcode_mp3 = allowed ;;; Video transcode_avi = allowed From 3b1ba65aa454a091b6a70c630d7df076cbf11a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 6 Jan 2021 14:19:07 +0100 Subject: [PATCH 8/8] Update manifest.json --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 932247e..c1f7116 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "ampache", "packaging_format": 1, "description": { - "en": "A web based audio/video streaming application", - "fr": "Une application de streaming audio et vidéo" + "en": "Web based audio/video streaming application", + "fr": "Application de streaming audio et vidéo" }, "version": "4.2.5~ynh1", "url": "http://ampache.org", @@ -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" },