🛠️ Version will be shown correctly.

This commit is contained in:
Robert Honz
2024-03-22 16:20:29 +01:00
parent 0461c53be4
commit c7c8c12574
6 changed files with 37 additions and 16 deletions
+3 -8
View File
@@ -1,10 +1,5 @@
#!/usr/bin/env python
import importlib.metadata
from usingversion import getattr_with_version
try:
# __package__ allows for the case where __name__ is "__main__"
__version__ = importlib.metadata.version(__package__ or __name__)
__name_display__ = importlib.metadata.metadata(__package__ or __name__).json["name"]
except importlib.metadata.PackageNotFoundError:
__version__ = "0.0.0"
__name_display__ = __package__ or __name__
__getattr__ = getattr_with_version("mypackage", __file__, __name__)
__name_display__ = __package__ or __name__
+2 -2
View File
@@ -8,7 +8,7 @@ from rich.panel import Panel
from rich.progress import BarColumn, Console, Progress, SpinnerColumn, TextColumn
from rich.table import Table
from tidal_dl_ng import __version__
from tidal_dl_ng import version
from tidal_dl_ng.config import Settings, Tidal
from tidal_dl_ng.constants import CTX_TIDAL, MediaType
from tidal_dl_ng.download import Download
@@ -22,7 +22,7 @@ app = typer.Typer(context_settings={"help_option_names": ["-h", "--help"]}, add_
def version_callback(value: bool):
if value:
print(f"{__version__}")
print(f"{version}")
raise typer.Exit()
+2 -2
View File
@@ -6,7 +6,7 @@ from helper.path import is_installed_ffmpeg
from PySide6 import QtCore, QtGui, QtWidgets
from tidalapi import Quality as QualityAudio
from tidal_dl_ng import __version__
from tidal_dl_ng import version
from tidal_dl_ng.config import Settings
from tidal_dl_ng.constants import CoverDimensions, QualityVideo, SkipExisting
from tidal_dl_ng.model.cfg import HelpSettings
@@ -30,7 +30,7 @@ class DialogVersion(QtWidgets.QDialog):
# Run the .setupUi() method to show the GUI
self.ui.setupUi(self)
# Set the version.
self.ui.l_version.setText("v" + __version__)
self.ui.l_version.setText("v" + version)
# Show
self.exec()
+2 -2
View File
@@ -4,7 +4,7 @@ from collections.abc import Callable
from requests.exceptions import HTTPError
from tidal_dl_ng import __version__
from tidal_dl_ng import version
from tidal_dl_ng.dialog import DialogLogin, DialogPreferences, DialogVersion
from tidal_dl_ng.helper.exceptions import MediaUnknown
from tidal_dl_ng.helper.path import get_format_template
@@ -629,7 +629,7 @@ def gui_activate(tidal: Tidal | None = None):
# Make sure Pyinstaller icons are still grouped
if not sys.argv[0].endswith(".exe"):
# Arbitrary string
my_app_id: str = "exislow.tidal.dl-ng." + __version__
my_app_id: str = "exislow.tidal.dl-ng." + version
ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(my_app_id)
window = MainWindow(tidal=tidal)