Changeset 40962 for branches/ipp-259_genericise_backups/tools/backups/confluence_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/confluence_backup.py (modified) (3 diffs)

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

@@ -1 @@
-import argparse
 import datetime
 import glob
 import os.path as path
 
-import backups.utils.config_parse_helper as cfg_help
-import backups.utils.errors as errs
-import backups.utils.subprocess_utils as sub_utils
-from backups.backup import Backup
-from backups.utils.config_parse_helper import ConfigSchema, ConfigSchemaSection, ConfigSchemaLine
+import utils.config_parse_helper as cfg_help
+import utils.errors as errs
+import utils.subprocess_utils as sub_utils
+from backup import Backup
+from utils.config_parse_helper import ConfigSchema, ConfigSchemaSection, ConfigSchemaLine
 
 EXPECTED_CONFIG_FILE = path.join(path.dirname(__file__), './confluence_backup.config')
@@ -71 +70 @@
             source = self.copy_dict['sources'][0]
 
-            confluence_wildcard_search = f"{source}/{ConfluenceBackup.get_confluence_backup_date_format()}*"
+            confluence_wildcard_search = f"{source}/*{ConfluenceBackup.get_confluence_backup_date_format()}*"
             confluence_xml_filepaths = glob.glob(confluence_wildcard_search)
             if len(confluence_xml_filepaths) == 0:
@@ -92 +91 @@
 
 
-def main():
-    cb = ConfluenceBackup()
-    cb.run_backup()
-
-
-def parse_args(args):
-
-    parser = argparse.ArgumentParser(
-        description='Performs backup of confluence.')
-
-    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=CONFLUENCE_SCHEMA):
+    cb = ConfluenceBackup(config, schema)
+    cb.run_backup_processes()