Merge branch 'master' into pkce

tidal_dl_ng/config.py

@@ -14,9 +14,9 @@ from tidal_dl_ng.model.cfg import Token as ModelToken
 
 
 class BaseConfig:
-    data: ModelSettings | ModelToken = None
+    data: ModelSettings | ModelToken
-    file_path: str = None
+    file_path: str
-    cls_model: object = None
+    cls_model: ModelSettings | ModelToken
     path_base: str = path_config_base()
 
     def save(self, config_to_compare: str = None) -> None:
@@ -70,22 +70,19 @@ class BaseConfig:
 
 
 class Settings(BaseConfig, metaclass=SingletonMeta):
-    cls_model = ModelSettings
-    data = None
-
     def __init__(self):
+        self.cls_model = ModelSettings
         self.file_path = path_file_settings()
         self.read(self.file_path)
 
 
 class Tidal(BaseConfig, metaclass=SingletonMeta):
-    cls_model = ModelToken
+    session: tidalapi.Session
-    session: tidalapi.Session = None
-    data: ModelToken = None
     token_from_storage: bool = False
-    settings: Settings = None
+    settings: Settings
 
     def __init__(self, settings: Settings = None):
+        self.cls_model = ModelToken
         tidal_config: tidalapi.Config = tidalapi.Config(item_limit=10000)
         self.session = tidalapi.Session(tidal_config)
         # self.session.config.client_id = "km8T1xS355y7dd3H"

tidal_dl_ng/download.py

@@ -50,12 +50,12 @@ class RequestsClient:
 
 
 class Download:
-    settings: Settings = None
+    settings: Settings
-    session: Session = None
+    session: Session
     skip_existing: SkipExisting = False
-    fn_logger: Callable = None
+    fn_logger: Callable
-    progress_gui: ProgressBars = None
+    progress_gui: ProgressBars
-    progress: Progress = None
+    progress: Progress
 
     def __init__(
         self,

tidal_dl_ng/gui.py

@@ -34,19 +34,19 @@ from tidal_dl_ng.worker import Worker
 
 # TODO: Make more use of Exceptions
 class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
-    settings: Settings = None
+    settings: Settings
-    tidal: Tidal = None
+    tidal: Tidal
-    dl: Download = None
+    dl: Download
-    threadpool: QtCore.QThreadPool = None
+    threadpool: QtCore.QThreadPool
-    tray: QtWidgets.QSystemTrayIcon = None
+    tray: QtWidgets.QSystemTrayIcon
-    spinner: QtWaitingSpinner = None
+    spinner: QtWaitingSpinner
     spinner_start: QtCore.Signal = QtCore.Signal(QtWidgets.QWidget)
     spinner_stop: QtCore.Signal = QtCore.Signal()
-    pb_item: QtWidgets.QProgressBar = None
+    pb_item: QtWidgets.QProgressBar
     s_item_advance: QtCore.Signal = QtCore.Signal(float)
     s_item_name: QtCore.Signal = QtCore.Signal(str)
     s_list_name: QtCore.Signal = QtCore.Signal(str)
-    pb_list: QtWidgets.QProgressBar = None
+    pb_list: QtWidgets.QProgressBar
     s_list_advance: QtCore.Signal = QtCore.Signal(float)
     s_pb_reset: QtCore.Signal = QtCore.Signal()
     s_populate_tree_lists: QtCore.Signal = QtCore.Signal(list)
@@ -291,7 +291,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
             self.tr_results.clear()
 
         # Count how many digits the list length has,
-        count_digits: int = int(math.log10(len(results))) + 1
+        count_digits: int = int(math.log10(len(results) if results else 1)) + 1
 
         for item in results:
             child = self.populate_tree_result_child(item=item, index_count_digits=count_digits)

tidal_dl_ng/metadata.py

@@ -7,23 +7,23 @@ from tidal_dl_ng.constants import REQUESTS_TIMEOUT_SEC
 
 
 class Metadata:
-    path_file: str = None
+    path_file: str
-    title: str = None
+    title: str
-    album: str = None
+    album: str
-    albumartist: str = None
+    albumartist: str
-    artists: [str] = None
+    artists: [str]
-    copy_right: str = None
+    copy_right: str
-    tracknumber: int = None
+    tracknumber: int
-    discnumber: int = None
+    discnumber: int
-    totaldisc: int = None
+    totaldisc: int
-    totaltrack: int = None
+    totaltrack: int
-    date: str = None
+    date: str
-    composer: [str] = None
+    composer: [str]
-    isrc: str = None
+    isrc: str
-    lyrics: str = None
+    lyrics: str
-    path_cover: str = None
+    path_cover: str
-    url_cover: str = None
+    url_cover: str
-    m: mutagen.mp4.MP4 | mutagen.mp4.MP4 | mutagen.flac.FLAC = None
+    m: mutagen.mp4.MP4 | mutagen.mp4.MP4 | mutagen.flac.FLAC
 
     def __init__(
         self,