netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-11-09 21:51:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

WIP Refactor main gui to new config format

Browse source
This commit is contained in:
Orsiris de Jong 2023-12-11 16:11:22 +01:00
parent 17967bc77c
commit 49fbdceae5
2 changed files with 56 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
npbackup/core/runner.py
View file

@ -476,16 +476,16 @@ class NPBackupRunner:
exclude_patterns_case_ignore = self.repo_config.g("backup_opts.exclude_patterns_case_ignore") exclude_patterns_case_ignore = self.repo_config.g("backup_opts.exclude_patterns_case_ignore")
exclude_caches = self.repo_config.g("backup_opts.exclude_caches") exclude_caches = self.repo_config.g("backup_opts.exclude_caches")
one_file_system = self.config.g("backup_opts.one_file_system") if os.name != 'nt' else False one_file_system = self.repo_config.g("backup_opts.one_file_system") if os.name != 'nt' else False
use_fs_snapshot = self.config.g("backup_opts.use_fs_snapshot") use_fs_snapshot = self.repo_config.g("backup_opts.use_fs_snapshot")
pre_exec_commands = self.config.g("backup_opts.pre_exec_commands") pre_exec_commands = self.repo_config.g("backup_opts.pre_exec_commands")
pre_exec_per_command_timeout = self.config.g("backup_opts.pre_exec_per_command_timeout") pre_exec_per_command_timeout = self.repo_config.g("backup_opts.pre_exec_per_command_timeout")
pre_exec_failure_is_fatal = self.config.g("backup_opts.pre_exec_failure_is_fatal") pre_exec_failure_is_fatal = self.repo_config.g("backup_opts.pre_exec_failure_is_fatal")
post_exec_commands = self.config.g("backup_opts.post_exec_commands") post_exec_commands = self.repo_config.g("backup_opts.post_exec_commands")
post_exec_per_command_timeout = self.config.g("backup_opts.post_exec_per_command_timeout") post_exec_per_command_timeout = self.repo_config.g("backup_opts.post_exec_per_command_timeout")
post_exec_failure_is_fatal = self.config.g("backup_opts.post_exec_failure_is_fatal") post_exec_failure_is_fatal = self.repo_config.g("backup_opts.post_exec_failure_is_fatal")
# Make sure we convert tag to list if only one tag is given # Make sure we convert tag to list if only one tag is given
try: try:

82
npbackup/gui/__main__.py
View file

