Merge pull request #19 from YunoHost-Apps/testing

README.md

@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
 
 
-**Shipped version:** 4.0.4.1491~ynh1
+**Shipped version:** 4.0.4.1491~ynh2
 
 ## Screenshots
 

README_eu.md

@@ -19,7 +19,7 @@ EZ editatu eskuz.
 Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
 
 
-**Paketatutako bertsioa:** 4.0.4.1491~ynh1
+**Paketatutako bertsioa:** 4.0.4.1491~ynh2
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 Sonarr est un PVR pour les utilisateurs Usenet et BitTorrent. Il peut surveiller plusieurs flux RSS pour les nouveaux épisodes de vos émissions préférées et les récupérer, les trier et les renommer. Il peut également être configuré pour mettre à niveau automatiquement la qualité des fichiers déjà téléchargés lorsqu'un format de meilleure qualité devient disponible.
 
 
-**Version incluse :** 4.0.4.1491~ynh1
+**Version incluse :** 4.0.4.1491~ynh2
 
 ## Captures d’écran
 

README_gl.md

@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
 
 
-**Versión proporcionada:** 4.0.4.1491~ynh1
+**Versión proporcionada:** 4.0.4.1491~ynh2
 
 ## Capturas de pantalla
 

README_zh_Hans.md

@@ -3,7 +3,7 @@
 请勿手动编辑。
 -->
 
-# YunoHost 的 Sonarr
+# YunoHost 上的 Sonarr
 
 [![集成程度](https://dash.yunohost.org/integration/sonarr.svg)](https://dash.yunohost.org/appci/app/sonarr) ![工作状态](https://ci-apps.yunohost.org/ci/badges/sonarr.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/sonarr.maintain.svg)
 
@@ -19,7 +19,7 @@
 Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
 
 
-**分发版本：** 4.0.4.1491~ynh1
+**分发版本：** 4.0.4.1491~ynh2
 
 ## 截图
 

conf/nginx.conf

@@ -10,7 +10,7 @@ location __PATH__ {
   proxy_set_header Upgrade $http_upgrade;
   proxy_set_header Connection $http_connection;
   
-  # Allow the Radarr API
+  # Allow the Sonarr API
   location __PATH__/api {
     auth_request off;
     proxy_pass http://127.0.0.1:__PORT____PATH__/api;

doc/POST_UPGRADE.d/4.0.4.1491~ynh2.md

@@ -0,0 +1,2 @@
+Starting from 4.0.4.1491~ynh2, the data directory will be moved from the unusual (for a YunoHost package) `/var/lib/__APP__` to `/home/yunohost.app/__APP__`.
+Beware, if you have customized or hacked your app. Enjoy Sonarr!

manifest.toml

@@ -7,7 +7,7 @@ name = "Sonarr"
 description.en = "Series collection manager for Usenet and BitTorrent users"
 description.fr = "Gestionnaire de collection de séries pour utilisateurs de Usenet et BitTorrent"
 
-version = "4.0.4.1491~ynh1"
+version = "4.0.4.1491~ynh2"
 
 maintainers = ["tituspijean"]
 
@@ -57,7 +57,6 @@ ram.runtime = "50M"
     [resources.install_dir]
 
     [resources.data_dir]
-    dir = "/var/lib/__APP__"
 
     [resources.ports]
 

scripts/install

@@ -32,7 +32,7 @@ chown -R "$app:$app" "$install_dir"
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring Radarr..." --weight=2
+ynh_script_progression --message="Configuring Sonarr..." --weight=2
 
 mkdir -p "/var/log/$app"
 ln -s "/var/log/$app" "$data_dir/logs"

scripts/upgrade

@@ -23,6 +23,15 @@ ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd"
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
+# Fixes specific to packaging v2 migration
+if ynh_compare_current_package_version --comparison le --version 3.0.6.1196~ynh3
+then
+    # In packaging v1, final_path=/var/lib/$app but actually held the data. No data_dir was defined
+    # Upon migration, the core moves /var/lib/$app to /var/www/$app, so let's move it to the data_dir
+    ynh_print_warn --message="Fix manivest v2 migration: moving contents of $install_dir to $data_dir... (this may take a while)"
+    mv $install_dir/* $data_dir
+fi
+
 if [ ! -L "$data_dir/logs" ]; then
     ynh_secure_remove --file="$data_dir/logs"
     ln -s "/var/log/$app" "$data_dir/logs"

tests.toml

@@ -8,8 +8,11 @@ test_format = 1.0
     # Default args to use for install
     # -------------------------------
 
-    args.admin="john"
-
     # ------------
     # Tests to run
     # ------------
+
+    test_upgrade_from.768c1ce.name = "Upgrade from 3.0.6.1196~ynh3 (packaging v1)"
+    test_upgrade_from.768c1ce.args.domain = "domain.tld"
+    test_upgrade_from.768c1ce.args.path = "/sonarr"
+    test_upgrade_from.768c1ce.args.admin = "package_checker"