From e0d0a33778ca057f35b098e5eca92ab7cb01ae8d Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Mon, 23 Aug 2021 20:00:36 +0200
Subject: [PATCH 01/64] update module versions

---
 scripts/_common.sh | 44 ++++++++++++++------------------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 5468699..8554744 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -16,47 +16,31 @@ pkg_dependencies="acl build-essential python3-dev python3-pip python3-venv git p
 python_version="$(python3 -V | cut -d' ' -f2 | cut -d. -f1-2)"
 
 myynh_install() {
-#    ynh_script_progression --message="Install / upgrade mopidy via pip..."  --weight=8
     python3 -m venv "${final_path}/env"
     chown -R "$app" "$final_path"
 
-#run source in a 'sub shell'
+    #run source in a 'sub shell'
     (
-        set +o nounset
-        source "${final_path}/env/bin/activate"
-        set -o nounset
-        ynh_exec_as $app $final_path/env/bin/pip install --upgrade --no-cache-dir pip
-
-#        ynh_script_progression --message="Installing essentials..." --weight=17
+	set +o nounset
+	source "${final_path}/env/bin/activate"
+	set -o nounset
+	ynh_exec_as $app $final_path/env/bin/pip install --upgrade --no-cache-dir pip
         
 	# to make Gstreamer visible in Python environment
-        $final_path/env/bin/python3 -m pip install vext
+	$final_path/env/bin/python3 -m pip install vext
 	$final_path/env/bin/python3 -m pip install --no-binary=:all: vext.gi
 
-    # install essential packages
-    ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy==3.1.1
-
-#	patch -u $final_path/env/lib/python$python_version/site-packages/mopidy/__main__.py -i ../sources/patches/__main__.patch --forward
-
-	
-    ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-local==3.2.1
-	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-MusicBox-Webclient==3.1.0
-#	ynh_script_progression --message="Installing Mopidy-YouTube..." --weight=7
-	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-YouTube==3.2
-#	ynh_script_progression --message="Installing Mopidy-YTMusic..." --weight=2
-	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-YTMusic==0.2.2
-#	ynh_script_progression --message="Installing Mopidy-RadioNet..."
+	# install essential packages
+	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy==3.2.0
+        
+        ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-local==3.2.1
+    	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-MusicBox-Webclient==3.1.0
+	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-YouTube==3.3
+	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir mopidy-ytmusic==0.3.0
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-RadioNet==0.2.2
-#	ynh_script_progression --message="Installing Mopidy-Podcast..."
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast==3.0.0
-#	ynh_script_progression --message="Installing Mopidy-Podcast-iTunes..." --weight=2
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast-iTunes==3.0.0
-#	ynh_script_progression --message="Installing Mopidy-SoundCloud..." --weight=6
-	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-SoundCloud
-	
-#	set +o nounset
-#	source "${final_path}/env/bin/deactivate"
-#	set -o nounset
+	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-SoundCloud==3.0.1
     )
 }
 

From 643c288fcdcb82aa7f2874e9a1604dc14d044b5f Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Mon, 23 Aug 2021 20:23:33 +0200
Subject: [PATCH 02/64] multimedia_build_main_dir now official helper

