netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-09-14 17:04:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Allow IEC bytes units everywhere in config file

Browse source
This commit is contained in:
Orsiris de Jong 2024-02-05 19:30:35 +01:00
parent 99d8953c2b
commit 07571862f4
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
npbackup/configuration.py
View file

@ -394,7 +394,7 @@ def expand_units(object_config: dict, unexpand: bool = False) -> dict:
def _expand_units(key, value):
if key in ("minimum_backup_size_error", "exclude_files_larger_than", "upload_speed", "download_speed"):
if unexpand:
return BytesConverter(value).human
return BytesConverter(value).human_iec_bytes
return BytesConverter(value)
return value

2
npbackup/restic_metrics/__init__.py
View file

@ -225,7 +225,7 @@ def restic_json_to_prometheus(
backup_too_small = False
if minimum_backup_size_error:
if restic_json["data_added"] < int(BytesConverter(str(minimum_backup_size_error).replace(" ", ""))):
if restic_json["data_added"] < int(BytesConverter(str(minimum_backup_size_error).replace(" ", "")).human_iec_bytes):
backup_too_small = True
good_backup = restic_result and not backup_too_small

16
npbackup/restic_wrapper/__init__.py
View file

@ -7,8 +7,8 @@ __intname__ = "npbackup.restic_wrapper"
__author__ = "Orsiris de Jong"
__copyright__ = "Copyright (C) 2022-2024 NetInvent"
__license__ = "GPL-3.0-only"
__build__ = "2024010201"
__version__ = "2.0.0"
__build__ = "2024020501"
__version__ = "2.0.1"
from typing import Tuple, List, Optional, Callable, Union
@ -22,6 +22,7 @@ import dateutil.parser
import queue
from functools import wraps
from command_runner import command_runner
from ofunctions.misc import BytesConverter
from npbackup.__debug__ import _DEBUG
from npbackup.__env__ import FAST_COMMANDS_TIMEOUT, CHECK_INTERVAL
@ -369,9 +370,10 @@ class ResticRunner:
return self._limit_upload
@limit_upload.setter
def limit_upload(self, value: int):
def limit_upload(self, value: str):
try:
value = int(value)
# restic uses kbytes as upload speed unit
value = int(BytesConverter(value).kbytes)
if value > 0:
self._limit_upload = value
except TypeError:
@ -382,9 +384,10 @@ class ResticRunner:
return self._limit_download
@limit_download.setter
def limit_download(self, value: int):
def limit_download(self, value: str):
try:
value = int(value)
# restic uses kbytes as download speed unit
value = int(BytesConverter(value).kbytes)
if value > 0:
self._limit_download = value
except TypeError:
@ -767,6 +770,7 @@ class ResticRunner:
if exclude_caches:
cmd += " --exclude-caches"
if exclude_files_larger_than:
exclude_files_larger_than = BytesConverter(exclude_files_larger_than).bytes
cmd += f" --exclude-files-larger-than {exclude_files_larger_than}"
if one_file_system:
cmd += " --one-file-system"