Merge pull request #650 from YunoHost/app_upgrade_message_ux

[enh] Improve / add some messages to improve UX

locales/en.json

@@ -24,7 +24,8 @@
     "app_location_install_failed": "Unable to install the app in this location because it conflit with the app '{other_app}' already installed on '{other_path}'",
     "app_location_unavailable": "This url is not available or conflicts with the already installed app(s):\n{apps:s}",
     "app_manifest_invalid": "Invalid app manifest: {error}",
-    "app_no_upgrade": "No app to upgrade",
+    "app_no_upgrade": "No apps to upgrade",
+    "app_not_upgraded": "The following apps were not upgraded: {apps}",
     "app_not_correctly_installed": "{app:s} seems to be incorrectly installed",
     "app_not_installed": "{app:s} is not installed",
     "app_not_properly_removed": "{app:s} has not been properly removed",
@@ -34,9 +35,14 @@
     "app_requirements_failed": "Unable to meet requirements for {app}: {error}",
     "app_requirements_unmeet": "Requirements are not met for {app}, the package {pkgname} ({version}) must be {spec}",
     "app_sources_fetch_failed": "Unable to fetch sources files",
+    "app_start_install": "Installing application {app}…",
+    "app_start_remove": "Removing application {app}…",
+    "app_start_backup": "Collecting files to be backuped for {app}…",
+    "app_start_restore": "Restoring application {app}…",
     "app_unknown": "Unknown app",
     "app_unsupported_remote_type": "Unsupported remote type used for the app",
-    "app_upgrade_app_name": "Upgrading app {app}…",
+    "app_upgrade_several_apps": "The following apps will be upgraded : {apps}",
+    "app_upgrade_app_name": "Now upgrading app {app}…",
     "app_upgrade_failed": "Unable to upgrade {app:s}",
     "app_upgrade_some_app_failed": "Unable to upgrade some applications",
     "app_upgraded": "{app:s} has been upgraded",
@@ -63,6 +69,7 @@
     "ask_path": "Path",
     "backup_abstract_method": "This backup method hasn't yet been implemented",
     "backup_action_required": "You must specify something to save",
+    "backup_actually_backuping": "Now creating a backup archive from the files collected…",
     "backup_app_failed": "Unable to back up the app '{app:s}'",
     "backup_applying_method_borg": "Sending all files to backup into borg-backup repository…",
     "backup_applying_method_copy": "Copying all files to backup…",
@@ -99,6 +106,7 @@
     "backup_method_copy_finished": "Backup copy finished",
     "backup_method_custom_finished": "Custom backup method '{method:s}' finished",
     "backup_method_tar_finished": "Backup tar archive created",
+    "backup_mount_archive_for_restore": "Preparing archive for restoration…",
     "backup_no_uncompress_archive_dir": "Uncompress archive directory doesn't exist",
     "backup_nothings_done": "There is nothing to save",
     "backup_output_directory_forbidden": "Forbidden output directory. Backups can't be created in /bin, /boot, /dev, /etc, /lib, /root, /run, /sbin, /sys, /usr, /var or /home/yunohost.backup/archives sub-folders",
@@ -106,7 +114,6 @@
     "backup_output_directory_required": "You must provide an output directory for the backup",
     "backup_output_symlink_dir_broken": "You have a broken symlink instead of your archives directory '{path:s}'. You may have a specific setup to backup your data on an other filesystem, in this case you probably forgot to remount or plug your hard dirve or usb key.",
     "backup_php5_to_php7_migration_may_fail": "Could not convert your archive to support php7, your php apps may fail to restore (reason: {error:s})",
-    "backup_running_app_script": "Running backup script of app '{app:s}'…",
     "backup_running_hooks": "Running backup hooks…",
     "backup_system_part_failed": "Unable to backup the '{part:s}' system part",
     "backup_unable_to_organize_files": "Unable to organize files in the archive with the quick method",

src/yunohost/app.py

@@ -577,7 +577,7 @@ def app_upgrade(auth, app=[], url=None, file=None):
     except YunohostError:
         raise YunohostError('app_no_upgrade')
 
-    upgraded_apps = []
+    not_upgraded_apps = []
 
     apps = app
     user_specified_list = True
@@ -589,7 +589,13 @@ def app_upgrade(auth, app=[], url=None, file=None):
     elif not isinstance(app, list):
         apps = [app]
 
