From e3265b08179d8e7a1d6979bb24773ac999c2a643 Mon Sep 17 00:00:00 2001
From: Christoph Stahl <christoph.stahl@tu-dortmund.de>
Date: Sun, 6 Oct 2024 02:39:04 +0200
Subject: [PATCH] Fixed types and imports

---
 syng/gui.py                                   | 21 +++++++------------
 syng/resources.py                             |  7 +++++--
 syng/sources/files.py                         |  1 -
 syng/sources/youtube.py                       |  2 +-
 .../{socketio.pyi => socketio/__init__.pyi}   |  0
 typings/socketio/exceptions.pyi               |  1 +
 6 files changed, 15 insertions(+), 17 deletions(-)
 rename typings/{socketio.pyi => socketio/__init__.pyi} (100%)
 create mode 100644 typings/socketio/exceptions.pyi

diff --git a/syng/gui.py b/syng/gui.py
index 29996af..de83077 100644
--- a/syng/gui.py
+++ b/syng/gui.py
@@ -1,12 +1,10 @@
 from io import BytesIO
-import sys
 import logging
 from logging.handlers import QueueListener
 from multiprocessing import Process, Queue
 from collections.abc import Callable
 from datetime import datetime
 import os
-import builtins
 from functools import partial
 import random
 from typing import TYPE_CHECKING, Any, Optional
@@ -45,6 +43,7 @@ from PyQt6.QtWidgets import (
     QSizePolicy,
     QSpacerItem,
     QSpinBox,
+    QTabBar,
     QTabWidget,
     QVBoxLayout,
     QWidget,
@@ -336,8 +335,8 @@ class OptionFrame(QWidget):
         for name, textbox in self.string_options.items():
             config[name] = textbox.text().strip()
 
-        for name, textbox in self.int_options.items():
-            config[name] = textbox.value()
+        for name, spinner in self.int_options.items():
+            config[name] = spinner.value()
 
         for name, optionmenu in self.choose_options.items():
             config[name] = optionmenu.currentText().strip()
@@ -365,11 +364,11 @@ class OptionFrame(QWidget):
         for name, textbox in self.string_options.items():
             textbox.setText(config[name])
 
-        for name, textbox in self.int_options.items():
+        for name, spinner in self.int_options.items():
             try:
-                textbox.setValue(config[name])
+                spinner.setValue(config[name])
             except ValueError:
-                textbox.setValue(0)
+                spinner.setValue(0)
 
         for name, optionmenu in self.choose_options.items():
             optionmenu.setCurrentText(str(config[name]))
@@ -547,7 +546,7 @@ class SyngGui(QMainWindow):
                     if widget:
                         widget.setVisible(state)
 
-        tabbar = self.tabview.tabBar()
+        tabbar: Optional[QTabBar] = self.tabview.tabBar()
         if not state:
             if tabbar is not None:
                 tabbar.hide()
@@ -561,7 +560,7 @@ class SyngGui(QMainWindow):
         self.central_layout.addLayout(self.frm)
 
     def init_tabs(self, show_advanced: bool) -> None:
-        self.tabview = QTabWidget(parent=self.central_widget)
+        self.tabview: QTabWidget = QTabWidget(parent=self.central_widget)
         self.tabview.setAcceptDrops(False)
         self.tabview.setTabPosition(QTabWidget.TabPosition.West)
         self.tabview.setTabShape(QTabWidget.TabShape.Rounded)
@@ -833,10 +832,6 @@ class LoggingLabelHandler(logging.Handler):
 
 
 def run_gui() -> None:
-    base_dir = os.path.dirname(__file__)
-    if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
-        base_dir = sys._MEIPASS
-
     # initialize cache dir
     os.makedirs(platformdirs.user_cache_dir("syng"), exist_ok=True)
 
diff --git a/syng/resources.py b/syng/resources.py
index 6f3f3a7..6349bf3 100644
--- a/syng/resources.py
+++ b/syng/resources.py
@@ -2339,10 +2339,13 @@ qt_resource_struct = b"\
 \x00\x00\x01\x92^\xb1\x10\xa9\
 "
 
-def qInitResources():
+
+def qInitResources() -> None:
     QtCore.qRegisterResourceData(0x03, qt_resource_struct, qt_resource_name, qt_resource_data)
 
-def qCleanupResources():
+
+def qCleanupResources() -> None:
     QtCore.qUnregisterResourceData(0x03, qt_resource_struct, qt_resource_name, qt_resource_data)
 
+
 qInitResources()
diff --git a/syng/sources/files.py b/syng/sources/files.py
index 0215679..dbfd3ed 100644
--- a/syng/sources/files.py
+++ b/syng/sources/files.py
@@ -4,7 +4,6 @@ import asyncio
 import os
 from typing import Any, Optional
 from typing import Tuple
-from platformdirs import user_cache_dir
 
 
 from ..entry import Entry
diff --git a/syng/sources/youtube.py b/syng/sources/youtube.py
index 4eee4d4..800cdda 100644
--- a/syng/sources/youtube.py
+++ b/syng/sources/youtube.py
@@ -22,7 +22,7 @@ from platformdirs import user_cache_dir
 from ..entry import Entry
 from ..result import Result
 from .source import Source, available_sources
-from ..config import BoolOption, ChoiceOption, FolderOption, ListStrOption, Option, ConfigOption
+from ..config import BoolOption, ChoiceOption, FolderOption, ListStrOption, ConfigOption
 
 
 class YouTube:
diff --git a/typings/socketio.pyi b/typings/socketio/__init__.pyi
similarity index 100%
rename from typings/socketio.pyi
rename to typings/socketio/__init__.pyi
diff --git a/typings/socketio/exceptions.pyi b/typings/socketio/exceptions.pyi
new file mode 100644
index 0000000..8fece09
--- /dev/null
+++ b/typings/socketio/exceptions.pyi
@@ -0,0 +1 @@
+class ConnectionError(Exception): ...