Skip to content

Added option to allow storing of additional metadata with sqlite inventory. #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theopsguy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added option to allow storing of additional metadata with sqlite inventory. #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions bakthat/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ def _exclude(filename):
@app.cmd_arg('-k', '--key', type=str, default=None, help="Custom key for periodic backups (works only with BakManager.io hook.)")
@app.cmd_arg('--exclude-file', type=str, default=None)
@app.cmd_arg('--s3-reduced-redundancy', action="store_true")
def backup(filename=os.getcwd(), destination=None, profile="default", config=CONFIG_FILE, prompt="yes", tags=[], key=None, exclude_file=None, s3_reduced_redundancy=False, **kwargs):
@app.cmd_arg('-m', '--metadata', type=str, help="Additional metadata information you may want stored for files.")
def backup(filename=os.getcwd(), destination=None, profile="default", config=CONFIG_FILE, prompt="yes", tags=[], key=None, exclude_file=None, s3_reduced_redundancy=False, metadata={}, **kwargs):
"""Perform backup.

:type filename: str
Expand Down Expand Up @@ -350,8 +351,16 @@ def backup(filename=os.getcwd(), destination=None, profile="default", config=CON

backup_data["tags"] = tags

backup_data["metadata"] = dict(is_enc=bakthat_encryption,
client=socket.gethostname())
if metadata:
# Append default metadata
metadata['is_enc'] = bakthat_encryption
metadata['client'] = socket.gethostname()

backup_data["metadata"] = metadata
else:
backup_data["metadata"] = dict(is_enc=bakthat_encryption, client=socket.gethostname())

stored_filename = os.path.join(os.path.dirname(kwargs.get("custom_filename", "")), stored_filename)
backup_data["stored_filename"] = stored_filename

access_key = storage_backend.conf.get("access_key")
Expand Down
2 changes: 2 additions & 0 deletions bakthat/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ def __init__(self, backup_name, **kwargs):
self.profile = kwargs.get("profile", "default")
self.conf = kwargs.get("conf", {})
self.tags = kwargs.get("tags", [])
self.metadata = kwargs.get("metadata", {})
# Key for bakmanager.io hook
self.key = kwargs.get("key", None)
self.syncer = None
Expand Down Expand Up @@ -268,6 +269,7 @@ def backup(self, filename=None, **kwargs):
profile=kwargs.get("profile", self.profile),
conf=kwargs.get("conf", self.conf),
key=kwargs.get("key", self.key),
metadata=kwargs.get("metadata", self.metadata),
custom_filename=self.backup_name)

def restore(self, filename, **kwargs):
Expand Down