Changeset 40962 for branches/ipp-259_genericise_backups/tools/backups/svn_backup.py

Timestamp:

Oct 22, 2019, 2:30:49 PM (7 years ago)

Author:

fairlamb

Message:

fixed calling as main + tests, removed argsparse from most

File:

• branches/ipp-259_genericise_backups/tools/backups/svn_backup.py (modified) (4 diffs)

branches/ipp-259_genericise_backups/tools/backups/svn_backup.py

@@ -1 @@
-import argparse
 import os.path as path
 
-import backups.utils.config_parse_helper as cfg_help
-from backups.backup import Backup
-from backups.utils.config_parse_helper import ConfigSchema, ConfigSchemaSection, ConfigSchemaLine
+from utils.config_parse_helper import SpecialSchemaProcessing
+from backup import Backup
+from utils.config_parse_helper import ConfigSchema, ConfigSchemaSection, ConfigSchemaLine
 
 EXPECTED_CONFIG_FILE = path.join(path.dirname(__file__), './svn_backup.config')
@@ -11 +10 @@
     [ ConfigSchemaSection('DEFAULT',
         [ ConfigSchemaLine('backup_paths',   True,  list,
-            cfg_help.SpecialSchemaProcessing.commma_separated)
+            SpecialSchemaProcessing.commma_separated)
         , ConfigSchemaLine('source_machine', True,  str)
         , ConfigSchemaLine('verbose',        False, bool)
@@ -18 +17 @@
     , ConfigSchemaSection('COPY',
         [ ConfigSchemaLine('sources',         True,  list,
-            cfg_help.SpecialSchemaProcessing.commma_separated)
+            SpecialSchemaProcessing.commma_separated)
         , ConfigSchemaLine('additional_args', False, list,
-            cfg_help.SpecialSchemaProcessing.space_separated)
+            SpecialSchemaProcessing.space_separated)
         ])
     , ConfigSchemaSection('RSYNC',
         [ ConfigSchemaLine('sources', True, list,
-            cfg_help.SpecialSchemaProcessing.commma_separated)
+            SpecialSchemaProcessing.commma_separated)
         , ConfigSchemaLine('additional_args', False, list,
-            cfg_help.SpecialSchemaProcessing.space_separated)
+            SpecialSchemaProcessing.space_separated)
         ])
     ]
@@ -38 +37 @@
 
 
-def main():
-    sb = SvnBackup()
-    sb.run_backup()
-
-
-def parse_args(args):
-
-    parser = argparse.ArgumentParser(
-        description='Performs backup of svn.')
-
-    parser.add_argument('--config_file',
-        nargs='?',
-        help='specify the location of a config that matches the ConfigSchema',
-        default=EXPECTED_CONFIG_FILE)
-
-    return parser.parse_args()
+def main(config=EXPECTED_CONFIG_FILE, schema=SVN_SCHEMA):
+    sb = SvnBackup(config, schema)
+    sb.run_backup_processes()