Merge lp:~unifield-team/unifield-wm/sync-odoo-task-9535 into lp:unifield-wm/sync

[jftempo]

[lp:~unifield-team/unifield-wm/sync-odoo-task-9535]

478. By Nicolas Seinlet (OpenERP) on 2014-10-13

no update on backup config

479. By Nicolas Seinlet (OpenERP) on 2014-10-14

[FIX] manual launch of a background job is a manual operation

=== modified file 'sync_client/__init__.py'
--- sync_client/__init__.py	2013-10-18 08:25:44 +0000
+++ sync_client/__init__.py	2014-10-14 12:49:38 +0000
@@ -1,4 +1,5 @@
 from sync_client import MAX_EXECUTED_UPDATES, MAX_EXECUTED_MESSAGES, SkipStep, BackgroundProcess, sync_process
+import backup
 import wizard
 import ir_model_data
 import monitor

=== modified file 'sync_client/__openerp__.py'
--- sync_client/__openerp__.py	2014-08-28 15:12:55 +0000
+++ sync_client/__openerp__.py	2014-10-14 12:49:38 +0000
@@ -33,6 +33,7 @@
     'init_xml': [],
     'data': [
         'sync_client_view.xml',
+        'backup_view.xml',
         'update_view.xml',
         'message_view.xml',
         'log_sale_purchase_view.xml',
@@ -41,6 +42,7 @@
         'wizard/view_entity_id.xml',
         'monitor_view.xml',
         'data/cron.xml',
+        'data/backupconfig.xml',
         'security/ir.model.access.csv'
     ],
     'demo_xml': [

=== added file 'sync_client/backup.py'
--- sync_client/backup.py	1970-01-01 00:00:00 +0000
+++ sync_client/backup.py	2014-10-14 12:49:38 +0000
@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 OpenERP s.a. (<http://odoo.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import os
+from osv import osv
+from osv import fields
+import tools
+from datetime import datetime
+from tools.translate import _
+
+class BackupConfig(osv.osv):
+    """ Backup configurations """
+    _name = "backup.config"
+    _description = "Backup configuration"
+    _pg_psw_env_var_is_set = False
+
+    _columns = {
+        'name' : fields.char('Path to backup to', size=254),
+        'beforemanualsync':fields.boolean('Backup before manual sync'),
+        'beforeautomaticsync':fields.boolean('Backup before automatic sync'),
+        'aftermanualsync':fields.boolean('Backup after manual sync'),
+        'afterautomaticsync':fields.boolean('Backup after automatic sync'),
+        'scheduledbackup':fields.boolean('Scheduled backup'),
+    }
+
+    _defaults = {
+        'name' : 'c:\\backup\\',
+        'beforemanualsync' : True,
+        'beforeautomaticsync' : True,
+        'aftermanualsync' : True,
+        'afterautomaticsync' : True,
+    }
+
+    def _set_pg_psw_env_var(self):
+        if os.name == 'nt' and not os.environ.get('PGPASSWORD', ''):
+            os.environ['PGPASSWORD'] = tools.config['db_password']
+            self._pg_psw_env_var_is_set = True
+
+    def _unset_pg_psw_env_var(self):
+        if os.name == 'nt' and self._pg_psw_env_var_is_set:
+            os.environ['PGPASSWORD'] = ''
+
+    def exp_dump_for_state(self, cr, uid, state, context=None):
+        context = context or {}
+        logger = context.get('logger')
+        bkp_ids = self.search(cr, uid, [(state, '=', True)], context=context)
+        if bkp_ids:
+            if logger:
+                logger.append("Database %s backup started.." % state)
+                logger.write()
+            self.exp_dump(cr, uid, bkp_ids, context)
+            if logger:
+                logger.append("Database %s backup successful" % state)
+                logger.write()
+
+    def exp_dump(self, cr, uid, ids, context=None):
+        bkp = self.browse(cr, uid, ids, context)
+        if bkp and bkp[0]:
+            bck = bkp[0]
+            self._set_pg_psw_env_var()
+
+            cmd = ['pg_dump', '--format=c', '--no-owner']
+            if tools.config['db_user']:
+                cmd.append('--username=' + tools.config['db_user'])
+            if tools.config['db_host']:
+                cmd.append('--host=' + tools.config['db_host'])
+            if tools.config['db_port']:
+                cmd.append('--port=' + str(tools.config['db_port']))
+            cmd.append(cr.dbname)
+
+            stdin, stdout = tools.exec_pg_command_pipe(*tuple(cmd))
+            stdin.close()
+            data = stdout.read()
+            res = stdout.close()
+            if res:
+                raise Exception, "Couldn't dump database"
+            self._unset_pg_psw_env_var()
+            outfile = os.path.join(bck.name, "%s-%s.dump" % (cr.dbname, datetime.now().strftime("%Y%m%d-%H%M%S")))
+            bkpfile = open(outfile,"wb")
+            bkpfile.write(data)
+            bkpfile.close()
+            return "Backup done"
+        raise Exception, "No backup defined"
+
+    def scheduled_backups(self, cr, uid, context=None):
+        bkp_ids = self.search(cr, uid, [('scheduledbackup', '=', True)], context=context)
+        if bkp_ids:
+            self.exp_dump(cr, uid, bkp_ids, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        toret = super(BackupConfig, self).write(cr, uid, ids, vals, context=context)
+        backups = self.browse(cr, uid, ids, context=context)
+        #if context:
+        #    for backup in backups:
+        #        if not os.path.isdir(backup.name):
+        #            raise osv.warning(_('Error'), _("The selected path doesn't exist!"))
+        if backups and backups[0]:
+            #Find the scheduled action
+            ircron_model = self.pool.get('ir.cron')
+            cron_ids = ircron_model.search(cr, uid, ([('name', '=', 'Automatic backup'), ('model', '=', 'backup.config'), '|', ('active', '=', True), ('active', '=', False)]), context=context)
+            crons = ircron_model.browse(cr, uid, cron_ids, context=context)
+            for cron in crons:
+                if cron.active != backups[0].scheduledbackup:
+                    ircron_model.write(cr, uid, [cron.id,], {'active': backups[0].scheduledbackup}, context=context)
+        return toret
+
+BackupConfig()
+
+class ir_cron(osv.osv):
+    _name = 'ir.cron'
+    _inherit = 'ir.cron'
+
+    def write(self, cr, uid, ids, vals, context=None):
+        toret = super(ir_cron, self).write(cr, uid, ids, vals, context=context)
+        crons = self.browse(cr, uid, ids, context=context)
+        if crons and crons[0] and crons[0].model=='backup.config':
+            #Find the scheduled action
+            bkp_model = self.pool.get('backup.config')
+            bkp_ids = bkp_model.search(cr, uid, (['|', ('scheduledbackup', '=', True), ('scheduledbackup', '=', False)]), context=context)
+            bkps = bkp_model.browse(cr, uid, bkp_ids, context=context)
+            for bkp in bkps:
+                if crons[0].active != bkp.scheduledbackup:
+                    bkp_model.write(cr, uid, [bkp.id,], {'scheduledbackup': crons[0].active}, context=context)
+        return toret
+
+ir_cron()

=== added file 'sync_client/backup_view.xml'
--- sync_client/backup_view.xml	1970-01-01 00:00:00 +0000
+++ sync_client/backup_view.xml	2014-10-14 12:49:38 +0000
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+  <data>
+    <record model="ir.ui.view" id="syncback_config_tree_view">
+      <field name="name">sync.backup.config.tree</field>
+      <field name="model">backup.config</field>
+      <field name="type">tree</field>
+      <field name="arch" type="xml">
+        <tree string="Backup Tree" hide_new_button="1" hide_delete_button="1" >
+          <field name="name"/>
+          <field name="beforemanualsync"/>
+          <field name="beforeautomaticsync"/>
+          <field name="aftermanualsync"/>
+          <field name="afterautomaticsync"/>
+          <field name="scheduledbackup"/>
+        </tree>
+      </field>
+    </record>
+
+    <record model="ir.ui.view" id="syncback_config_form_view">
+      <field name="name">sync.backup.config.form</field>
+      <field name="model">backup.config</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Backup configuration" hide_new_button="1" hide_delete_button="1" hide_duplicate_button="1">
+            <group col="6" colspan="6">
+            <field name="name"/>
+            </group>
+            <group col="4">
+            <field name="beforemanualsync"/>
+            <field name="beforeautomaticsync"/>
+            <field name="aftermanualsync"/>
+            <field name="afterautomaticsync"/>
+            <field name="scheduledbackup"/>
+            </group>
+            <button type="object" string="Backup" name="exp_dump" />
+        </form>
+      </field>
+    </record>
+
+        <record id="ir_actions_server_openbackupconfig" model="ir.actions.server">
+            <field name="code">
+res = obj.pool.get('ir.model.data').get_object_reference(cr, uid, 'sync_client', 'backup_config_default')
+action = {
+'res_model' : 'backup.config',
+'view_type' : 'form',
+'view_mode' : 'form,tree',
+'type': 'ir.actions.act_window',
+'res_id' : res[1],
+}</field>
+            <field eval="5" name="sequence"/>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_backup_config"/>
+            <field name="condition">True</field>
+            <field name="name">Open Backup config</field>
+        </record>
+
+
+        <record id="ir_ui_menu_backupconfig" model="ir.ui.menu">
+            <field name="name">Backup config</field>
+            <field name="parent_id" ref="syncback_menu"/>
+            <field name="sequence">25</field>
+        </record>
+
+        <record id="ir_values_menuitem_backupconfig" model="ir.values">
+            <field name="name">Menuitem backup config</field>
+            <field name="key2">tree_but_open</field>
+            <field eval="1" name="object"/>
+            <field name="value" eval="'ir.actions.server,%s' % ref('sync_client.ir_actions_server_openbackupconfig')" />
+            <field name="key">action</field>
+            <field name="model">ir.ui.menu</field>
+            <field eval="ref('ir_ui_menu_backupconfig')" name="res_id"/>
+        </record>
+
+
+
+        <record id="ir_actions_server_opensyncbackup" model="ir.actions.server">
+            <field name="code">
+res = obj.pool.get('ir.model.data').get_object_reference(cr, uid, 'sync_client', 'ir_cron_automaticsyncbackup')
+action = {
+'res_model' : 'ir.cron',
+'view_type' : 'form',
+'view_mode' : 'form',
+'type': 'ir.actions.act_window',
+'res_id' : res[1],
+}</field>
+            <field eval="5" name="sequence"/>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="base.model_ir_cron"/>
+            <field name="condition">True</field>
+            <field name="name">Open Backup cron</field>
+        </record>
+
+
+        <record id="ir_ui_menu_cron_synchrobackup" model="ir.ui.menu">
+            <field name="name">Automatic</field>
+            <field name="parent_id" ref="syncback_menu"/>
+            <field name="sequence">30</field>
+        </record>
+
+        <record id="ir_values_menuitem_cronbackup" model="ir.values">
+            <field name="name">Menuitem IR CRON</field>
+            <field name="key2">tree_but_open</field>
+            <field eval="1" name="object"/>
+            <field name="value" eval="'ir.actions.server,%s' % ref('ir_actions_server_opensyncbackup')" />
+            <field name="key">action</field>
+            <field name="model">ir.ui.menu</field>
+            <field eval="ref('ir_ui_menu_cron_synchrobackup')" name="res_id"/>
+        </record>
+    </data>
+</openerp>

=== added file 'sync_client/data/backupconfig.xml'
--- sync_client/data/backupconfig.xml	1970-01-01 00:00:00 +0000
+++ sync_client/data/backupconfig.xml	2014-10-14 12:49:38 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+		<record id="backup_config_default" model="backup.config">
+			<field name="name">c:\backup\</field>
+			<field eval="True" name="beforemanualsync"/>
+			<field eval="True" name="beforeautomaticsync"/>
+			<field eval="True" name="aftermanualsync"/>
+			<field eval="True" name="afterautomaticsync"/>
+            <field eval="True" name="scheduledbackup"/>
+		</record>
+	</data>
+</openerp>

=== modified file 'sync_client/data/cron.xml'
--- sync_client/data/cron.xml	2013-05-16 14:00:59 +0000
+++ sync_client/data/cron.xml	2014-10-14 12:49:38 +0000
@@ -15,5 +15,19 @@
 			<field name="model">sync.client.entity</field>
 		</record>
 
+        <record id="ir_cron_automaticsyncbackup" model="ir.cron">
+            <field name="function">scheduled_backups</field>
+            <field name="user_id">1</field>
+            <field name="name">Automatic backup</field>
+            <field name="interval_type">days</field>
+            <field eval="-1" name="numbercall"/>
+            <field eval="5" name="priority"/>
+            <field eval="0" name="doall"/>
+            <field eval="0" name="active"/>
+            <field eval="1" name="interval_number"/>
+            <field name="model">backup.config</field>
+            <field name="active">1</field>
+        </record>
+
 	</data>
 </openerp>

=== modified file 'sync_client/security/ir.model.access.csv'
--- sync_client/security/ir.model.access.csv	2013-10-18 08:25:44 +0000
+++ sync_client/security/ir.model.access.csv	2014-10-14 12:49:38 +0000
@@ -10,3 +10,4 @@
 "sync_read_sync_server_connection_id","sync_read_sync_server_connection","sync.client.sync_server_connection","True","","","","sync_common.sync_read_group"
 "sync_read_monitor_id","sync_read_monitor","sync.monitor","True","","","","sync_common.sync_read_group"
 "sync_read_log_sale_purchase_id","sync_read_log_sale_purchase","sync.client.log_sale_purchase","True","","","","sync_common.sync_read_group"
+"sync_backup","sync_backup","backup.config","True","True","True","True",""

=== modified file 'sync_client/sync_client.py'
--- sync_client/sync_client.py	2014-09-29 15:42:01 +0000
+++ sync_client/sync_client.py	2014-10-14 12:49:38 +0000
@@ -787,7 +787,13 @@
     """
     def sync_threaded(self, cr, uid, recover=False, context=None):
         BackgroundProcess(cr, uid,
-            ('sync_recover' if recover else 'sync'),
+            ('sync_recover_withbackup' if recover else 'sync_withbackup'),
+            context).start()
+        return True
+
+    def sync_manual_threaded(self, cr, uid, recover=False, context=None):
+        BackgroundProcess(cr, uid,
+            ('sync_manual_recover_withbackup' if recover else 'sync_manual_withbackup'),
             context).start()
         return True
 
@@ -804,6 +810,30 @@
         return True
 
     @sync_process()
+    def sync_recover_withbackup(self, cr, uid, context=None):
+        """
+        Call both pull_all_data and recover_message functions - used in manual sync wizard
+        """
+        #Check for a backup before automatic sync
+        self.pool.get('backup.config').exp_dump_for_state(cr, uid, 'beforeautomaticsync', context=context)
+        self.sync_recover(cr, uid, context=context)
+        #Check for a backup after automatic sync
+        self.pool.get('backup.config').exp_dump_for_state(cr, uid, 'afterautomaticsync', context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+    @sync_process()
+    def sync_manual_recover_withbackup(self, cr, uid, context=None):
+        """
+        Call both pull_all_data and recover_message functions - used in manual sync wizard
+        """
+        #Check for a backup before automatic sync
+        self.pool.get('backup.config').exp_dump_for_state(cr, uid, 'beforemanualsync', context=context)
+        self.sync_recover(cr, uid, context=context)
+        #Check for a backup after automatic sync
+        self.pool.get('backup.config').exp_dump_for_state(cr, uid, 'aftermanualsync', context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+    @sync_process()
     def sync(self, cr, uid, context=None):
         self._logger.info("Start synchronization")
         self.pull_update(cr, uid, context=context)
@@ -813,6 +843,30 @@
         self._logger.info("Synchronization succesfully done")
         return True
 
+    @sync_process()
+    def sync_withbackup(self, cr, uid, context=None):
+        """
+        Call both pull_all_data and recover_message functions - used in manual sync wizard
+        """
+        #Check for a backup before automatic sync
+        self.pool.get('backup.config').exp_dump_for_state(cr, uid, 'beforeautomaticsync', context=context)
+        self.sync(cr, uid, context=context)
+        #Check for a backup after automatic sync
+        self.pool.get('backup.config').exp_dump_for_state(cr, uid, 'afterautomaticsync', context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+    @sync_process()
+    def sync_manual_withbackup(self, cr, uid, context=None):
+        """
+        Call both pull_all_data and recover_message functions - used in manual sync wizard
+        """
+        #Check for a backup before automatic sync
+        self.pool.get('backup.config').exp_dump_for_state(cr, uid, 'beforemanualsync', context=context)
+        self.sync(cr, uid, context=context)
+        #Check for a backup after automatic sync
+        self.pool.get('backup.config').exp_dump_for_state(cr, uid, 'aftermanualsync', context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
     def get_upgrade_status(self, cr, uid, context=None):
         return ""
 

=== modified file 'sync_client/sync_client_view.xml'
--- sync_client/sync_client_view.xml	2013-05-28 09:34:10 +0000
+++ sync_client/sync_client_view.xml	2014-10-14 12:49:38 +0000
@@ -53,8 +53,8 @@
             <field name="context">{}</field>
         </record>
 
-        <menuitem id="main_menu" 
-        		 name="Synchronization" 
+        <menuitem id="main_menu"
+        		 name="Synchronization"
         		 parent=""
                  web_icon="images/sync.jpg"
                  web_icon_hover="images/sync-hover.jpg"
@@ -66,6 +66,8 @@
 
         <menuitem id="mon_menu" name="Monitoring" parent="main_menu" sequence="30"/>
 
+        <menuitem id="syncback_menu" name="Backup" parent="main_menu" sequence="25"/>
+
         <menuitem id="connection_manager_menu" name="Connection Manager" parent="reg_menu"
                 action="connection_manager_action"/>
 

=== modified file 'sync_client/wizard/sync_manager.py'
--- sync_client/wizard/sync_manager.py	2013-02-22 15:25:34 +0000
+++ sync_client/wizard/sync_manager.py	2014-10-14 12:49:38 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
+from sync_client import sync_client
 
 class sync_manager(osv.osv_memory):
     _name = 'sync.client.sync_manager'
@@ -43,13 +44,17 @@
     }
 
     def sync(self, cr, uid, ids, context=None):
-        self.pool.get('sync.client.entity').sync(cr, uid, context=context)
+        self.pool.get('sync.client.entity').sync_manual_withbackup(cr, uid, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
     def sync_threaded(self, cr, uid, ids, context=None):
         self.pool.get('sync.client.entity').sync_threaded(cr, uid, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
+    def sync_manual_threaded(self, cr, uid, ids, context=None):
+        self.pool.get('sync.client.entity').sync_manual_threaded(cr, uid, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
     def pull_data(self, cr, uid, ids, context=None):
         self.pool.get('sync.client.entity').pull_update(cr, uid, recover=False, context=context)
         return {'type': 'ir.actions.act_window_close'}

=== modified file 'sync_client/wizard/sync_wiz_view.xml'
--- sync_client/wizard/sync_wiz_view.xml	2013-01-25 16:07:17 +0000
+++ sync_client/wizard/sync_wiz_view.xml	2014-10-14 12:49:38 +0000
@@ -158,8 +158,8 @@
 	                        <button type="object" string="Resume All Synchronization Process" name="sync" attrs="{'invisible' : [('state', 'in', ['init', 'corrupted'])]}"/>
 	                    </group>
 	                    <group col="2" colspan="3">
-	                        <button type="object" string="Start All Synchronization In Background" name="sync_threaded" states="init"/>
-	                        <button type="object" string="Resume All Synchronization In Background" name="sync_threaded" attrs="{'invisible' : [('state', 'in', ['init', 'corrupted'])]}"/>
+	                        <button type="object" string="Start All Synchronization In Background" name="sync_manual_threaded" states="init"/>
+	                        <button type="object" string="Resume All Synchronization In Background" name="sync_manual_threaded" attrs="{'invisible' : [('state', 'in', ['init', 'corrupted'])]}"/>
 	                    </group>
 	                </group>
                     <separator string="Debug" colspan="4"/>
@@ -236,4 +236,3 @@
 <!--
     vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 -->
-