Merge branch 'testing' into ci-auto-update-0.3.1

README.md

@@ -16,10 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Jellyfin Vue is the next step of Jellyfin's development.
+Jellyfin Vue is the next step of Jellyfin's development. It's a new frontend, based on Vue. See https://jellyfin.org/posts/vue-vue3 for details.
-It's a new frontend, based on Vue.
-
-See https://jellyfin.org/posts/vue-vue3 for details.
 
 
 **Shipped version:** 0.3.1~ynh1
@@ -30,7 +27,6 @@ See https://jellyfin.org/posts/vue-vue3 for details.
 
 ## Documentation and resources
 
-* Official app website: <https://github.com/jellyfin/jellyfin-vue>
 * Upstream app code repository: <https://github.com/jellyfin/jellyfin-vue>
 * Report a bug: <https://github.com/YunoHost-Apps/jellyfin-vue_ynh/issues>
 

README_fr.md

@@ -16,11 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-Jellyfin Vue est la prochaine étape du développement de Jellyfin.
+Jellyfin Vue est la prochaine étape du développement de Jellyfin. C'est une nouvelle interface, basée sur Vue. Des détails peuvent être trouvés ici : https://jellyfin.org/posts/vue-vue3.
-
-C'est une nouvelle interface, basée sur Vue.
-
-Des détails peuvent être trouvés ici : https://jellyfin.org/posts/vue-vue3.
 
 
 **Version incluse :** 0.3.1~ynh1
@@ -31,7 +27,6 @@ Des détails peuvent être trouvés ici : https://jellyfin.org/posts/vue-vue3.
 
 ## Documentations et ressources
 
-* Site officiel de l’app : <https://github.com/jellyfin/jellyfin-vue>
 * Dépôt de code officiel de l’app : <https://github.com/jellyfin/jellyfin-vue>
 * Signaler un bug : <https://github.com/YunoHost-Apps/jellyfin-vue_ynh/issues>
 

doc/DESCRIPTION.md

@@ -1,4 +1 @@
-Jellyfin Vue is the next step of Jellyfin's development.
+Jellyfin Vue is the next step of Jellyfin's development. It's a new frontend, based on Vue. See https://jellyfin.org/posts/vue-vue3 for details.
-It's a new frontend, based on Vue.
-
-See https://jellyfin.org/posts/vue-vue3 for details.

doc/DESCRIPTION_fr.md

@@ -1,5 +1 @@
-Jellyfin Vue est la prochaine étape du développement de Jellyfin.
+Jellyfin Vue est la prochaine étape du développement de Jellyfin. C'est une nouvelle interface, basée sur Vue. Des détails peuvent être trouvés ici : https://jellyfin.org/posts/vue-vue3.
-
-C'est une nouvelle interface, basée sur Vue.
-
-Des détails peuvent être trouvés ici : https://jellyfin.org/posts/vue-vue3.

manifest.toml

@@ -4,8 +4,8 @@ packaging_format = 2
 
 id = "jellyfin-vue"
 name = "Jellyfin Vue Client"
-description.en = "A modern web client for Jellyfin based on Vue."
+description.en = "Modern web client for Jellyfin"
-description.fr = "Un client web moderne pour Jellyfin basé sur Vue."
+description.fr = "Client web moderne pour Jellyfin"
 
 version = "0.3.1~ynh1"
 
@@ -14,14 +14,11 @@ maintainers = ["johndoe"]
 [upstream]
 license = "GPLv3"
 website = "https://github.com/jellyfin/jellyfin-vue"
-# admindoc = "https://yunohost.org/packaging_apps"
-# userdoc = "https://yunohost.org/apps"
 code = "https://github.com/jellyfin/jellyfin-vue"
-
 fund = "https://opencollective.com/jellyfin"
 
 [integration]
-yunohost = ">= 11.1.21"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
 ldap = true
@@ -32,38 +29,24 @@ ram.runtime = "0M"
 
 [install]
     [install.domain]
-    # this is a generic question - ask strings are automatically handled by YunoHost's core
     type = "domain"
 
     [install.path]
-    # this is a generic question - ask strings are automatically handled by YunoHost's core
     type = "path"
     default = "/jellyfin-vue"
 
     [install.init_main_permission]
-    # this is a generic question - ask strings are automatically handled by YunoHost's core
-    # This won't be saved as setting and will instead be used to initialize the SSOwat permission
     type = "group"
     default = "visitors"
 
 [resources]
-    # See the packaging documentation for the full set
-    # of explanation regarding the behavior and properties for each of those
 
     [resources.sources]
 
         [resources.sources.main]
-        # This will pre-fetch the asset which can then be deployed during the install/upgrade scripts with :
-        #    ynh_setup_source --dest_dir="$install_dir"
-        # You can also define other assets than "main" and add --source_id="foobar" in the previous command
         url = "https://github.com/jellyfin/jellyfin-vue/archive/refs/tags/0.3.1.tar.gz"
         sha256 = "49316b5f7ef57d09bfa31e5e461fac1866d03902f9b087d2c3ec5b294ed934f8"
 
-        # These infos are used by https://github.com/YunoHost/apps/blob/master/tools/autoupdate_app_sources/autoupdate_app_sources.py
-        # to auto-update the previous asset urls and sha256sum + manifest version
-        # assuming the upstream's code repo is on github and relies on tags or releases
-        # See the 'sources' resource documentation for more details
-
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]

scripts/restore

@@ -31,6 +31,15 @@ ynh_script_progression --message="Restoring system configurations related to $ap
 
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
+#=================================================
+ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
+
+ynh_systemd_action --service_name=nginx --action=reload
+
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/upgrade

@@ -48,6 +48,7 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$install_dir"
+	chown -R $app:www-data "$install_dir"
 
 	ynh_script_progression --message="Installing NodeJS..." --weight=20