@ -25,6 +25,7 @@ import _tkinter
from ofunctions.threading import threaded, Future from ofunctions.threading import threaded, Future
from threading import Thread from threading import Thread
from ofunctions.misc import BytesConverter from ofunctions.misc import BytesConverter
import npbackup.configuration
from npbackup.customization import ( from npbackup.customization import (
OEM_STRING, OEM_STRING,
OEM_LOGO, OEM_LOGO,
@ -45,9 +46,9 @@ from npbackup.gui.helpers import get_anon_repo_uri
from npbackup.core.runner import NPBackupRunner from npbackup.core.runner import NPBackupRunner
from npbackup.core.i18n_helper import _t from npbackup.core.i18n_helper import _t
from npbackup.core.upgrade_runner import run_upgrade, check_new_version from npbackup.core.upgrade_runner import run_upgrade, check_new_version
from npbackup.path_helper import CURRENT_DIR
from npbackup.interface_entrypoint import entrypoint from npbackup.interface_entrypoint import entrypoint
from npbackup.__version__ import __intname__ as intname, __version__, __build__, __copyright__ from npbackup.__version__ import __intname__ as intname, __version__, __build__, __copyright__
from npbackup.gui.config import config_gui from npbackup.gui.config import config_gui
from npbackup.gui.operations import operations_gui from npbackup.gui.operations import operations_gui
from npbackup.customization import ( from npbackup.customization import (
@ -65,10 +66,10 @@ logger = getLogger()
THREAD_SHARED_DICT = {} THREAD_SHARED_DICT = {}
def _about_gui(version_string: str, config_dict: dict) -> None: def _about_gui(version_string: str, repo_config: dict) -> None:
license_content = LICENSE_TEXT license_content = LICENSE_TEXT
result = check_new_version(config_dict) result = check_new_version(repo_config)
if result: if result:
new_version = [ new_version = [
sg.Button( sg.Button(
@ -113,7 +114,7 @@ def _about_gui(version_string: str, config_dict: dict) -> None:
) )
if result == "OK": if result == "OK":
logger.info("Running GUI initiated upgrade") logger.info("Running GUI initiated upgrade")
sub_result = run_upgrade(config_dict) sub_result = run_upgrade(repo_config)
if sub_result: if sub_result:
sys.exit(0) sys.exit(0)
else: else:
@ -122,8 +123,8 @@ def _about_gui(version_string: str, config_dict: dict) -> None:
@threaded @threaded
def _get_gui_data(config_dict: dict) -> Future: def _get_gui_data(repo_config: dict) -> Future:
runner = NPBackupRunner(config_dict=config_dict) runner = NPBackupRunner(repo_config=repo_config)
snapshots = runner.list() snapshots = runner.list()
current_state, backup_tz = runner.check_recent_backups() current_state, backup_tz = runner.check_recent_backups()
snapshot_list = [] snapshot_list = []
@ -153,11 +154,12 @@ def _get_gui_data(config_dict: dict) -> Future:
return current_state, backup_tz, snapshot_list return current_state, backup_tz, snapshot_list
def get_gui_data(config_dict: dict) -> Tuple[bool, List[str]]: def get_gui_data(repo_config: dict) -> Tuple[bool, List[str]]:
try: try:
if ( if (
not config_dict["repo"]["repository"] not repo_config.g("repo_uri")
and not config_dict["repo"]["password"] and (not repo_config.g("repo_opts.repo_password")
and not repo_config.g("repo_opts.repo_password_command"))
): ):
sg.Popup(_t("main_gui.repository_not_configured")) sg.Popup(_t("main_gui.repository_not_configured"))
return None, None return None, None
@ -165,7 +167,7 @@ def get_gui_data(config_dict: dict) -> Tuple[bool, List[str]]:
sg.Popup(_t("main_gui.repository_not_configured")) sg.Popup(_t("main_gui.repository_not_configured"))
return None, None return None, None
try: try:
runner = NPBackupRunner(config_dict=config_dict) runner = NPBackupRunner(repo_config=repo_config)
except ValueError: except ValueError:
sg.Popup(_t("config_gui.no_runner")) sg.Popup(_t("config_gui.no_runner"))
return None, None return None, None
@ -177,7 +179,7 @@ def get_gui_data(config_dict: dict) -> Tuple[bool, List[str]]:
return None, None return None, None
# We get a thread result, hence pylint will complain the thread isn't a tuple # We get a thread result, hence pylint will complain the thread isn't a tuple
# pylint: disable=E1101 (no-member) # pylint: disable=E1101 (no-member)
thread = _get_gui_data(config_dict) thread = _get_gui_data(repo_config)
while not thread.done() and not thread.cancelled(): while not thread.done() and not thread.cancelled():
sg.PopupAnimated( sg.PopupAnimated(
LOADER_ANIMATION, LOADER_ANIMATION,
@ -274,15 +276,15 @@ def _make_treedata_from_json(ls_result: List[dict]) -> sg.TreeData:
@threaded @threaded
def _forget_snapshot(config: dict, snapshot_id: str) -> Future: def _forget_snapshot(repo_config: dict, snapshot_id: str) -> Future:
runner = NPBackupRunner(config_dict=config) runner = NPBackupRunner(repo_config=repo_config)
result = runner.forget(snapshot=snapshot_id) result = runner.forget(snapshot=snapshot_id)
return result return result
@threaded @threaded
def _ls_window(config: dict, snapshot_id: str) -> Future: def _ls_window(repo_config: dict, snapshot_id: str) -> Future:
runner = NPBackupRunner(config_dict=config) runner = NPBackupRunner(repo_config=repo_config)
result = runner.ls(snapshot=snapshot_id) result = runner.ls(snapshot=snapshot_id)
if not result: if not result:
return result, None return result, None
@ -446,9 +448,9 @@ def ls_window(config: dict, snapshot_id: str) -> bool:
@threaded @threaded
def _restore_window( def _restore_window(
config_dict: dict, snapshot: str, target: str, restore_includes: Optional[List] repo_config: dict, snapshot: str, target: str, restore_includes: Optional[List]
) -> Future: ) -> Future:
runner = NPBackupRunner(config_dict=config_dict) runner = NPBackupRunner(repo_config=repo_config)
runner.verbose = True runner.verbose = True
result = runner.restore(snapshot, target, restore_includes) result = runner.restore(snapshot, target, restore_includes)
THREAD_SHARED_DICT["exec_time"] = runner.exec_time THREAD_SHARED_DICT["exec_time"] = runner.exec_time
@ -456,7 +458,7 @@ def _restore_window(
def restore_window( def restore_window(
config_dict: dict, snapshot_id: str, restore_include: List[str] repo_config: dict, snapshot_id: str, restore_include: List[str]
) -> None: ) -> None:
left_col = [ left_col = [
[ [
@ -484,7 +486,7 @@ def restore_window(
# We get a thread result, hence pylint will complain the thread isn't a tuple # We get a thread result, hence pylint will complain the thread isn't a tuple
# pylint: disable=E1101 (no-member) # pylint: disable=E1101 (no-member)
thread = _restore_window( thread = _restore_window(
config_dict=config_dict, repo_config=repo_config,
snapshot=snapshot_id, snapshot=snapshot_id,
target=values["-RESTORE-FOLDER-"], target=values["-RESTORE-FOLDER-"],
restore_includes=restore_include, restore_includes=restore_include,
@ -517,8 +519,8 @@ def restore_window(
@threaded @threaded
def _gui_backup(config_dict, stdout) -> Future: def _gui_backup(repo_config, stdout) -> Future:
runner = NPBackupRunner(config_dict=config_dict) runner = NPBackupRunner(repo_config=repo_config)
runner.verbose = ( runner.verbose = (
True # We must use verbose so we get progress output from ResticRunner True # We must use verbose so we get progress output from ResticRunner
) )
@ -531,8 +533,19 @@ def _gui_backup(config_dict, stdout) -> Future:
def _main_gui(): def _main_gui():
config_file = Path(f'{CURRENT_DIR}/npbackup.conf')
if config_file.exists():
full_config = npbackup.configuration.load_config(config_file)
# TODO add a repo selector
repo_config, inherit_config = npbackup.configuration.get_repo_config(full_config)
else:
# TODO: Add config load directory
sg.Popup("Cannot load configuration file")
sys.exit(3)
backup_destination = _t("main_gui.local_folder") backup_destination = _t("main_gui.local_folder")
backend_type, repo_uri = get_anon_repo_uri(config_dict["repo"]["repository"]) backend_type, repo_uri = get_anon_repo_uri(repo_config.g('repo_uri'))
right_click_menu = ["", [_t("generic.destination")]] right_click_menu = ["", [_t("generic.destination")]]
headings = [ headings = [
@ -620,7 +633,7 @@ def _main_gui():
window["snapshot-list"].expand(True, True) window["snapshot-list"].expand(True, True)
window.read(timeout=1) window.read(timeout=1)
current_state, backup_tz, snapshot_list = get_gui_data(config_dict) current_state, backup_tz, snapshot_list = get_gui_data(repo_config)
_gui_update_state(window, current_state, backup_tz, snapshot_list) _gui_update_state(window, current_state, backup_tz, snapshot_list)
while True: while True:
event, values = window.read(timeout=60000) event, values = window.read(timeout=60000)
@ -647,7 +660,7 @@ def _main_gui():
# let's use a mutable so the backup thread can modify it # let's use a mutable so the backup thread can modify it
# We get a thread result, hence pylint will complain the thread isn't a tuple # We get a thread result, hence pylint will complain the thread isn't a tuple
# pylint: disable=E1101 (no-member) # pylint: disable=E1101 (no-member)
thread = _gui_backup(config_dict=config_dict, stdout=stdout) thread = _gui_backup(repo_config=repo_config, stdout=stdout)
while not thread.done() and not thread.cancelled(): while not thread.done() and not thread.cancelled():
try: try:
stdout_line = stdout.get(timeout=0.01) stdout_line = stdout.get(timeout=0.01)
@ -669,7 +682,7 @@ def _main_gui():
exec_time = THREAD_SHARED_DICT["exec_time"] exec_time = THREAD_SHARED_DICT["exec_time"]
except KeyError: except KeyError:
exec_time = "N/A" exec_time = "N/A"
current_state, backup_tz, snapshot_list = get_gui_data(config_dict) current_state, backup_tz, snapshot_list = get_gui_data(repo_config)
_gui_update_state(window, current_state, backup_tz, snapshot_list) _gui_update_state(window, current_state, backup_tz, snapshot_list)
if not result: if not result:
sg.PopupError( sg.PopupError(
@ -685,11 +698,12 @@ def _main_gui():
if not values["snapshot-list"]: if not values["snapshot-list"]:
sg.Popup(_t("main_gui.select_backup"), keep_on_top=True) sg.Popup(_t("main_gui.select_backup"), keep_on_top=True)
continue continue
if len(values["snapshot-list"] > 1): print(values["snapshot-list"])
if len(values["snapshot-list"]) > 1:
sg.Popup(_t("main_gui.select_only_one_snapshot")) sg.Popup(_t("main_gui.select_only_one_snapshot"))
continue continue
snapshot_to_see = snapshot_list[values["snapshot-list"][0]][0] snapshot_to_see = snapshot_list[values["snapshot-list"][0]][0]
ls_window(config_dict, snapshot_to_see) ls_window(repo_config, snapshot_to_see)
if event == "forget": if event == "forget":
if not values["snapshot-list"]: if not values["snapshot-list"]:
sg.Popup(_t("main_gui.select_backup"), keep_on_top=True) sg.Popup(_t("main_gui.select_backup"), keep_on_top=True)
@ -697,32 +711,32 @@ def _main_gui():
snapshots_to_forget = [] snapshots_to_forget = []
for row in values["snapshot-list"]: for row in values["snapshot-list"]:
snapshots_to_forget.append(snapshot_list[row][0]) snapshots_to_forget.append(snapshot_list[row][0])
forget_snapshot(config_dict, snapshots_to_forget) forget_snapshot(repo_config, snapshots_to_forget)
# Make sure we trigger a GUI refresh after forgetting snapshots # Make sure we trigger a GUI refresh after forgetting snapshots
event = "state-button" event = "state-button"
if event == "operations": if event == "operations":
config_dict = operations_gui(config_dict, config_file) repo_config = operations_gui(repo_config, config_file)
event = "state-button" event = "state-button"
if event == "configure": if event == "configure":
config_dict = config_gui(config_dict, config_file) repo_config = config_gui(repo_config, config_file)
# Make sure we trigger a GUI refresh when configuration is changed # Make sure we trigger a GUI refresh when configuration is changed
event = "state-button" event = "state-button"
if event == _t("generic.destination"): if event == _t("generic.destination"):
try: try:
if backend_type: if backend_type:
if backend_type in ["REST", "SFTP"]: if backend_type in ["REST", "SFTP"]:
destination_string = config_dict["repo"]["repository"].split( destination_string = repo_config.g("repo_uri").split(
"@" "@"
)[-1] )[-1]
else: else:
destination_string = config_dict["repo"]["repository"] destination_string = repo_config.g("repo_uri")
sg.PopupNoFrame(destination_string) sg.PopupNoFrame(destination_string)
except (TypeError, KeyError): except (TypeError, KeyError):
sg.PopupNoFrame(_t("main_gui.unknown_repo")) sg.PopupNoFrame(_t("main_gui.unknown_repo"))
if event == "about": if event == "about":
_about_gui(version_string, config_dict) _about_gui(version_string, repo_config)
if event == "state-button": if event == "state-button":
current_state, backup_tz, snapshot_list = get_gui_data(config_dict) current_state, backup_tz, snapshot_list = get_gui_data(repo_config)
_gui_update_state(window, current_state, backup_tz, snapshot_list) _gui_update_state(window, current_state, backup_tz, snapshot_list)
if current_state is None: if current_state is None:
sg.Popup(_t("main_gui.cannot_get_repo_status")) sg.Popup(_t("main_gui.cannot_get_repo_status"))