---
 scripts/_common.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 8554744..9b7a95f 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -51,15 +51,3 @@ myynh_install() {
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
-
-#=================================================
-# YUNOHOST MULTIMEDIA INTEGRATION
-#=================================================
-
-# Install or update the main directory yunohost.multimedia
-# see https://github.com/YunoHost-Apps/yunohost.multimedia
-ynh_multimedia_build_main_dir () {
-    wget -nv https://github.com/maniackcrudelis/yunohost.multimedia/archive/master.zip 2>&1
-    unzip master.zip
-    sudo ./yunohost.multimedia-master/script/ynh_media_build.sh
-}

From fb9c1e44f201becf4561a3906573a8b5e048b57a Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Mon, 23 Aug 2021 22:42:35 +0200
Subject: [PATCH 03/64] reduce number of dir-names

---
 conf/systemd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index c8d7366..cdb566f 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -11,7 +11,7 @@ After=sound.target
 [Service]
 User=__APP__
 PermissionsStartOnly=true
-ExecStart=__START_FILE__ --config __CONF_FILE__
+ExecStart=__FINALPATH__/env/bin/__APP____ --config __FINALPATH__/__APP__.conf
 
 [Install]
 WantedBy=multi-user.target

From 0031539841997a21769c5b5cfbb4377dc2d0aab8 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Mon, 23 Aug 2021 23:03:40 +0200
Subject: [PATCH 04/64] use helper ynh_add_config

---
 scripts/install | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/scripts/install b/scripts/install
index 303f0eb..8bd77d2 100755
--- a/scripts/install
+++ b/scripts/install
@@ -95,10 +95,6 @@ ynh_script_progression --message="Configuring NGINX web server..."
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-
-#=================================================
-# SPECIFIC SETUP
-#=================================================
 #=================================================
 # CREATE YUNOHOST DIRECTORIES
 #=================================================
@@ -116,7 +112,7 @@ chown -R $app: "$work_dir"
 ynh_script_progression --message="Configuring a systemd service..."
 
 # Create a dedicated systemd config
-start_file="$final_path/env/bin/$app"
+#start_file="$final_path/env/bin/$app"
 ynh_add_systemd_config #--others_var="conf_file start_file"      substitute __CONF_FILE__ by $conf_file
 
 #=================================================
@@ -124,12 +120,17 @@ ynh_add_systemd_config #--others_var="conf_file start_file"      substitute __CO
 #=================================================
 ynh_script_progression --message="Setup config file..."
 
-cp ../conf/app.conf "$conf_file"
+cache_dir=$work_dir/cache
+data_dir=$work_dir/data 
 
-ynh_replace_string --match_string="__PORT__"      --replace_string=$port           --target_file="$conf_file"
-ynh_replace_string --match_string="__MEDIADIR__"  --replace_string=$media_dir      --target_file="$conf_file"
-ynh_replace_string --match_string="__CACHE_DIR__" --replace_string=$work_dir/cache --target_file="$conf_file"
-ynh_replace_string --match_string="__DATA_DIR__"  --replace_string=$work_dir/data  --target_file="$conf_file"
+ynh_add_config --template="../conf/app.conf" --destination="$conf_file"
+
+#cp ../conf/app.conf "$conf_file"
+
+#ynh_replace_string --match_string="__PORT__"      --replace_string=$port           --target_file="$conf_file"
+#ynh_replace_string --match_string="__MEDIADIR__"  --replace_string=$media_dir      --target_file="$conf_file"
+#ynh_replace_string --match_string="__CACHE_DIR__" --replace_string=$work_dir/cache --target_file="$conf_file"
+#ynh_replace_string --match_string="__DATA_DIR__"  --replace_string=$work_dir/data  --target_file="$conf_file"
 
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM

From 15c23feda469945203444dd2fb8cc938457d080a Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Mon, 23 Aug 2021 23:14:35 +0200
Subject: [PATCH 05/64] typo

---
 conf/app.conf | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index 58b1690..45fefdf 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -10,7 +10,7 @@ data_dir = __DATA_DIR__
 
 [file]
 enabled = true
-media_dirs = __MEDIADIR__
+media_dirs = __MEDIA_DIR__
 #excluded_file_extensions =
 #  .directory
 #  .html
@@ -86,7 +86,7 @@ enabled = true
 [local]
 enabled = true
 #max_search_results = 100
-media_dir = __MEDIADIR__
+media_dir = __MEDIA_DIR__
 #scan_timeout = 1000
 #scan_flush_threshold = 100
 #scan_follow_symlinks = false
@@ -181,10 +181,3 @@ browse_root = __DATA_DIR__/podcast/bbc.opml
 enabled = false
 auth_token = ?
 #explore_songs = 25
-
-#[spotify]
-#enabled = true
-#username = ?      #see https://github.com/mopidy/mopidy-spotify
-#password = ?      
-#client_id = ?     
-#client_secret = ? 

From 366fc9a67919fdad7d250b6e4533e368f8b7384d Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Mon, 23 Aug 2021 23:24:37 +0200
Subject: [PATCH 06/64] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 8bd77d2..2b55d3d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -218,7 +218,7 @@ fi
 #=================================================
 ynh_script_progression --message="Scan local media directory..."
 
-"$cmd_file" local scan  2>&1
+#"$cmd_file" local scan  2>&1
 
 #=================================================
 # END OF SCRIPT

From 684d50ef4d504d7a3956afcfc0fd1b36462ac64c Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Mon, 23 Aug 2021 23:42:08 +0200
Subject: [PATCH 07/64] improve permissions of finalpath

---
 scripts/install | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 2b55d3d..f9b9f49 100755
--- a/scripts/install
+++ b/scripts/install
@@ -143,10 +143,13 @@ ynh_store_file_checksum --file="$conf_file"
 #=================================================
 # SECURE FILES AND DIRECTORIES
 #=================================================
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
 
 # user mopidy needs permission to mkdir on final_path
-chown -R root: $final_path
-chown $app: $final_path
+#chown -R root: $final_path
+#chown $app: $final_path
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST

From 8cdc7ba45413990c328fc224ef3ef1cd2ca6fd54 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Mon, 23 Aug 2021 23:59:48 +0200
Subject: [PATCH 08/64] Update systemd.service

---
 conf/systemd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index cdb566f..de7d4be 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -11,7 +11,7 @@ After=sound.target
 [Service]
 User=__APP__
 PermissionsStartOnly=true
-ExecStart=__FINALPATH__/env/bin/__APP____ --config __FINALPATH__/__APP__.conf
+ExecStart=__FINALPATH__/env/bin/__APP__ --config __FINALPATH__/__APP__.conf
 
 [Install]
 WantedBy=multi-user.target

From 3ae2ff35064529de1afa990e6712569a73b8e4c9 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 00:12:21 +0200
Subject: [PATCH 09/64] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index f9b9f49..4c6b340 100755
--- a/scripts/install
+++ b/scripts/install
@@ -221,7 +221,7 @@ fi
 #=================================================
 ynh_script_progression --message="Scan local media directory..."
 
-#"$cmd_file" local scan  2>&1
+"$cmd_file" local scan  2>&1
 
 #=================================================
 # END OF SCRIPT

From 621c825b21d1a0970824b1e2e26796e34995213f Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 00:25:51 +0200
Subject: [PATCH 10/64] improve SSOWAT

---
 scripts/install | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 4c6b340..5c1b261 100755
--- a/scripts/install
+++ b/scripts/install
@@ -176,9 +176,11 @@ if [ $is_public -eq 1 ]; then
 	ynh_permission_update --permission="main" --add="visitors"
 fi
 
-ynh_permission_url --permission="main" --add_url="$domain/mopidy/ws"
-ynh_permission_url --permission="main" --add_url="$domain/musicbox_webclient"
-ynh_permission_url --permission="main" --add_url="$domain/local"
+ynh_permission_url --permission="main" --url="$domain/mopidy" --add_url="$domain/mopidy/ws" "$domain/musicbox_webclient" "$domain/local"
+
+#ynh_permission_url --permission="main" --add_url="$domain/mopidy/ws"
+#ynh_permission_url --permission="main" --add_url="$domain/musicbox_webclient"
+#ynh_permission_url --permission="main" --add_url="$domain/local"
 
 #=================================================
 # RELOAD NGINX

From 739bb720442e1a651b4d6f6abbe0e523ee08ad96 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 00:35:34 +0200
Subject: [PATCH 11/64] improve provision of extra comand

---
 scripts/install | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 5c1b261..23415df 100755
--- a/scripts/install
+++ b/scripts/install
@@ -194,10 +194,12 @@ ynh_systemd_action --service_name=nginx --action=reload
 #=================================================
 ynh_script_progression --message="Provide additional shell command..."
 
-cp -a ../sources/extra_files/mopidyctl "$cmd_file"
-ynh_replace_string --match_string="__APP__"        --replace_string=$app        --target_file="$cmd_file"
-ynh_replace_string --match_string="__FINAL_PATH__" --replace_string=$final_path --target_file="$cmd_file"
-ynh_replace_string --match_string="__CONF_FILE__"  --replace_string=$conf_file  --target_file="$cmd_file"
+ynh_add_config --template="../sources/extra_files/mopidyctl" --destination="$cmd_file"
+
+#cp -a ../sources/extra_files/mopidyctl "$cmd_file"
+#ynh_replace_string --match_string="__APP__"        --replace_string=$app        --target_file="$cmd_file"
+#ynh_replace_string --match_string="__FINAL_PATH__" --replace_string=$final_path --target_file="$cmd_file"
+#ynh_replace_string --match_string="__CONF_FILE__"  --replace_string=$conf_file  --target_file="$cmd_file"
 
 chmod +x "$cmd_file"
 

From ca116afabe882bcf5fcb265d8a8137c52e34343a Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 00:44:57 +0200
Subject: [PATCH 12/64] Update install

---
 scripts/install | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/scripts/install b/scripts/install
index 23415df..67f9df1 100755
--- a/scripts/install
+++ b/scripts/install
@@ -112,8 +112,8 @@ chown -R $app: "$work_dir"
 ynh_script_progression --message="Configuring a systemd service..."
 
 # Create a dedicated systemd config
-#start_file="$final_path/env/bin/$app"
-ynh_add_systemd_config #--others_var="conf_file start_file"      substitute __CONF_FILE__ by $conf_file
+
+ynh_add_systemd_config
 
 #=================================================
 # MODIFY A CONFIG FILE
@@ -125,13 +125,6 @@ data_dir=$work_dir/data
 
 ynh_add_config --template="../conf/app.conf" --destination="$conf_file"
 
-#cp ../conf/app.conf "$conf_file"
-
-#ynh_replace_string --match_string="__PORT__"      --replace_string=$port           --target_file="$conf_file"
-#ynh_replace_string --match_string="__MEDIADIR__"  --replace_string=$media_dir      --target_file="$conf_file"
-#ynh_replace_string --match_string="__CACHE_DIR__" --replace_string=$work_dir/cache --target_file="$conf_file"
-#ynh_replace_string --match_string="__DATA_DIR__"  --replace_string=$work_dir/data  --target_file="$conf_file"
-
 #=================================================
 # STORE THE CONFIG FILE CHECKSUM
 #=================================================
@@ -147,10 +140,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-# user mopidy needs permission to mkdir on final_path
-#chown -R root: $final_path
-#chown $app: $final_path
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
@@ -178,10 +167,6 @@ fi
 
 ynh_permission_url --permission="main" --url="$domain/mopidy" --add_url="$domain/mopidy/ws" "$domain/musicbox_webclient" "$domain/local"
 
-#ynh_permission_url --permission="main" --add_url="$domain/mopidy/ws"
-#ynh_permission_url --permission="main" --add_url="$domain/musicbox_webclient"
-#ynh_permission_url --permission="main" --add_url="$domain/local"
-
 #=================================================
 # RELOAD NGINX
 #=================================================
@@ -196,11 +181,6 @@ ynh_script_progression --message="Provide additional shell command..."
 
 ynh_add_config --template="../sources/extra_files/mopidyctl" --destination="$cmd_file"
 
-#cp -a ../sources/extra_files/mopidyctl "$cmd_file"
-#ynh_replace_string --match_string="__APP__"        --replace_string=$app        --target_file="$cmd_file"
-#ynh_replace_string --match_string="__FINAL_PATH__" --replace_string=$final_path --target_file="$cmd_file"
-#ynh_replace_string --match_string="__CONF_FILE__"  --replace_string=$conf_file  --target_file="$cmd_file"
-
 chmod +x "$cmd_file"
 
 #=================================================

From f9615b8ee6a6c83e8fad4597ad943934696c9e2b Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 00:57:04 +0200
Subject: [PATCH 13/64] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 67f9df1..fd2b161 100755
--- a/scripts/install
+++ b/scripts/install
@@ -145,7 +145,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $app --description "Mopidy music server" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE

From f8547d3856b671c8b3a4643ae4f498c10594070d Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 00:57:50 +0200
Subject: [PATCH 14/64] Update remove

---
 scripts/remove | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/remove b/scripts/remove
index 06fb303..65e1e6c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -66,6 +66,7 @@ ynh_script_progression --message="Removing NGINX web server configuration..." --
 
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
+
 #=================================================
 # SPECIFIC REMOVE
 #=================================================

From bb7fbbe9aeb5830e42d48666b151ecb1282b0737 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 01:05:10 +0200
Subject: [PATCH 15/64] Update restore

---
 scripts/restore | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index 1813a3e..faa5fd6 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -72,14 +72,17 @@ ynh_system_user_create --username="$app" --home_dir="$final_path" --use_shell --
 #=================================================
 ynh_script_progression --message="Restoring the app main directory..." --weight=1
 
-ynh_restore_file --origin_path="$final_path"   # /opt/yunohost/mopidy
+ynh_restore_file --origin_path="$final_path"
 
 #=================================================
 # RESTORE USER RIGHTS
 #=================================================
 
 # Restore permissions on app files
-#chown -R root: $final_path
+
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
 
 #=================================================
 # SPECIFIC RESTORATION
@@ -104,7 +107,7 @@ systemctl enable $app.service --quiet
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description "Mopidy music server" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log"
 
 #=================================================
 # RESTORE VARIOUS FILES

From 14663525dfb60f1b22a0c23250910172c1e85f7d Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 01:26:43 +0200
Subject: [PATCH 16/64] Update upgrade

---
 scripts/upgrade | 56 +++++++++++++++----------------------------------
 1 file changed, 17 insertions(+), 39 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 707772a..29bc6be 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -73,6 +73,14 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="stop"
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username="$app" --home_dir="$final_path" --use_shell --groups="audio"
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -82,6 +90,10 @@ then
 	myynh_install
 fi
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -97,14 +109,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=11
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username="$app" --home_dir="$final_path" --use_shell --groups="audio"
-
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -113,46 +117,23 @@ ynh_system_user_create --username="$app" --home_dir="$final_path" --use_shell --
 ynh_script_progression --message="Upgrading systemd configuration..." --weight=3
 
 # Create a dedicated systemd config
-start_file="$final_path/env/bin/$app"
 ynh_add_systemd_config
 
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
 
-ynh_backup_if_checksum_is_different --file="$conf_file"
+cache_dir=$work_dir/cache
+data_dir=$work_dir/data 
 
-cp ../conf/app.conf "$conf_file"
-
-ynh_replace_string --match_string="__PORT__"      --replace_string=$port           --target_file="$conf_file"
-ynh_replace_string --match_string="__MEDIADIR__"  --replace_string=$media_dir      --target_file="$conf_file"
-ynh_replace_string --match_string="__CACHE_DIR__" --replace_string=$work_dir/cache --target_file="$conf_file"
-ynh_replace_string --match_string="__DATA_DIR__"  --replace_string=$work_dir/data  --target_file="$conf_file"
-
-#=================================================
-# STORE THE CONFIG FILE CHECKSUM
-#=================================================
-
-# Recalculate and store the checksum of the file for the next upgrade.
-ynh_store_file_checksum --file="$conf_file"
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-# siwi okay
-
-# user mopidy needs permission to mkdir on final_path
-chown -R root: $final_path
-chown $app: $final_path
+ynh_add_config --template="../conf/app.conf" --destination="$conf_file"
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description "Mopidy music server" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -173,10 +154,7 @@ ynh_systemd_action --service_name=nginx --action=reload
 #=================================================
 ynh_script_progression --message="Provide additional shell comand..."
 
-cp -a ../sources/extra_files/mopidyctl "$cmd_file"
-ynh_replace_string --match_string="__APP__"         --replace_string=$app        --target_file="$cmd_file"
-ynh_replace_string --match_string="__FINAL_PATH__"  --replace_string=$final_path --target_file="$cmd_file"
-ynh_replace_string --match_string="__CONF_FILE__"   --replace_string=$conf_file  --target_file="$cmd_file"
+ynh_add_config --template="../sources/extra_files/mopidyctl" --destination="$cmd_file"
 
 chmod +x "$cmd_file"
 

From 50597c408064b3ede0ffc2f6ef4f8bc4f2a06a59 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 01:32:40 +0200
Subject: [PATCH 17/64] Update check_process

---
 check_process | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/check_process b/check_process
index 8af44f2..3f9b49c 100644
--- a/check_process
+++ b/check_process
@@ -1,13 +1,9 @@
-# See here for more information
-# https://github.com/YunoHost/package_check#syntax-check_process-file
-
-# Move this file from check_process.default to check_process when you have filled it.
 
 ;; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
-		path="/path"	(PATH)
-		is_public=1	(PUBLIC|public=1|private=0)
+		domain="domain.tld"
+		path="/path"
+		is_public=1
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -28,4 +24,3 @@ Notification=none
 	; commit=CommitHash
 		name=Name and date of the commit.
 		manifest_arg=domain=DOMAIN&path=PATH&is_public=1
-

From 6c9cad6de4fffc9017faa4829088b00b1c7a65e9 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 01:37:51 +0200
Subject: [PATCH 18/64] Update nginx.conf

---
 conf/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index f2ba50c..1740a9d 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -37,7 +37,7 @@ location /musicbox_webclient/ {
 		rewrite ^ https://$server_name$request_uri? permanent;
 	}
 	
-	proxy_pass           http://localhost:6680;
+	proxy_pass           http://localhost:__PORT__;
         proxy_http_version   1.1;
         proxy_set_header     Host $host;
 
@@ -52,7 +52,7 @@ location /local/ {
 		rewrite ^ https://$server_name$request_uri? permanent;
 	}
 	
-	proxy_pass           http://localhost:6680;
+	proxy_pass           http://localhost:__PORT__;
         proxy_http_version   1.1;
         proxy_set_header     Host $host;
 

From e5c9a069b566c36fa4476260dc3e05cff9b4473a Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 01:41:43 +0200
Subject: [PATCH 19/64] Update manifest.json

---
 manifest.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6e00c75..67c8dee 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,8 @@
 	"id": "mopidy",
 	"packaging_format": 1,
 	"description": {
-		"en": "plays music, podcasts and radio programs from local disk and various streaming services" 
+		"en": "plays music, podcasts and radio programs from local disk and various streaming services",
+		"fr": "Jouer de la musique, podcasts et programmes radio depuis le disque local et de divers services de streaming"
 	},
 	"version": "3.1.1~ynh2",
 	"url": "https://www.mopidy.com/",
@@ -17,7 +18,7 @@
 		"email": "cyp@rouquin.me"
 	},
 	"requirements": {
-		"yunohost": ">= 4.1.7"
+		"yunohost": ">= 4.2.0"
 	},
     "multi_instance": false,
     "services": [

From c8d25af9fe1ff0ab9713c6446f4f223afaf9e75e Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 12:13:25 +0200
Subject: [PATCH 20/64] MPD extension

---
 manifest.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/manifest.json b/manifest.json
index 67c8dee..23fa72c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -45,6 +45,15 @@
                     "fr": "L'application publique peut être utilisée par des visiteurs anonymes "
                 },
                 "default": false
