mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-22 15:57:15 +00:00
Code Issues Releases Wiki Activity

implement --match-archives user:USERNAME host:HOSTNAME

Browse source
This commit is contained in:
Thomas Waldmann 2024-09-26 23:22:11 +02:00
parent d30fa6f28e
commit b8b05141ee
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/borg/manifest.py
View file

@ -33,7 +33,7 @@ class NoManifestError(Error):
exit_mcode = 26 exit_mcode = 26
ArchiveInfo = namedtuple("ArchiveInfo", "name id ts tags", defaults=[()]) ArchiveInfo = namedtuple("ArchiveInfo", "name id ts tags host user", defaults=[(), None, None])
# timestamp is a replacement for ts, archive is an alias for name (see SortBySpec) # timestamp is a replacement for ts, archive is an alias for name (see SortBySpec)
AI_HUMAN_SORT_KEYS = ["timestamp", "archive"] + list(ArchiveInfo._fields) AI_HUMAN_SORT_KEYS = ["timestamp", "archive"] + list(ArchiveInfo._fields)
@ -129,6 +129,8 @@ def _get_archive_meta(self, id: bytes) -> dict:
time="1970-01-01T00:00:00.000000", time="1970-01-01T00:00:00.000000",
# new: # new:
exists=False, # we have the pointer, but the repo does not have an archive item exists=False, # we have the pointer, but the repo does not have an archive item
username="",
hostname="",
tags=(), tags=(),
) )
else: else:
@ -161,7 +163,14 @@ def _infos(self):
def _info_tuples(self): def _info_tuples(self):
for info in self._infos(): for info in self._infos():
yield ArchiveInfo(name=info["name"], id=info["id"], ts=parse_timestamp(info["time"]), tags=info["tags"]) yield ArchiveInfo(
name=info["name"],
id=info["id"],
ts=parse_timestamp(info["time"]),
tags=info["tags"],
user=info["username"],
host=info["hostname"],
)
def _matching_info_tuples(self, match, match_end): def _matching_info_tuples(self, match, match_end):
archive_infos = self._info_tuples() archive_infos = self._info_tuples()
@ -176,6 +185,12 @@ def _matching_info_tuples(self, match, match_end):
wanted_tags = match.removeprefix("tags:") wanted_tags = match.removeprefix("tags:")
wanted_tags = [tag for tag in wanted_tags.split(",") if tag] # remove empty tags wanted_tags = [tag for tag in wanted_tags.split(",") if tag] # remove empty tags
archive_infos = [x for x in archive_infos if set(x.tags) >= set(wanted_tags)] archive_infos = [x for x in archive_infos if set(x.tags) >= set(wanted_tags)]
elif match.startswith("user:"):
wanted_user = match.removeprefix("user:")
archive_infos = [x for x in archive_infos if x.user == wanted_user]
elif match.startswith("host:"):
wanted_host = match.removeprefix("host:")
archive_infos = [x for x in archive_infos if x.host == wanted_host]
else: # do a match on the name else: # do a match on the name
regex = get_regex_from_pattern(match) regex = get_regex_from_pattern(match)
regex = re.compile(regex + match_end) regex = re.compile(regex + match_end)
@ -233,7 +248,12 @@ def _lookup_name(self, name, raw=False):
if not raw: if not raw:
ts = parse_timestamp(archive_info["time"]) ts = parse_timestamp(archive_info["time"])
return ArchiveInfo( return ArchiveInfo(
name=archive_info["name"], id=archive_info["id"], ts=ts, tags=archive_info["tags"] name=archive_info["name"],
id=archive_info["id"],
ts=ts,
tags=archive_info["tags"],
user=archive_info["username"],
host=archive_info["hostname"],
) )
else: else:
return archive_info return archive_info
@ -267,7 +287,12 @@ def get_by_id(self, id, raw=False):
if not raw: if not raw:
ts = parse_timestamp(archive_info["time"]) ts = parse_timestamp(archive_info["time"])
archive_info = ArchiveInfo( archive_info = ArchiveInfo(
name=archive_info["name"], id=archive_info["id"], ts=ts, tags=archive_info["tags"] name=archive_info["name"],
id=archive_info["id"],
ts=ts,
tags=archive_info["tags"],
user=archive_info["username"],
host=archive_info["hostname"],
) )
return archive_info return archive_info
else: else: