Merge pull request #67 from exislow/62-bug-version-info-not-displayed

🛠️ Version will be shown correctly.

Author: exislow

poetry.lock

@@ -40,6 +40,7 @@ pyside6 = {version = "^6.6.2", optional = true}
 pyqtdarktheme = {version = "^2.1.0", optional = true}
 mpegdash = "^0.4.0"
 rich = "^13.7.1"
+usingversion = "^0.1.2"
 
 [tool.poetry.extras]
 gui = ["pyside6", "pyqtdarktheme"]
@@ -170,7 +171,7 @@ profile = "black"
 multi_line_output = 3
 indent = 4
 color_output = true
-known_third_party = ["Crypto", "PySide6", "coloredlogs", "dataclasses_json", "ffmpeg", "helper", "m3u8", "mpegdash", "mutagen", "pathvalidate", "requests", "rich", "tidalapi", "typer"]
+known_third_party = ["Crypto", "PySide6", "coloredlogs", "dataclasses_json", "ffmpeg", "helper", "m3u8", "mpegdash", "mutagen", "pathvalidate", "requests", "rich", "tidalapi", "typer", "usingversion"]
 
 [tool.mypy]
 # https://mypy.readthedocs.io/en/latest/config_file.html#using-a-pyproject-toml-file

pyproject.toml

@@ -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__

tidal_dl_ng/__init__.py

@@ -8,7 +8,7 @@
 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 @@
 
 def version_callback(value: bool):
     if value:
-        print(f"{__version__}")
+        print(f"{version}")
         raise typer.Exit()
 
 

tidal_dl_ng/cli.py

@@ -6,7 +6,7 @@
 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 @@ def __init__(self, parent=None):
         # 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()
 

tidal_dl_ng/dialog.py

@@ -4,7 +4,7 @@
 
 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)