Separate out backup code

Author: hillwithsmallfields

apps/makers_admin/views.py

@@ -12,11 +12,10 @@
 import model.makers_server
 import model.pages
 import model.person
-import os
+import model.times
 import pages.event_page
 import pages.person_page
 import re
-import subprocess
 import tempfile
 import uuid
 
@@ -365,34 +364,13 @@ def backup_database(django_request):
 
     params = django_request.GET
 
-    with tempfile.TemporaryDirectory() as tmpdirname:
-        backupname = "backup-"+model.times.timestring(model.times.now())
-        innerdirname = os.path.join(tmpdirname, backupname)
-        tarballname = backupname+".tgz"
-        tarballfilename = os.path.join(tmpdirname, tarballname)
-        for role in ['user', 'owner', 'trainer']:
-            eqtys = model.equipment_type.Equipment_type.list_equipment_types()
-            rows = []
-            for eqty in eqtys:
-                rows += eqty.backup_API_people(role)
-            with open(os.path.join(innerdirname, role+"s.csv"), 'w') as csv_stream:
-                writer = csv.DictWriter(role_stream,
-                                        ['Equipment', 'Name', 'Date', 'Trainer'],
-                                        extrasaction='ignore')
-                writer.writeheader()
-                for row in rows:
-                    writer.writerow(row)
-
-        subprocess.run(["tar",
-                        "cfz", tarballfilename,
-                        "--directory", tmpdirname,
-                        backupname])
-
-        with open(tarballfilename) as tarballfile:
-            page_data = model.pages.tarballpage(tarballname,
+    tarballfilename = model.backup_to_csv.make_database_backup()
+    with open(tarballfilename) as tarballfile:
+        page_data = model.pages.tarballpage(tarballname,
                                             tarballfile.read(),
                                             django_request=django_request)
-            return HttpResponse(str(page_data.to_string()))
+        os.remove(tarballfilename)
+        return HttpResponse(str(page_data.to_string()))
 
 @ensure_csrf_cookie
 def update_database(django_request):

model/backup_to_csv.py

@@ -0,0 +1,32 @@
+import csv
+import model.equipment_type
+import model.times
+import os
+import subprocess
+
+def make_database_backup(tarballfilename=None):
+    """Make a backup in tarball, and return its filename."""
+    with tempfile.TemporaryDirectory() as dirname:
+        backupname = "backup-"+model.times.timestring(model.times.now())
+        innerdirname = os.path.join(dirname, backupname)
+        if tarballfilename is None:
+            tarballfilename = os.path.join(dirname, backupname+".tgz")
+        for role in ['user', 'owner', 'trainer']:
+            eqtys = model.equipment_type.Equipment_type.list_equipment_types()
+            rows = []
+            for eqty in eqtys:
+                rows += eqty.backup_API_people(role)
+            with open(os.path.join(innerdirname, role+"s.csv"), 'w') as csv_stream:
+                writer = csv.DictWriter(role_stream,
+                                        ['Equipment', 'Name', 'Date', 'Trainer'],
+                                        extrasaction='ignore')
+                writer.writeheader()
+                for row in rows:
+                    writer.writerow(row)
+
+        subprocess.run(["tar",
+                        "cfz", tarballfilename,
+                        "--directory", dirname,
+                        backupname])
+
+        return tarballfilename

utils/exporter.py

@@ -7,6 +7,7 @@
 sys.path.append('model')
 sys.path.append(os.path.dirname(os.path.dirname(__file__)))
 
+import model.backup_to_csv
 from model.event import Event
 from model.person import Person
 from model.equipment_type import Equipment_type
@@ -33,6 +34,7 @@ def export_role(role, csv_file):
 def export_main(verbose=True):
     # todo: convert all dates to datetime.datetime as mentioned in http://api.mongodb.com/python/current/examples/datetimes.html
     parser = argparse.ArgumentParser()
+    parser.add_argument("-a", "--all", default=None)
     # parser.add_argument("-y", "--equipment-types", default=None)
     # parser.add_argument("-e", "--equipment", default=None)
     # parser.add_argument("-m", "--members", default=None)
@@ -52,6 +54,8 @@ def export0(args):
     if verbose:
         print("collection names are", collection_names)
     database.database_init(config)
+    if args.all:
+        model.backup_to_csv.make_database_backup(args.all)
     if args.users:
         export_role('user', args.users)