netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-10-22 19:37:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix version string should be in a shared file

Browse source
This commit is contained in:
Orsiris de Jong 2023-12-13 18:27:18 +01:00
parent d67bba5639
commit bc230037fd
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
npbackup/__version__.py
View file

@ -11,3 +11,18 @@ __copyright__ = "Copyright (C) 2022-2023 NetInvent"
__license__ = "GPL-3.0-only" __license__ = "GPL-3.0-only"
__build__ = "2023121001" __build__ = "2023121001"
__version__ = "2.3.0-dev" __version__ = "2.3.0-dev"
import sys
from ofunctions.platform import python_arch
from npbackup.configuration import IS_PRIV_BUILD
version_string = "{} v{}{}{}-{} {} - {}".format(
__intname__,
__version__,
"-PRIV" if IS_PRIV_BUILD else "",
"-P{}".format(sys.version_info[1]),
python_arch(),
__build__,
__copyright__,
)

9
npbackup/gui/__main__.py
View file

@ -15,16 +15,15 @@ import sys
import os import os
from pathlib import Path from pathlib import Path
from logging import getLogger from logging import getLogger
import re
from datetime import datetime from datetime import datetime
import dateutil import dateutil
import queue import queue
from time import sleep from time import sleep
import PySimpleGUI as sg
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 PySimpleGUI as sg
import _tkinter
import npbackup.configuration import npbackup.configuration
from npbackup.customization import ( from npbackup.customization import (
OEM_STRING, OEM_STRING,
@ -48,7 +47,7 @@ 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.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 version_string
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 (
@ -753,7 +752,7 @@ def _main_gui():
full_config = operations_gui(full_config, config_file) full_config = operations_gui(full_config, config_file)
event = "state-button" event = "state-button"
if event == "configure": if event == "configure":
repo_config = config_gui(full_config, config_file) full_config = config_gui(full_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"):