auto_backup: allow to change the format of backup

auto_backup/models/db_backup.py

@@ -83,6 +83,13 @@ class DbBackup(models.Model):
              "read permissions for that file.",
     )
 
+    backup_format = fields.Selection(
+        [("dump.zip", "zip (includes filestore)"), ("dump", "pg_dump custom format (without filestore)")],
+        string="Backup Format",
+        default='dump.zip',
+        help="Choose the format for this backup."
+    )
+
     @api.model
     def _default_folder(self):
         """Default to ``backups`` folder inside current server datadir."""
@@ -131,11 +138,11 @@ def action_sftp_test_connection(self):
     def action_backup(self):
         """Run selected backups."""
         backup = None
-        filename = self.filename(datetime.now())
         successful = self.browse()
 
         # Start with local storage
         for rec in self.filtered(lambda r: r.method == "local"):
+            filename = self.filename(datetime.now(), ext=rec.backup_format)
             with rec.backup_log():
                 # Directory must exist
                 try:
@@ -151,21 +158,20 @@ def action_backup(self):
                             shutil.copyfileobj(cached, destiny)
                     # Generate new backup
                     else:
-                        db.dump_db(self.env.cr.dbname, destiny)
+                        db.dump_db(self.env.cr.dbname, destiny, backup_format=rec.backup_format)
                         backup = backup or destiny.name
                 successful |= rec
 
         # Ensure a local backup exists if we are going to write it remotely
         sftp = self.filtered(lambda r: r.method == "sftp")
         if sftp:
-            if backup:
-                cached = open(backup)
-            else:
-                cached = db.dump_db(self.env.cr.dbname, None)
+            for rec in sftp:
+                filename = self.filename(datetime.now(), ext=rec.backup_format)
+                with rec.backup_log():
+
+                    cached = db.dump_db(self.env.cr.dbname, None, backup_format=rec.backup_format)
 
-            with cached:
-                for rec in sftp:
-                    with rec.backup_log():
+                    with cached:
                         with rec.sftp_connection() as remote:
                             # Directory must exist
                             try:
@@ -255,13 +261,14 @@ def cleanup_log(self):
                 self.name)
 
     @staticmethod
-    def filename(when):
+    def filename(when, ext='dump.zip'):
         """Generate a file name for a backup.
 
         :param datetime.datetime when:
             Use this datetime instead of :meth:`datetime.datetime.now`.
+        :param str ext: Extension of the file. Default: dump.zip
         """
-        return "{:%Y_%m_%d_%H_%M_%S}.dump.zip".format(when)
+        return "{:%Y_%m_%d_%H_%M_%S}.{ext}".format(when, ext=ext)
 
     @api.multi
     def sftp_connection(self):

auto_backup/view/db_backup_view.xml

@@ -15,6 +15,7 @@
                     <field name="folder"/>
                     <field name="days_to_keep"/>
                     <field name="method"/>
+                    <field name="backup_format"/>
                 </group>
                 <div attrs="{'invisible': [('method', '!=', 'sftp')]}">
                     <div class="bg-warning text-warning">

docker-compose.yml

@@ -0,0 +1,29 @@
+version: '3'
+services:
+  odoo:
+    image: quay.io/numigi/odoo-base:11.12
+    volumes:
+      - odoo-web-data:/var/lib/odoo
+      - ./log:/var/log/odoo
+      - ./auto_backup:/mnt/extra-addons/auto_backup
+    ports:
+      - "127.0.0.1:8069:8069"
+      - "127.0.0.1:8071:8071"
+    depends_on:
+      - db
+    environment:
+      - LOG_ODOO=/var/log/odoo
+    command: odoo
+  db:
+    image: quay.io/numigi/postgres-odoo:11.1
+    environment:
+      - POSTGRES_PASSWORD=odoo
+      - POSTGRES_USER=odoo
+      - PGDATA=/var/lib/postgresql/data/pgdata
+    volumes:
+      - odoo-db-data:/var/lib/postgresql/data/pgdata
+    expose:
+      - 5432
+volumes:
+  odoo-web-data:
+  odoo-db-data: