From 4c37d8f27349b91770329cc59b1e1e0651652c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome.lebleu@mailoo.org>
Date: Thu, 1 Oct 2015 00:28:10 +0200
Subject: [PATCH] [fix] Do not process app backup script as hook

---
 lib/yunohost/app.py    |  6 +++--
 lib/yunohost/backup.py | 52 +++++++++++++++++++++++-------------------
 locales/en.json        |  1 +
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/lib/yunohost/app.py b/lib/yunohost/app.py
index d8b1b7b7a..ac8026668 100644
--- a/lib/yunohost/app.py
+++ b/lib/yunohost/app.py
@@ -351,7 +351,8 @@ def app_upgrade(auth, app=[], url=None, file=None):
                             for line in lines:
                                 sources.write(re.sub(r''+ original_app_id +'', app_id, line))
 
-        # Add hooks
+        # Clean hooks and add new ones
+        hook_remove(app_id)
         if 'hooks' in os.listdir(app_tmp_folder):
             for hook in os.listdir(app_tmp_folder +'/hooks'):
                 hook_add(app_id, app_tmp_folder +'/hooks/'+ hook)
@@ -451,7 +452,8 @@ def app_install(auth, app, label=None, args=None):
     os.makedirs(app_setting_path)
     os.system('touch %s/settings.yml' % app_setting_path)
 
-    # Add hooks
+    # Clean hooks and add new ones
+    hook_remove(app_id)
     if 'hooks' in os.listdir(app_tmp_folder):
         for file in os.listdir(app_tmp_folder +'/hooks'):
             hook_add(app_id, app_tmp_folder +'/hooks/'+ file)
diff --git a/lib/yunohost/backup.py b/lib/yunohost/backup.py
index 9106197bc..b294fea18 100644
--- a/lib/yunohost/backup.py
+++ b/lib/yunohost/backup.py
@@ -57,8 +57,7 @@ def backup_create(name=None, description=None, output_directory=None,
 
     """
     # TODO: Add a 'clean' argument to clean output directory
-    from yunohost.hook import hook_add
-    from yunohost.hook import hook_callback
+    from yunohost.hook import hook_callback, hook_exec
 
     tmp_dir = None
 
@@ -117,6 +116,10 @@ def backup_create(name=None, description=None, output_directory=None,
         else:
             os.system('chown -hR admin: %s' % tmp_dir)
 
+    # Run system hooks
+    msignals.display(m18n.n('backup_running_hooks'))
+    hook_callback('backup', hooks, args=[tmp_dir])
+
     # Initialize backup info
     info = {
         'description': description or '',
@@ -124,7 +127,7 @@ def backup_create(name=None, description=None, output_directory=None,
         'apps': {},
     }
 
-    # Add apps backup hook
+    # Backup apps
     if not ignore_apps:
         from yunohost.app import app_info
 
@@ -141,28 +144,28 @@ def backup_create(name=None, description=None, output_directory=None,
         else:
             apps_filtered = apps_list
 
-        try:
-            for app_id in apps_filtered:
-                hook = '/etc/yunohost/apps/%s/scripts/backup' % app_id
-                if os.path.isfile(hook):
-                    hook_add(app_id, hook)
+        # Run apps backup scripts
+        for app_id in apps_filtered:
+            script = '/etc/yunohost/apps/{:s}/scripts/backup'.format(app_id)
+            if not os.path.isfile(script):
+                logger.warning("backup script '%s' not found", script)
+                msignals.display(m18n.n('unbackup_app', app_id),
+                                 'warning')
+                continue
 
-                    # Add app info
-                    i = app_info(app_id)
-                    info['apps'][app_id] = {
-                        'version': i['version'],
-                    }
-                else:
-                    logger.warning("unable to find app's backup hook '%s'",
-                                   hook)
-                    msignals.display(m18n.n('unbackup_app', app_id),
-                                     'warning')
-        except IOError as e:
-            logger.info("unable to add apps backup hook: %s", str(e))
-
-    # Run hooks
-    msignals.display(m18n.n('backup_running_hooks'))
-    hook_callback('backup', hooks, args=[tmp_dir])
+            try:
+                msignals.display(m18n.n('backup_running_app_script', app_id))
+                hook_exec(script, args=[tmp_dir])
+            except:
+                logger.exception("error while executing script '%s'", script)
+                msignals.display(m18n.n('unbackup_app', app_id),
+                                 'error')
+            else:
+                # Add app info
+                i = app_info(app_id)
+                info['apps'][app_id] = {
+                    'version': i['version'],
+                }
 
     # Create backup info file
     with open("%s/info.json" % tmp_dir, 'w') as f:
@@ -367,6 +370,7 @@ def backup_info(name):
                          info_file)
         raise MoulinetteError(errno.EIO, m18n.n('backup_invalid_archive'))
 
+    # TODO: TAILLE!
     return {
         'path': archive_file,
         'created_at': time.strftime(m18n.n('format_datetime_short'),
diff --git a/locales/en.json b/locales/en.json
index 2d5ff8dd6..4006ff6ed 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -143,6 +143,7 @@
     "backup_output_directory_forbidden" : "Forbidden output directory",
     "backup_output_directory_not_empty" : "Output directory is not empty",
     "backup_running_hooks" : "Running backup hooks...",
+    "backup_running_app_script" : "Running backup script of app '{:s}'...",
     "backup_creating_archive" : "Creating the backup archive...",
     "backup_extracting_archive" : "Extracting the backup archive...",
     "backup_archive_open_failed" : "Unable to open the backup archive",