+            },
+            {
+                "name": "mpd_ext",
+                "type": "boolean",
+                "help": {
+                    "en": "Install MPD extension?",
+                    "fr": "Vous souhaitez installer l'extension MPD?"
+                },
+                "default": false
             }
         ]
     }

From 1715c88ec22dabe41ba6bf6b3b45081c47c80def Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 12:35:59 +0200
Subject: [PATCH 21/64] MPD extension

---
 scripts/{install => port} | 7 +++++++
 1 file changed, 7 insertions(+)
 rename scripts/{install => port} (97%)

diff --git a/scripts/install b/scripts/port
similarity index 97%
rename from scripts/install
rename to scripts/port
index fd2b161..3bb388b 100755
--- a/scripts/install
+++ b/scripts/port
@@ -23,6 +23,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
+mpd_ext= $YNH_APP_ARG_MPD_EXT
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -62,6 +63,12 @@ ynh_script_progression --message="Finding an available port..."
 port=$(ynh_find_port --port=6680)
 ynh_app_setting_set --app=$app --key=port --value=$port
 
+if [ $mpd_ext -eq 1 ]; then
+	mpd_port=$(ynh_find_port --port=6600)
+	ynh_app_setting_set --app=$app --key=mpd_port --value=$mpd_port
+	ynh_exec_warn_less yunohost firewall allow BOTH $mpd_port
+fi
+
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================

From 35db1502fa9c46d173afd5582f9a6e6a7d8421eb Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 12:38:55 +0200
Subject: [PATCH 22/64] MPD extension

---
 scripts/{port => install} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename scripts/{port => install} (100%)

diff --git a/scripts/port b/scripts/install
similarity index 100%
rename from scripts/port
rename to scripts/install

From e918b1db029e402be41fbce1aaa4007957ec20ba Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 12:43:02 +0200
Subject: [PATCH 23/64] Update _common.sh

---
 scripts/_common.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 9b7a95f..cead182 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -41,6 +41,9 @@ myynh_install() {
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast==3.0.0
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast-iTunes==3.0.0
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-SoundCloud==3.0.1
+	if [ $mpd_ext -eq 1 ]; then
+		ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-MPD==3.1.0
+	fi
     )
 }
 

From f6e57b5e477085f5ee58546574b1cffdb40bef7f Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 12:44:49 +0200
Subject: [PATCH 24/64] MPD extension

---
 conf/app.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/conf/app.conf b/conf/app.conf
index 45fefdf..e738858 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -181,3 +181,8 @@ browse_root = __DATA_DIR__/podcast/bbc.opml
 enabled = false
 auth_token = ?
 #explore_songs = 25
+
+[mpd]
+enabled = true
+hostname = 0.0.0.0
+port = __MPD_PORT__

From fdbec699f369cc455c565aabb5feea1513ed9b36 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 13:05:15 +0200
Subject: [PATCH 25/64] MPD extension

---
 scripts/remove | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/remove b/scripts/remove
index 65e1e6c..1b9bef9 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,6 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=4
 app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
+mpd_port=$(ynh_app_setting_get --app=$app --key=mpd_port)
 port=$(ynh_app_setting_get --app=$app --key=port)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
@@ -67,6 +68,15 @@ ynh_script_progression --message="Removing NGINX web server configuration..." --
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
+#=================================================
+# CLOSE A PORT
+#=================================================
+
+if yunohost firewall list | grep -q "\- $mpd_port$"
+then
+	ynh_script_progression --message="Closing port $mpd_port..." --time --weight=1
+	ynh_exec_warn_less yunohost firewall disallow TCP $mpd_port
+fi
 #=================================================
 # SPECIFIC REMOVE
 #=================================================

From 89a4298f0931eede7fbb0e296ed1c951e44ce4fa Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 13:11:23 +0200
Subject: [PATCH 26/64] Typo

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 3bb388b..fdb135c 100755
--- a/scripts/install
+++ b/scripts/install
@@ -23,7 +23,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
-mpd_ext= $YNH_APP_ARG_MPD_EXT
+mpd_ext=$YNH_APP_ARG_MPD_EXT
 
 app=$YNH_APP_INSTANCE_NAME
 

From 21f40fe69b5143c3686bb07ec7b8e59caa3112d7 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 13:15:15 +0200
Subject: [PATCH 27/64] Typo

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index fdb135c..0086f72 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,7 +66,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 if [ $mpd_ext -eq 1 ]; then
 	mpd_port=$(ynh_find_port --port=6600)
 	ynh_app_setting_set --app=$app --key=mpd_port --value=$mpd_port
-	ynh_exec_warn_less yunohost firewall allow BOTH $mpd_port
+	ynh_exec_warn_less yunohost firewall allow --no-upnp Both $mpd_port
 fi
 
 #=================================================

From 2ee2c5f1c23a185f977af4727a3e315c99a4c97a Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Tue, 24 Aug 2021 23:58:49 +0200
Subject: [PATCH 28/64] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index cead182..ca02bcb 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -41,7 +41,7 @@ myynh_install() {
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast==3.0.0
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast-iTunes==3.0.0
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-SoundCloud==3.0.1
-	if [ $mpd_ext -eq 1 ]; then
+	if [ $mpd_port -ne 0 ]; then
 		ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-MPD==3.1.0
 	fi
     )

From 3c1a93d88fb7e8f29f6fe2ec99dfd39347677683 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 00:01:05 +0200
Subject: [PATCH 29/64] Update install

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 0086f72..fd28363 100755
--- a/scripts/install
+++ b/scripts/install
@@ -23,7 +23,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
-mpd_ext=$YNH_APP_ARG_MPD_EXT
+mpd_port=$YNH_APP_ARG_MPD_EXT
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -63,7 +63,7 @@ ynh_script_progression --message="Finding an available port..."
 port=$(ynh_find_port --port=6680)
 ynh_app_setting_set --app=$app --key=port --value=$port
 
-if [ $mpd_ext -eq 1 ]; then
+if [ $mpd_port -eq 1 ]; then
 	mpd_port=$(ynh_find_port --port=6600)
 	ynh_app_setting_set --app=$app --key=mpd_port --value=$mpd_port
 	ynh_exec_warn_less yunohost firewall allow --no-upnp Both $mpd_port

From 13a3605a0e5ed0c749985d0c1a8a47b154731aee Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 00:28:12 +0200
Subject: [PATCH 30/64] MPD extension

---
 scripts/upgrade | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 29bc6be..8979e25 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
+mpd_port=$(ynh_app_setting_get --app=$app --key=mpd_port)
 
 # other variables
 media_dir="/home/yunohost.multimedia/share/Music"