-    logger.info("Upgrading apps %s", ", ".join(app))
+    # Remove possible duplicates
+    apps = [app for i,app in enumerate(apps) if apps not in L[:i]]
+
+    if len(apps) == 0:
+        raise YunohostError('app_no_upgrade')
+    if len(apps) > 1:
+        logger.info(m18n.n("app_upgrade_several_apps", apps=", ".join(app)))
 
     for app_instance_name in apps:
         logger.info(m18n.n('app_upgrade_app_name', app=app_instance_name))
@@ -597,9 +603,6 @@ def app_upgrade(auth, app=[], url=None, file=None):
         if not installed:
             raise YunohostError('app_not_installed', app=app_instance_name)
 
-        if app_instance_name in upgraded_apps:
-            continue
-
         app_dict = app_info(app_instance_name, raw=True)
 
         if file:
@@ -651,6 +654,7 @@ def app_upgrade(auth, app=[], url=None, file=None):
         if hook_exec(extracted_app_folder + '/scripts/upgrade',
                      args=args_list, env=env_dict) != 0:
             msg = m18n.n('app_upgrade_failed', app=app_instance_name)
+            not_upgraded_apps.append(app_instance_name)
             logger.error(msg)
             operation_logger.error(msg)
         else:
@@ -678,14 +682,13 @@ def app_upgrade(auth, app=[], url=None, file=None):
                     os.system('cp -R %s/%s %s' % (extracted_app_folder, file_to_copy, app_setting_path))
 
             # So much win
-            upgraded_apps.append(app_instance_name)
             logger.success(m18n.n('app_upgraded', app=app_instance_name))
 
             hook_callback('post_app_upgrade', args=args_list, env=env_dict)
             operation_logger.success()
 
-    if not upgraded_apps:
-        raise YunohostError('app_no_upgrade')
+    if not_upgraded_apps:
+        raise YunohostError('app_not_upgraded', apps=', '.join(not_upgraded_apps))
 
     app_ssowatconf(auth)
 
@@ -801,6 +804,8 @@ def app_install(operation_logger, auth, app, label=None, args=None, no_remove_on
     operation_logger.related_to.append(("app", app_id))
     operation_logger.start()
 
+    logger.info(m18n.n("app_start_install", app=app_id))
+
     # Create app directory
     app_setting_path = os.path.join(APPS_SETTING_PATH, app_instance_name)
     if os.path.exists(app_setting_path):
@@ -921,6 +926,8 @@ def app_remove(operation_logger, auth, app):
 
     operation_logger.start()
 
+    logger.info(m18n.n("app_start_remove", app=app))
+
     app_setting_path = APPS_SETTING_PATH + app
 
     # TODO: display fail messages from script

src/yunohost/backup.py

@@ -668,7 +668,7 @@ class BackupManager():
         tmp_app_bkp_dir = env_dict["YNH_APP_BACKUP_DIR"]
         settings_dir = os.path.join(self.work_dir, 'apps', app, 'settings')
 
-        logger.debug(m18n.n('backup_running_app_script', app=app))
+        logger.info(m18n.n("app_start_backup", app=app))
         try:
             # Prepare backup directory for the app
             filesystem.mkdir(tmp_app_bkp_dir, 0o750, True, uid='admin')
@@ -1242,6 +1242,8 @@ class RestoreManager():
         operation_logger = OperationLogger('backup_restore_app', related_to)
         operation_logger.start()
 
+        logger.info(m18n.n("app_start_restore", app=app_instance_name))
+
         # Check if the app is not already installed
         if _is_installed(app_instance_name):
             logger.error(m18n.n('restore_already_installed_app',
@@ -2060,6 +2062,7 @@ def backup_create(name=None, description=None, methods=[],
     backup_manager.collect_files()
 
     # Apply backup methods on prepared files
+    logger.info(m18n.n("backup_actually_backuping"))
     backup_manager.backup()
 
     logger.success(m18n.n('backup_created'))
@@ -2128,6 +2131,7 @@ def backup_restore(auth, name, system=[], apps=[], force=False):
     # Mount the archive then call the restore for each system part / app    #
     #
 
+    logger.info(m18n.n("backup_mount_archive_for_restore"))
     restore_manager.mount()
     restore_manager.restore()