@@ -45,10 +46,10 @@ upgrade_type=$(ynh_check_app_version_changed)
 #
 
 # If db_name doesn't exist, create it
-#if [ -z "$db_name" ]; then
-#	db_name=$(ynh_sanitize_dbid --db_name=$app)
-#	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-#fi
+if [ -z "$mpd_port" ]; then
+	mpd_port=0
+	ynh_app_setting_set --app=$app --key=mpd_port --value=$mpd_port
+fi
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP

From 93b4ace598c7bb4b6b64c0a0834b4d541e0231df Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 00:40:39 +0200
Subject: [PATCH 31/64] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8979e25..d58e456 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -5,7 +5,7 @@
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
-
+bulibuli
 source _common.sh
 source /usr/share/yunohost/helpers
 

From 7c9aac37fa6df0098d9e59bd166f50c9f3d8cc0c Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 00:47:48 +0200
Subject: [PATCH 32/64] Update upgrade

---
 scripts/upgrade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index d58e456..37b6f95 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -5,7 +5,6 @@
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
-bulibuli
 source _common.sh
 source /usr/share/yunohost/helpers
 

From 1463609e5635bae5714868567f11aa57bb0f344c Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 00:56:26 +0200
Subject: [PATCH 33/64] Update manifest.json

---
 manifest.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 23fa72c..ae5e72b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,8 +6,16 @@
 		"en": "plays music, podcasts and radio programs from local disk and various streaming services",
 		"fr": "Jouer de la musique, podcasts et programmes radio depuis le disque local et de divers services de streaming"
 	},
-	"version": "3.1.1~ynh2",
+	"version": "3.2.0~ynh1",
 	"url": "https://www.mopidy.com/",
+    "upstream": {
+        "license": "Apache-2.0",
+        "website": "https://www.mopidy.com/",
+        "demo": "https://demo.example.com",
+        "admindoc": "https://docs.mopidy.com/en/latest/",
+        "userdoc": "https://yunohost.org/apps",
+        "code": "https://github.com/mopidy/mopidy"
+    },
 	"license": "Apache-2.0",
 	"maintainer": {
 		"name": "siwinter",

From c252ea0efa224bd9ec585d8655f2dbbe9759a2aa Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Tue, 24 Aug 2021 22:56:28 +0000
Subject: [PATCH 34/64] Auto-update README

---
 README.md    | 72 +++++++++++++------------------------------------
 README_fr.md | 75 +++++++++++-----------------------------------------
 2 files changed, 34 insertions(+), 113 deletions(-)

diff --git a/README.md b/README.md
index f2ef09c..b20ee4b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+<!--
+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.
+-->
+
 # Mopidy for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg)  
@@ -5,67 +10,25 @@
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install Mopidy quickly and simply on a YunoHost server.  
+> *This package allows you to install Mopidy quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
-Mopidy - is an extensible music server. It plays music, podcasts and radio programs from local disk and various streaming services. You edit the playlist from any phone, tablet, or computer. You hear the music through the speakers connected to the server.
 
-**Shipped version:** 3.1.1
+plays music, podcasts and radio programs from local disk and various streaming services
 
-## Screenshots
+**Shipped version:** 3.2.0~ynh1
 
-![](sources/extra_files/mopidy_screenshot1.png)
-## Demo
+**Demo:** https://demo.example.com
 
-* No demo available
+## Documentation and resources
 
-## Configuration
-
-This installation is shipped with various extensions:
-
-* [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) to control mopidy from your web browser
-* [local](https://mopidy.com/ext/local/) to make your private music collection on `/home/yunohost.multimedia/share/Music/` browseable and searchable
-* [YouTube](https://pypi.org/project/Mopidy-YouTube/) to play sound from YouTube
-* [YTMusic](https://music.youtube.com/) to access Google’s streaming music named [YouTube Music](https://music.youtube.com/) 
-* [Podcast-iTunes](https://mopidy.com/ext/podcast-itunes/) to search and browse podcasts from the Apple iTunes Store.
-* [RadioNet](https://mopidy.com/ext/radionet/) to play radio channels from the [radio.net](https://www.radio.net/).
-* [Podcast](https://mopidy.com/ext/podcast/) to browse RSS feeds of podcasts and stream the episodes.
-* [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) to play music from the [SoundCloud](https://soundcloud.com/) service \([authentication token](https://pypi.org/project/Mopidy-SoundCloud/) needed\).
-
-## Documentation
-
- * Official documentation: https://docs.mopidy.com/en/latest/
-
-## YunoHost specific features
-
-#### Multi-user support
-
-* Are LDAP and HTTP auth supported? **No**
-* Can the app be used by multiple users? ??
-
-#### Supported architectures
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/)
-
-## Limitations
-
-* cannot be used with VPS or other servers that have no real audio hardware
-
-## Additional information
-
-* To list current settings enter `sudo mopidyctl config`.
-* Edit the file `/opt/yunohost/mopidy/mopidy.conf` to adjust Mopidy's configuration.
-* To rebuild the database of your local music collection enter `sudo mopidyctl local scan`.
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/mopidy_ynh/issues
- * App website: https://mopidy.com/
- * YunoHost website: https://yunohost.org/
-
----
+* Official app website: https://www.mopidy.com/
+* Official user documentation: https://yunohost.org/apps
+* Official admin documentation: https://docs.mopidy.com/en/latest/
+* Upstream app code repository: https://github.com/mopidy/mopidy
+* YunoHost documentation for this app: https://yunohost.org/app_mopidy
+* Report a bug: https://github.com/YunoHost-Apps/mopidy_ynh/issues
 
 ## Developer info
 
@@ -76,5 +39,6 @@ To try the testing branch, please proceed like that.
 sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade mopidy -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
-
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
diff --git a/README_fr.md b/README_fr.md
index c9408e3..3b74860 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -3,73 +3,28 @@
 [![Niveau d'intégration](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg)  
 [![Installer Mopidy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy)
 
-*[Read this readme in english.](./README.md)* 
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
 
-> *Ce package vous permet d'installer Mopidy rapidement et simplement sur un serveur YunoHost.  
-Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
+> *Ce package vous permet d'installer Mopidy 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.*
 
 ## Vue d'ensemble
-Mopidy - est un serveur de musique extensible. Mopidy lit de la musique, des podcasts et des programmes de radio à partir d'un disque local et de divers services de streaming.
-Vous pouvez modifier la liste de lecture à partir d'un téléphone, d'une tablette ou d'un ordinateur.
-Vous entendez la musique via les haut-parleurs connectés au serveur.
 
-**Version incluse :** 3.1.1
+Jouer de la musique, podcasts et programmes radio depuis le disque local et de divers services de streaming
 
-## Captures d'écran
+**Version incluse :** 3.2.0~ynh1
 
-![](sources/extra_files/mopidy_screenshot1.png)
+**Démo :** https://demo.example.com
 
-## Démo
+## Documentations et ressources
 
-* Aucune démo disponible
-
-## Configuration
-
-Cette installation est livrée avec différentes extensions:
-
-* [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) pour contrôler mopidy depuis votre navigateur Web
-* [local](https://mopidy.com/ext/local/) pour rendre votre collection de musique privée sur `/home/yunohost.multimedia/share/Music/` consultable
-* [YouTube](https://pypi.org/project/Mopidy-YouTube/) pour lire le son de YouTube
-* [YTMusic](https://music.youtube.com/) pour accéder à la musique en streaming de Google intitulée [YouTube Music](https://music.youtube.com/) 
-* [Podcast-iTunes](https://mopidy.com/ext/podcast-itunes/) pour rechercher et parcourir des podcasts sur l'iTunes Store d'Apple
-* [RadioNet](https://mopidy.com/ext/radionet/) pour écouter les canaux radio de [radio.net](https://www.radio.net/)
-* [Podcast](https://mopidy.com/ext/podcast/) pour parcourir les flux RSS des podcasts et diffuser les épisodes
-* [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) pour lire de la musique à partir du service [SoundCloud](https://soundcloud.com/) service \([jeton d'authentification](https://pypi.org/project/Mopidy-SoundCloud/) nécessaire\).
-
-
-## Documentation
-
- * Documentation officielle : https://docs.mopidy.com/en/latest/
-
-## Caractéristiques spécifiques YunoHost
-
-#### Support multi-utilisateur
-
-* L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
-* L'application peut-elle être utilisée par plusieurs utilisateurs ?
-
-#### Architectures supportées
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/)
-
-## Limitations
-
-* Ne peut pas être utilisé avec des VPS ou d'autres serveurs qui n'ont pas de matériel audio réel
-
-## Informations additionnelles
-
-* Pour lister les paramètres actuels, entrez  `sudo mopidyctl config`
-* Modifiez le fichier `/opt/yunohost/mopidy/mopidy.conf` pour ajuster la configuration de mopidy
-* Pour reconstruire la base de données de votre collection de musique locale, entrez `sudo mopidyctl local scan`
-
-## Liens
-
- * Signaler un bug : https://github.com/YunoHost-Apps/mopidy_ynh/issues
- * Site de l'application : https://mopidy.com/
- * Site web YunoHost : https://yunohost.org/
-
----
+* Site officiel de l'app : https://www.mopidy.com/
+* Documentation officielle utilisateur : https://yunohost.org/apps
+* Documentation officielle de l'admin : https://docs.mopidy.com/en/latest/
+* Dépôt de code officiel de l'app : https://github.com/mopidy/mopidy
+* Documentation YunoHost pour cette app : https://yunohost.org/app_mopidy
+* Signaler un bug : https://github.com/YunoHost-Apps/mopidy_ynh/issues
 
 ## Informations pour les développeurs
 
@@ -81,3 +36,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testi
 ou
 sudo yunohost app upgrade mopidy -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
 ```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file

From 1c24a83f5e2ab86d5a45e93cd418189a6f62ae3d Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 13:27:01 +0200
Subject: [PATCH 35/64] Update install

---
 scripts/install | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/install b/scripts/install
index fd28363..afb7ac2 100755
--- a/scripts/install
+++ b/scripts/install
@@ -67,6 +67,9 @@ if [ $mpd_port -eq 1 ]; then
 	mpd_port=$(ynh_find_port --port=6600)
 	ynh_app_setting_set --app=$app --key=mpd_port --value=$mpd_port
 	ynh_exec_warn_less yunohost firewall allow --no-upnp Both $mpd_port
+	mpd_state="true"
+else
+	mpd_state="false"
 fi
 
 #=================================================

From 66786e118233956f08dfea66d10693167861d680 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 13:28:17 +0200
Subject: [PATCH 36/64] MPD extension

---
 scripts/_common.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index ca02bcb..dca0a40 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -41,9 +41,7 @@ myynh_install() {
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast==3.0.0
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast-iTunes==3.0.0
 	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-SoundCloud==3.0.1
-	if [ $mpd_port -ne 0 ]; then
-		ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-MPD==3.1.0
-	fi
+	ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-MPD==3.1.0
     )
 }
 

From 91157dd2177f2f9639fc7c024e3db3a6279c1fab Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 13:29:42 +0200
Subject: [PATCH 37/64] MPD extension

---
 conf/app.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/app.conf b/conf/app.conf
index e738858..3b5185a 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -183,6 +183,6 @@ auth_token = ?
 #explore_songs = 25
 
 [mpd]
-enabled = true
+enabled = __MPD_STATE__
 hostname = 0.0.0.0
 port = __MPD_PORT__

From 4b3dce0d23057ffb4fa71d4992d921da4e81918c Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 13:41:07 +0200
Subject: [PATCH 38/64] MPD extension

---
 scripts/upgrade | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 37b6f95..a9fb8da 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -44,12 +44,18 @@ upgrade_type=$(ynh_check_app_version_changed)
 # some legacy installs and you therefore want to initiaze stuff during upgrade)
 #
 
-# If db_name doesn't exist, create it
+# If mpd_port doesn't exist, create it
 if [ -z "$mpd_port" ]; then
 	mpd_port=0
 	ynh_app_setting_set --app=$app --key=mpd_port --value=$mpd_port
 fi
 
+if [ $mpd_port -eq 0 ]; then
+	mpd_state="false"
+else
+	mpd_state="true"
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================

From 505c06a2b5a6c1982b406e8bad9e0fe5a0399cc6 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 14:00:17 +0200
Subject: [PATCH 39/64] MPD extension

---
 manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index ae5e72b..1fa7d7c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -58,8 +58,8 @@
                 "name": "mpd_ext",
                 "type": "boolean",
                 "help": {
-                    "en": "Install MPD extension?",
-                    "fr": "Vous souhaitez installer l'extension MPD?"
+                    "en": "Activate MPD extension (will open port 6600)",
+                    "fr": "activer l'extension MPD (il ouvrira le port 6600)"
                 },
                 "default": false
             }

From cc43453c53914c6c4c8e631eac5c6662c2020b1e Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 14:01:01 +0200
Subject: [PATCH 40/64] MPD extension

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 1fa7d7c..efa428c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -59,7 +59,7 @@
                 "type": "boolean",
                 "help": {
                     "en": "Activate MPD extension (will open port 6600)",
-                    "fr": "activer l'extension MPD (il ouvrira le port 6600)"
+                    "fr": "Activer l'extension MPD (il ouvrira le port 6600)"
                 },
                 "default": false
             }

From 4d802e13e5b10f401fdf2dc7f03080243e0b48d5 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:01:55 +0200
Subject: [PATCH 41/64] MPD extension

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index afb7ac2..9be83fd 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,7 +66,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 if [ $mpd_port -eq 1 ]; then
 	mpd_port=$(ynh_find_port --port=6600)
 	ynh_app_setting_set --app=$app --key=mpd_port --value=$mpd_port
-	ynh_exec_warn_less yunohost firewall allow --no-upnp Both $mpd_port
+	ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $mpd_port
 	mpd_state="true"
 else
 	mpd_state="false"

From f18abb1128e4d8c35aa8b075c0a60fb1a25ac214 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:19:03 +0200
Subject: [PATCH 42/64] MPD extension

---
 scripts/restore | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/restore b/scripts/restore
index faa5fd6..e66af1c 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -27,6 +27,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)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+mpd_port=$(ynh_app_setting_get --app=$app --key=mpd_port)
 
 # other variables
 media_dir="/home/yunohost.multimedia/share/Music"
@@ -86,6 +87,14 @@ chown -R $app:www-data "$final_path"
 
 #=================================================
 # SPECIFIC RESTORATION
+#=================================================
+# OPEN PORT
+#=================================================
+
+if [ $mpd_port -ne 0 ]; then
+	ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $mpd_port
+fi
+
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================

From a1856e293e053dcf091e3d657e0974adc9dbb906 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:42:18 +0200
Subject: [PATCH 43/64] Update README.md

---
 README.md | 72 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index b20ee4b..f2ef09c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,3 @@
-<!--
-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.
--->
-
 # Mopidy for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg)  
@@ -10,25 +5,67 @@ It shall NOT be edited by hand.
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install Mopidy quickly and simply on a YunoHost server.
+> *This package allows you to install Mopidy quickly and simply on a YunoHost server.  
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
+Mopidy - is an extensible music server. It plays music, podcasts and radio programs from local disk and various streaming services. You edit the playlist from any phone, tablet, or computer. You hear the music through the speakers connected to the server.
 
-plays music, podcasts and radio programs from local disk and various streaming services
+**Shipped version:** 3.1.1
 
-**Shipped version:** 3.2.0~ynh1
+## Screenshots
 
-**Demo:** https://demo.example.com
+![](sources/extra_files/mopidy_screenshot1.png)
+## Demo
 
-## Documentation and resources
+* No demo available
 
-* Official app website: https://www.mopidy.com/
-* Official user documentation: https://yunohost.org/apps
-* Official admin documentation: https://docs.mopidy.com/en/latest/
-* Upstream app code repository: https://github.com/mopidy/mopidy
-* YunoHost documentation for this app: https://yunohost.org/app_mopidy
-* Report a bug: https://github.com/YunoHost-Apps/mopidy_ynh/issues
+## Configuration
+
+This installation is shipped with various extensions:
+
+* [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) to control mopidy from your web browser
+* [local](https://mopidy.com/ext/local/) to make your private music collection on `/home/yunohost.multimedia/share/Music/` browseable and searchable
+* [YouTube](https://pypi.org/project/Mopidy-YouTube/) to play sound from YouTube
+* [YTMusic](https://music.youtube.com/) to access Google’s streaming music named [YouTube Music](https://music.youtube.com/) 
+* [Podcast-iTunes](https://mopidy.com/ext/podcast-itunes/) to search and browse podcasts from the Apple iTunes Store.
+* [RadioNet](https://mopidy.com/ext/radionet/) to play radio channels from the [radio.net](https://www.radio.net/).
+* [Podcast](https://mopidy.com/ext/podcast/) to browse RSS feeds of podcasts and stream the episodes.
+* [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) to play music from the [SoundCloud](https://soundcloud.com/) service \([authentication token](https://pypi.org/project/Mopidy-SoundCloud/) needed\).
+
+## Documentation
+
+ * Official documentation: https://docs.mopidy.com/en/latest/
+
+## YunoHost specific features
+
+#### Multi-user support
+
+* Are LDAP and HTTP auth supported? **No**
+* Can the app be used by multiple users? ??
+
+#### Supported architectures
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/)
+
+## Limitations
+
+* cannot be used with VPS or other servers that have no real audio hardware
+
+## Additional information
+
+* To list current settings enter `sudo mopidyctl config`.
+* Edit the file `/opt/yunohost/mopidy/mopidy.conf` to adjust Mopidy's configuration.
+* To rebuild the database of your local music collection enter `sudo mopidyctl local scan`.
+
+## Links
+
+ * Report a bug: https://github.com/YunoHost-Apps/mopidy_ynh/issues
+ * App website: https://mopidy.com/
+ * YunoHost website: https://yunohost.org/
+
+---
 
 ## Developer info
 
@@ -39,6 +76,5 @@ To try the testing branch, please proceed like that.
 sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade mopidy -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
-```
 
-**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
+```

From 62d47637140dcc5158abb1fc9b725e1cd4b21773 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Wed, 25 Aug 2021 14:42:22 +0000
Subject: [PATCH 44/64] Auto-update README

---
 README.md | 72 ++++++++++++++-----------------------------------------
 1 file changed, 18 insertions(+), 54 deletions(-)

diff --git a/README.md b/README.md
index f2ef09c..b20ee4b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+<!--
+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.
+-->
+
 # Mopidy for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg)  
@@ -5,67 +10,25 @@
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install Mopidy quickly and simply on a YunoHost server.  
+> *This package allows you to install Mopidy quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
-Mopidy - is an extensible music server. It plays music, podcasts and radio programs from local disk and various streaming services. You edit the playlist from any phone, tablet, or computer. You hear the music through the speakers connected to the server.
 
-**Shipped version:** 3.1.1
+plays music, podcasts and radio programs from local disk and various streaming services
 
-## Screenshots
+**Shipped version:** 3.2.0~ynh1
 
-![](sources/extra_files/mopidy_screenshot1.png)
-## Demo
+**Demo:** https://demo.example.com
 
-* No demo available
+## Documentation and resources
 
-## Configuration
-
-This installation is shipped with various extensions:
-
-* [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) to control mopidy from your web browser
-* [local](https://mopidy.com/ext/local/) to make your private music collection on `/home/yunohost.multimedia/share/Music/` browseable and searchable
-* [YouTube](https://pypi.org/project/Mopidy-YouTube/) to play sound from YouTube
-* [YTMusic](https://music.youtube.com/) to access Google’s streaming music named [YouTube Music](https://music.youtube.com/) 
-* [Podcast-iTunes](https://mopidy.com/ext/podcast-itunes/) to search and browse podcasts from the Apple iTunes Store.
-* [RadioNet](https://mopidy.com/ext/radionet/) to play radio channels from the [radio.net](https://www.radio.net/).
-* [Podcast](https://mopidy.com/ext/podcast/) to browse RSS feeds of podcasts and stream the episodes.
-* [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) to play music from the [SoundCloud](https://soundcloud.com/) service \([authentication token](https://pypi.org/project/Mopidy-SoundCloud/) needed\).
-
-## Documentation
-
- * Official documentation: https://docs.mopidy.com/en/latest/
-
-## YunoHost specific features
-
-#### Multi-user support
-
-* Are LDAP and HTTP auth supported? **No**
-* Can the app be used by multiple users? ??
-
-#### Supported architectures
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/)
-
-## Limitations
-
-* cannot be used with VPS or other servers that have no real audio hardware
-
-## Additional information
-
-* To list current settings enter `sudo mopidyctl config`.
-* Edit the file `/opt/yunohost/mopidy/mopidy.conf` to adjust Mopidy's configuration.
-* To rebuild the database of your local music collection enter `sudo mopidyctl local scan`.
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/mopidy_ynh/issues
- * App website: https://mopidy.com/
- * YunoHost website: https://yunohost.org/
-
----
+* Official app website: https://www.mopidy.com/
+* Official user documentation: https://yunohost.org/apps
+* Official admin documentation: https://docs.mopidy.com/en/latest/
+* Upstream app code repository: https://github.com/mopidy/mopidy
+* YunoHost documentation for this app: https://yunohost.org/app_mopidy
+* Report a bug: https://github.com/YunoHost-Apps/mopidy_ynh/issues
 
 ## Developer info
 
@@ -76,5 +39,6 @@ To try the testing branch, please proceed like that.
 sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade mopidy -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
-
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file

From 30068b905e60be1cab9a5a6b7f75ab555c087c1b Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:43:23 +0200
Subject: [PATCH 45/64] Update README_fr.md

---
 README_fr.md | 75 +++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 59 insertions(+), 16 deletions(-)

diff --git a/README_fr.md b/README_fr.md
index 3b74860..c9408e3 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -3,28 +3,73 @@
 [![Niveau d'intégration](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg)  
 [![Installer Mopidy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy)
 
-*[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
+*[Read this readme in english.](./README.md)* 
 
-> *Ce package vous permet d'installer Mopidy 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.*
+> *Ce package vous permet d'installer Mopidy rapidement et simplement sur un serveur YunoHost.  
+Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
 
 ## Vue d'ensemble
+Mopidy - est un serveur de musique extensible. Mopidy lit de la musique, des podcasts et des programmes de radio à partir d'un disque local et de divers services de streaming.
+Vous pouvez modifier la liste de lecture à partir d'un téléphone, d'une tablette ou d'un ordinateur.
+Vous entendez la musique via les haut-parleurs connectés au serveur.
 
-Jouer de la musique, podcasts et programmes radio depuis le disque local et de divers services de streaming
+**Version incluse :** 3.1.1
 
-**Version incluse :** 3.2.0~ynh1
+## Captures d'écran
 
-**Démo :** https://demo.example.com
+![](sources/extra_files/mopidy_screenshot1.png)
 
-## Documentations et ressources
+## Démo
 
-* Site officiel de l'app : https://www.mopidy.com/
-* Documentation officielle utilisateur : https://yunohost.org/apps
-* Documentation officielle de l'admin : https://docs.mopidy.com/en/latest/
-* Dépôt de code officiel de l'app : https://github.com/mopidy/mopidy
-* Documentation YunoHost pour cette app : https://yunohost.org/app_mopidy
-* Signaler un bug : https://github.com/YunoHost-Apps/mopidy_ynh/issues
+* Aucune démo disponible
+
+## Configuration
+
+Cette installation est livrée avec différentes extensions:
+
+* [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) pour contrôler mopidy depuis votre navigateur Web
+* [local](https://mopidy.com/ext/local/) pour rendre votre collection de musique privée sur `/home/yunohost.multimedia/share/Music/` consultable
+* [YouTube](https://pypi.org/project/Mopidy-YouTube/) pour lire le son de YouTube
+* [YTMusic](https://music.youtube.com/) pour accéder à la musique en streaming de Google intitulée [YouTube Music](https://music.youtube.com/) 
+* [Podcast-iTunes](https://mopidy.com/ext/podcast-itunes/) pour rechercher et parcourir des podcasts sur l'iTunes Store d'Apple
+* [RadioNet](https://mopidy.com/ext/radionet/) pour écouter les canaux radio de [radio.net](https://www.radio.net/)
+* [Podcast](https://mopidy.com/ext/podcast/) pour parcourir les flux RSS des podcasts et diffuser les épisodes
+* [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) pour lire de la musique à partir du service [SoundCloud](https://soundcloud.com/) service \([jeton d'authentification](https://pypi.org/project/Mopidy-SoundCloud/) nécessaire\).
+
+
+## Documentation
+
+ * Documentation officielle : https://docs.mopidy.com/en/latest/
+
+## Caractéristiques spécifiques YunoHost
+
+#### Support multi-utilisateur
+
+* L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
+* L'application peut-elle être utilisée par plusieurs utilisateurs ?
+
+#### Architectures supportées
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/)
+
+## Limitations
+
+* Ne peut pas être utilisé avec des VPS ou d'autres serveurs qui n'ont pas de matériel audio réel
+
+## Informations additionnelles
+
+* Pour lister les paramètres actuels, entrez  `sudo mopidyctl config`
+* Modifiez le fichier `/opt/yunohost/mopidy/mopidy.conf` pour ajuster la configuration de mopidy
+* Pour reconstruire la base de données de votre collection de musique locale, entrez `sudo mopidyctl local scan`
+
+## Liens
+
+ * Signaler un bug : https://github.com/YunoHost-Apps/mopidy_ynh/issues
+ * Site de l'application : https://mopidy.com/
+ * Site web YunoHost : https://yunohost.org/
+
+---
 
 ## Informations pour les développeurs
 
@@ -36,5 +81,3 @@ sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testi
 ou
 sudo yunohost app upgrade mopidy -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
 ```
-
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file

From 6cb54efe1c77f3550bbc1dab94e9ccb07c9eba09 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Wed, 25 Aug 2021 14:43:26 +0000
Subject: [PATCH 46/64] Auto-update README

---
 README_fr.md | 75 +++++++++++-----------------------------------------
 1 file changed, 16 insertions(+), 59 deletions(-)

diff --git a/README_fr.md b/README_fr.md
index c9408e3..3b74860 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -3,73 +3,28 @@
 [![Niveau d'intégration](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg)  
 [![Installer Mopidy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy)
 
-*[Read this readme in english.](./README.md)* 
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
 
-> *Ce package vous permet d'installer Mopidy rapidement et simplement sur un serveur YunoHost.  
-Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
+> *Ce package vous permet d'installer Mopidy 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.*
 
 ## Vue d'ensemble
-Mopidy - est un serveur de musique extensible. Mopidy lit de la musique, des podcasts et des programmes de radio à partir d'un disque local et de divers services de streaming.
-Vous pouvez modifier la liste de lecture à partir d'un téléphone, d'une tablette ou d'un ordinateur.
-Vous entendez la musique via les haut-parleurs connectés au serveur.
 
-**Version incluse :** 3.1.1
+Jouer de la musique, podcasts et programmes radio depuis le disque local et de divers services de streaming
 
-## Captures d'écran
+**Version incluse :** 3.2.0~ynh1
 
-![](sources/extra_files/mopidy_screenshot1.png)
+**Démo :** https://demo.example.com
 
-## Démo
+## Documentations et ressources
 
-* Aucune démo disponible
-
-## Configuration
-
-Cette installation est livrée avec différentes extensions:
-
-* [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) pour contrôler mopidy depuis votre navigateur Web
-* [local](https://mopidy.com/ext/local/) pour rendre votre collection de musique privée sur `/home/yunohost.multimedia/share/Music/` consultable
-* [YouTube](https://pypi.org/project/Mopidy-YouTube/) pour lire le son de YouTube
-* [YTMusic](https://music.youtube.com/) pour accéder à la musique en streaming de Google intitulée [YouTube Music](https://music.youtube.com/) 
-* [Podcast-iTunes](https://mopidy.com/ext/podcast-itunes/) pour rechercher et parcourir des podcasts sur l'iTunes Store d'Apple
-* [RadioNet](https://mopidy.com/ext/radionet/) pour écouter les canaux radio de [radio.net](https://www.radio.net/)
-* [Podcast](https://mopidy.com/ext/podcast/) pour parcourir les flux RSS des podcasts et diffuser les épisodes
-* [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) pour lire de la musique à partir du service [SoundCloud](https://soundcloud.com/) service \([jeton d'authentification](https://pypi.org/project/Mopidy-SoundCloud/) nécessaire\).
-
-
-## Documentation
-
- * Documentation officielle : https://docs.mopidy.com/en/latest/
-
-## Caractéristiques spécifiques YunoHost
-
-#### Support multi-utilisateur
-
-* L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
-* L'application peut-elle être utilisée par plusieurs utilisateurs ?
-
-#### Architectures supportées
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/)
-
-## Limitations
-
-* Ne peut pas être utilisé avec des VPS ou d'autres serveurs qui n'ont pas de matériel audio réel
-
-## Informations additionnelles
-
-* Pour lister les paramètres actuels, entrez  `sudo mopidyctl config`
-* Modifiez le fichier `/opt/yunohost/mopidy/mopidy.conf` pour ajuster la configuration de mopidy
-* Pour reconstruire la base de données de votre collection de musique locale, entrez `sudo mopidyctl local scan`
-
-## Liens
-
- * Signaler un bug : https://github.com/YunoHost-Apps/mopidy_ynh/issues
- * Site de l'application : https://mopidy.com/
- * Site web YunoHost : https://yunohost.org/
-
----
+* Site officiel de l'app : https://www.mopidy.com/
+* Documentation officielle utilisateur : https://yunohost.org/apps
+* Documentation officielle de l'admin : https://docs.mopidy.com/en/latest/
+* Dépôt de code officiel de l'app : https://github.com/mopidy/mopidy
+* Documentation YunoHost pour cette app : https://yunohost.org/app_mopidy
+* Signaler un bug : https://github.com/YunoHost-Apps/mopidy_ynh/issues
 
 ## Informations pour les développeurs
 
@@ -81,3 +36,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testi
 ou
 sudo yunohost app upgrade mopidy -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
 ```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file

From fcf1011302c780be353f451294eb7e1c1d6b4d68 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:45:10 +0200
Subject: [PATCH 47/64] avoid auto readme

---
 manifest.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/manifest.json b/manifest.json
index efa428c..456fcdd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,14 +8,6 @@
 	},
 	"version": "3.2.0~ynh1",
 	"url": "https://www.mopidy.com/",
-    "upstream": {
-        "license": "Apache-2.0",
-        "website": "https://www.mopidy.com/",
-        "demo": "https://demo.example.com",
-        "admindoc": "https://docs.mopidy.com/en/latest/",
-        "userdoc": "https://yunohost.org/apps",
-        "code": "https://github.com/mopidy/mopidy"
-    },
 	"license": "Apache-2.0",
 	"maintainer": {
 		"name": "siwinter",

From b5ba474e2d2a24eda1c84dabe95483cc35779118 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:46:34 +0200
Subject: [PATCH 48/64] Update README.md

---
 README.md | 72 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index b20ee4b..f2ef09c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,3 @@
-<!--
-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.
--->
-
 # Mopidy for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg)  
@@ -10,25 +5,67 @@ It shall NOT be edited by hand.
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install Mopidy quickly and simply on a YunoHost server.
+> *This package allows you to install Mopidy quickly and simply on a YunoHost server.  
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
+Mopidy - is an extensible music server. It plays music, podcasts and radio programs from local disk and various streaming services. You edit the playlist from any phone, tablet, or computer. You hear the music through the speakers connected to the server.
 
-plays music, podcasts and radio programs from local disk and various streaming services
+**Shipped version:** 3.1.1
 
-**Shipped version:** 3.2.0~ynh1
+## Screenshots
 
-**Demo:** https://demo.example.com
+![](sources/extra_files/mopidy_screenshot1.png)
+## Demo
 
-## Documentation and resources
+* No demo available
 
-* Official app website: https://www.mopidy.com/
-* Official user documentation: https://yunohost.org/apps
-* Official admin documentation: https://docs.mopidy.com/en/latest/
-* Upstream app code repository: https://github.com/mopidy/mopidy
-* YunoHost documentation for this app: https://yunohost.org/app_mopidy
-* Report a bug: https://github.com/YunoHost-Apps/mopidy_ynh/issues
+## Configuration
+
+This installation is shipped with various extensions:
+
+* [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) to control mopidy from your web browser
+* [local](https://mopidy.com/ext/local/) to make your private music collection on `/home/yunohost.multimedia/share/Music/` browseable and searchable
+* [YouTube](https://pypi.org/project/Mopidy-YouTube/) to play sound from YouTube
+* [YTMusic](https://music.youtube.com/) to access Google’s streaming music named [YouTube Music](https://music.youtube.com/) 
+* [Podcast-iTunes](https://mopidy.com/ext/podcast-itunes/) to search and browse podcasts from the Apple iTunes Store.
+* [RadioNet](https://mopidy.com/ext/radionet/) to play radio channels from the [radio.net](https://www.radio.net/).
+* [Podcast](https://mopidy.com/ext/podcast/) to browse RSS feeds of podcasts and stream the episodes.
+* [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) to play music from the [SoundCloud](https://soundcloud.com/) service \([authentication token](https://pypi.org/project/Mopidy-SoundCloud/) needed\).
+
+## Documentation
+
+ * Official documentation: https://docs.mopidy.com/en/latest/
+
+## YunoHost specific features
+
+#### Multi-user support
+
+* Are LDAP and HTTP auth supported? **No**
+* Can the app be used by multiple users? ??
+
+#### Supported architectures
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/)
+
+## Limitations
+
+* cannot be used with VPS or other servers that have no real audio hardware
+
+## Additional information
+
+* To list current settings enter `sudo mopidyctl config`.
+* Edit the file `/opt/yunohost/mopidy/mopidy.conf` to adjust Mopidy's configuration.
+* To rebuild the database of your local music collection enter `sudo mopidyctl local scan`.
+
+## Links
+
+ * Report a bug: https://github.com/YunoHost-Apps/mopidy_ynh/issues
+ * App website: https://mopidy.com/
+ * YunoHost website: https://yunohost.org/
+
+---
 
 ## Developer info
 
@@ -39,6 +76,5 @@ To try the testing branch, please proceed like that.
 sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade mopidy -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
-```
 
-**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
+```

From a8001111dc8b8ed05fc105c083f695a659217830 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:48:00 +0200
Subject: [PATCH 49/64] Update README_fr.md

---
 README_fr.md | 75 +++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 59 insertions(+), 16 deletions(-)

diff --git a/README_fr.md b/README_fr.md
index 3b74860..c9408e3 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -3,28 +3,73 @@
 [![Niveau d'intégration](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg)  
 [![Installer Mopidy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy)
 
-*[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
+*[Read this readme in english.](./README.md)* 
 
-> *Ce package vous permet d'installer Mopidy 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.*
+> *Ce package vous permet d'installer Mopidy rapidement et simplement sur un serveur YunoHost.  
+Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
 
 ## Vue d'ensemble
+Mopidy - est un serveur de musique extensible. Mopidy lit de la musique, des podcasts et des programmes de radio à partir d'un disque local et de divers services de streaming.
+Vous pouvez modifier la liste de lecture à partir d'un téléphone, d'une tablette ou d'un ordinateur.
+Vous entendez la musique via les haut-parleurs connectés au serveur.
 
-Jouer de la musique, podcasts et programmes radio depuis le disque local et de divers services de streaming
+**Version incluse :** 3.1.1
 
-**Version incluse :** 3.2.0~ynh1
+## Captures d'écran
 
-**Démo :** https://demo.example.com
+![](sources/extra_files/mopidy_screenshot1.png)
 
-## Documentations et ressources
+## Démo
 
-* Site officiel de l'app : https://www.mopidy.com/
-* Documentation officielle utilisateur : https://yunohost.org/apps
-* Documentation officielle de l'admin : https://docs.mopidy.com/en/latest/
-* Dépôt de code officiel de l'app : https://github.com/mopidy/mopidy
-* Documentation YunoHost pour cette app : https://yunohost.org/app_mopidy
-* Signaler un bug : https://github.com/YunoHost-Apps/mopidy_ynh/issues
+* Aucune démo disponible
+
+## Configuration
+
+Cette installation est livrée avec différentes extensions:
+
+* [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) pour contrôler mopidy depuis votre navigateur Web
+* [local](https://mopidy.com/ext/local/) pour rendre votre collection de musique privée sur `/home/yunohost.multimedia/share/Music/` consultable
+* [YouTube](https://pypi.org/project/Mopidy-YouTube/) pour lire le son de YouTube
+* [YTMusic](https://music.youtube.com/) pour accéder à la musique en streaming de Google intitulée [YouTube Music](https://music.youtube.com/) 
+* [Podcast-iTunes](https://mopidy.com/ext/podcast-itunes/) pour rechercher et parcourir des podcasts sur l'iTunes Store d'Apple
+* [RadioNet](https://mopidy.com/ext/radionet/) pour écouter les canaux radio de [radio.net](https://www.radio.net/)
+* [Podcast](https://mopidy.com/ext/podcast/) pour parcourir les flux RSS des podcasts et diffuser les épisodes
+* [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) pour lire de la musique à partir du service [SoundCloud](https://soundcloud.com/) service \([jeton d'authentification](https://pypi.org/project/Mopidy-SoundCloud/) nécessaire\).
+
+
+## Documentation
+
+ * Documentation officielle : https://docs.mopidy.com/en/latest/
+
+## Caractéristiques spécifiques YunoHost
+
+#### Support multi-utilisateur
+
+* L'authentification LDAP et HTTP est-elle prise en charge ? **Non**
+* L'application peut-elle être utilisée par plusieurs utilisateurs ?
+
+#### Architectures supportées
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/)
+
+## Limitations
+
+* Ne peut pas être utilisé avec des VPS ou d'autres serveurs qui n'ont pas de matériel audio réel
+
+## Informations additionnelles
+
+* Pour lister les paramètres actuels, entrez  `sudo mopidyctl config`
+* Modifiez le fichier `/opt/yunohost/mopidy/mopidy.conf` pour ajuster la configuration de mopidy
+* Pour reconstruire la base de données de votre collection de musique locale, entrez `sudo mopidyctl local scan`
+
+## Liens
+
+ * Signaler un bug : https://github.com/YunoHost-Apps/mopidy_ynh/issues
+ * Site de l'application : https://mopidy.com/
+ * Site web YunoHost : https://yunohost.org/
+
+---
 
 ## Informations pour les développeurs
 
@@ -36,5 +81,3 @@ sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testi
 ou
 sudo yunohost app upgrade mopidy -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
 ```
-
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file

From d1569d6ab5f9297a162616e68e6115c0f9680008 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:55:31 +0200
Subject: [PATCH 50/64] MPD extension

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f2ef09c..30139a8 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ This installation is shipped with various extensions:
 * [RadioNet](https://mopidy.com/ext/radionet/) to play radio channels from the [radio.net](https://www.radio.net/).
 * [Podcast](https://mopidy.com/ext/podcast/) to browse RSS feeds of podcasts and stream the episodes.
 * [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) to play music from the [SoundCloud](https://soundcloud.com/) service \([authentication token](https://pypi.org/project/Mopidy-SoundCloud/) needed\).
+* [MPD](https://mopidy.com/ext/mpd/) can be activated in order to use apps that control mopidy via this protocol. (This will open port 6600.) 
 
 ## Documentation
 

From 3a08135f5a38e2b55a7293d0b99a48d93eab054c Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 16:59:42 +0200
Subject: [PATCH 51/64] MPD extension

---
 README_fr.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README_fr.md b/README_fr.md
index c9408e3..012ad5c 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -35,6 +35,7 @@ Cette installation est livrée avec différentes extensions:
 * [RadioNet](https://mopidy.com/ext/radionet/) pour écouter les canaux radio de [radio.net](https://www.radio.net/)
 * [Podcast](https://mopidy.com/ext/podcast/) pour parcourir les flux RSS des podcasts et diffuser les épisodes
 * [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) pour lire de la musique à partir du service [SoundCloud](https://soundcloud.com/) service \([jeton d'authentification](https://pypi.org/project/Mopidy-SoundCloud/) nécessaire\).
+* [MPD](https://mopidy.com/ext/mpd/) peut être activé afin d'utiliser des applications qui contrôlent mpidy via ce protocole. (Cela ouvrira le port 6600 )
 
 
 ## Documentation

From 6678ca9a56bc88bec680420008a762a4ae5e17c9 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 19:18:58 +0200
Subject: [PATCH 52/64] avoid linter warning

---
 scripts/install | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 9be83fd..7fd4453 100755
--- a/scripts/install
+++ b/scripts/install
@@ -155,7 +155,11 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..."
 
-yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log"
+if [ $mpd_port -ne 0 ]; then
+	yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log" --needs_exposed_ports=$mpd_port
+else
+	yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log"
+fi
 
 #=================================================
 # START SYSTEMD SERVICE

From 0beccfda1f17bb7fe4c5aca7c3a8adfab252654c Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 19:22:04 +0200
Subject: [PATCH 53/64] avoid linter warning

---
 scripts/restore | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/restore b/scripts/restore
index e66af1c..c428d4d 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -116,7 +116,11 @@ systemctl enable $app.service --quiet
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log"
+if [ $mpd_port -ne 0 ]; then
+	yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log" --needs_exposed_ports=$mpd_port
+else
+	yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log"
+fi
 
 #=================================================
 # RESTORE VARIOUS FILES

From 0f0647562d36f17552ea5c086586445db1252136 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 19:29:17 +0200
Subject: [PATCH 54/64] Update manifest.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
---
 manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 456fcdd..ff79271 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,8 +50,8 @@
                 "name": "mpd_ext",
                 "type": "boolean",
                 "help": {
-                    "en": "Activate MPD extension (will open port 6600)",
-                    "fr": "Activer l'extension MPD (il ouvrira le port 6600)"
+                    "en": "Activate MPD extension (this will open port 6600)",
+                    "fr": "Activer l'extension MPD (cela ouvrira le port 6600)"
                 },
                 "default": false
             }

From 51acb6fdf08206c7a0922626771f542ffebc0d17 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 19:29:55 +0200
Subject: [PATCH 55/64] Update manifest.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
---
 manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index ff79271..b463de7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,8 +3,8 @@
 	"id": "mopidy",
 	"packaging_format": 1,
 	"description": {
-		"en": "plays music, podcasts and radio programs from local disk and various streaming services",
-		"fr": "Jouer de la musique, podcasts et programmes radio depuis le disque local et de divers services de streaming"
+		"en": "Play music, podcasts and radio programs from local disk and various streaming services",
+		"fr": "Écouter de la musique, des podcasts et des programmes radio depuis le disque local et divers services de streaming"
 	},
 	"version": "3.2.0~ynh1",
 	"url": "https://www.mopidy.com/",

From fa7ff85ef998b51eb0a59a9d6dbca952cac502bf Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 21:32:20 +0200
Subject: [PATCH 56/64] allow public usage

---
 scripts/install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 7fd4453..09b9a84 100755
--- a/scripts/install
+++ b/scripts/install
@@ -174,13 +174,13 @@ ynh_systemd_action --service_name=$app --action="start"
 #=================================================
 ynh_script_progression --message="Configuring permissions..."
 
+ynh_permission_url --permission="main" --url="$domain/mopidy" --add_url="$domain/mopidy/ws" "$domain/musicbox_webclient" "$domain/local"
+
 # Make app public if necessary
 if [ $is_public -eq 1 ]; then
 	ynh_permission_update --permission="main" --add="visitors"
 fi
 
-ynh_permission_url --permission="main" --url="$domain/mopidy" --add_url="$domain/mopidy/ws" "$domain/musicbox_webclient" "$domain/local"
-
 #=================================================
 # RELOAD NGINX
 #=================================================

From f9e9234e55012259646a31c947ab1ae5a03087cb Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 21:50:16 +0200
Subject: [PATCH 57/64] allow public usage

---
 scripts/install | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 09b9a84..aa424d3 100755
--- a/scripts/install
+++ b/scripts/install
@@ -174,13 +174,15 @@ ynh_systemd_action --service_name=$app --action="start"
 #=================================================
 ynh_script_progression --message="Configuring permissions..."
 
-ynh_permission_url --permission="main" --url="$domain/mopidy" --add_url="$domain/mopidy/ws" "$domain/musicbox_webclient" "$domain/local"
-
 # Make app public if necessary
 if [ $is_public -eq 1 ]; then
 	ynh_permission_update --permission="main" --add="visitors"
 fi
 
+ynh_permission_url --permission="main" --add_url="$domain/mopidy/ws"
+ynh_permission_url --permission="main" --add_url="$domain/musicbox_webclient"
+ynh_permission_url --permission="main" --add_url="$domain/local"
+
 #=================================================
 # RELOAD NGINX
 #=================================================

From 11c8f18f38b3a91c63f7a3cdbd44b1c409e5ab3b Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 22:45:08 +0200
Subject: [PATCH 58/64] avoid linter warning

---
 scripts/remove | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/remove b/scripts/remove
index 1b9bef9..c3ff50c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -74,7 +74,7 @@ ynh_remove_nginx_config
 
 if yunohost firewall list | grep -q "\- $mpd_port$"
 then
-	ynh_script_progression --message="Closing port $mpd_port..." --time --weight=1
+	ynh_script_progression --message="Closing port $mpd_port..." --weight=1
 	ynh_exec_warn_less yunohost firewall disallow TCP $mpd_port
 fi
 #=================================================

From 5f677f824ac5c9c791f49ac8e38e80a77ab6c2f7 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 22:52:10 +0200
Subject: [PATCH 59/64] avoid linter warning

---
 scripts/upgrade | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a9fb8da..c731d92 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -139,7 +139,11 @@ ynh_add_config --template="../conf/app.conf" --destination="$conf_file"
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log"
+if [ $mpd_port -ne 0 ]; then
+	yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log" --needs_exposed_ports=$mpd_port
+else
+	yunohost service add $app --description="Mopidy music server" --log="/var/log/$app/$app.log"
+fi
 
 #=================================================
 # START SYSTEMD SERVICE

From e6b84c2a869e292eabb529ef55f70d21e1ec4159 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Wed, 25 Aug 2021 23:16:53 +0200
Subject: [PATCH 60/64] test port

---
 scripts/restore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/restore b/scripts/restore
index c428d4d..69df99e 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -90,6 +90,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # OPEN PORT
 #=================================================
+ynh_script_progression --message="open port $mpd_port..." --weight=1
 
 if [ $mpd_port -ne 0 ]; then
 	ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $mpd_port

From ffcc6dd68664559b4f9209709f52532089de1bea Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Thu, 26 Aug 2021 00:22:11 +0200
Subject: [PATCH 61/64] MPD extension

---
 scripts/install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index aa424d3..53189b8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -65,13 +65,14 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 
 if [ $mpd_port -eq 1 ]; then
 	mpd_port=$(ynh_find_port --port=6600)
-	ynh_app_setting_set --app=$app --key=mpd_port --value=$mpd_port
 	ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $mpd_port
 	mpd_state="true"
 else
 	mpd_state="false"
 fi
 
+ynh_app_setting_set --app=$app --key=mpd_port --value=$mpd_port
+
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================

From 66d2d05b49829c0b25ac9ff8ba44325f9909a47a Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Thu, 26 Aug 2021 00:23:54 +0200
Subject: [PATCH 62/64] MPD extension

---
 scripts/restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/restore b/scripts/restore
index 69df99e..6c6cf8f 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -90,9 +90,9 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # OPEN PORT
 #=================================================
-ynh_script_progression --message="open port $mpd_port..." --weight=1
 
 if [ $mpd_port -ne 0 ]; then
+	ynh_script_progression --message="open MPD-port $mpd_port..." --weight=1
 	ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $mpd_port
 fi
 

From 9ae1fbb6e90a283354914c8c896eb120bf6daf78 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Thu, 26 Aug 2021 11:16:31 +0200
Subject: [PATCH 63/64] update Version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 30139a8..e8e6c0d 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 Mopidy - is an extensible music server. It plays music, podcasts and radio programs from local disk and various streaming services. You edit the playlist from any phone, tablet, or computer. You hear the music through the speakers connected to the server.
 
-**Shipped version:** 3.1.1
+**Shipped version:** 3.2.0
 
 ## Screenshots
 

From 1590e1ec8f938eb63dd52e60a8b8fb6da9caf3a8 Mon Sep 17 00:00:00 2001
From: siwinter <45730097+siwinter@users.noreply.github.com>
Date: Thu, 26 Aug 2021 11:18:04 +0200
Subject: [PATCH 64/64] update version

---
 README_fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_fr.md b/README_fr.md
index 012ad5c..6ba30ac 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Mopidy - est un serveur de musique extensible. Mopidy lit de la musique, des pod
 Vous pouvez modifier la liste de lecture à partir d'un téléphone, d'une tablette ou d'un ordinateur.
 Vous entendez la musique via les haut-parleurs connectés au serveur.
 
-**Version incluse :** 3.1.1
+**Version incluse :** 3.2.0
 
 ## Captures d'écran