Reverting to commit 789fcf4

Author: AmbitiousFlowDev

.gitignore

@@ -166,6 +166,4 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
-settings.json
+#.idea/

app/__init__.py

@@ -1,5 +1,6 @@
 from app.handlers.URLEmptyException import URLEmptyException
 from app.services.DownloadService   import DownloadService
+from app.settings.settings          import Settings
 from app.widgets.about              import AboutWidget
 from app.widgets.app                import MainWidget
 
@@ -12,41 +13,138 @@
 from PySide6.QtWidgets              import QMainWindow
 from PySide6.QtWidgets              import QWidget
 from PySide6.QtCore                 import QUrl
-
 import sys
 
+# class DownloadWorker(QObject):
 
-class ApplicationContext:
+#     finished = Signal()
+#     error_occurred = Signal(str)
 
-    def __inject_theme(self):
-        self.app.setStyle('Fusion')
+#     def __init__(self, url, path, file_type, download_service):
+#         super().__init__()
+#         self.url = url
+#         self.path = path
+#         self.file_type = file_type
+#         self.download_service = download_service
 
-    def __load_about_dialog(self):
-        self.dialog      = QWidget()
-        self.about       = AboutWidget()
+#     def run(self):
+#         try:
+#             self.download_service.download(self.url, self.path, self.file_type)
+#         except Exception as e:
+#             self.error_occurred.emit(str(e))
+#         finally:
+#             self.finished.emit()
 
-    def __load_main_form(self):
-        self.app         = QApplication([])
-        self.main_window = QMainWindow()
-        self.ui          = MainWidget()
 
-    def __setup_main_form(self):
-        self.ui.setupUi(self.main_window)
+class ApplicationContext:
 
-    def __setup_about_dialog(self):
-        self.about.setupUi(self.dialog)
+    __main_widget      :MainWidget
+    __about_widget     :AboutWidget
+    __download_service :DownloadService
+    __version_service  :str
 
-    def __inject_signals(self):
-        self.ui.WikiButton.clicked.connect(self.dialog.show())
+    @property
+    def __app(self):
+        return QApplication(sys.argv)
+    
+    def __init__(self , main_widget:MainWidget,about_widget:AboutWidget,download_service:DownloadService):
 
-    def __init__(self):
-        self.__load_main_form()
-        self.__load_about_dialog()
-        self.__setup_about_dialog()
-        self.__setup_main_form()
-        self.__inject_signals()
+        self.__main_widget      = main_widget
+        self.__about_widget     = about_widget
+        self.__download_service = download_service
+        
+        self.__set_up()
 
+    def __set_up(self):
+        # self.__app.setStyle(self.__settings_config.config['theme']);
+        self.__main_widget.setupUi(QMainWindow().setFixedSize(836, 324));
+        self.__about_widget.setupUi(QWidget().setFixedSize(400, 125));
+    
     def run(self):
-        self.__inject_theme()
-        self.main_window.show()
-        sys.exit(self.app.exec())
+        ...
+    
+    def start_download(self):
+        ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    def load_config(self):
+        ...
+
+        # """
+        # Initializes the Application class by setting up the QApplication, main window,
+        # about window, and settings window. It also configures the application style
+        # and sets up the UI components and services.
+        # """
+        # # Injecting
+        # self.app             = QApplication(sys.argv)
+        # self.main_window     = QMainWindow()
+        # self.about_window    = QWidget()
+        # self.settings_window = QWidget()
+        # self.app.setStyle(self.settings_config.config['theme'])
+        # # Setting Up
+        # self.main_widget.setupUi(self.main_window)
+        # self.about_widget.setupUi(self.about_window)
+        # self.main_window.setFixedSize(836, 324)
+        # self.about_window.setFixedSize(400, 125)
+        # # Services
+        # self.download_service = DownloadService(
+        #     self.main_widget.DownloadProgressBar, self.main_widget.OutputAreaBox
+        # )
+        # self.download_thread = None  # Initialize as None
+        # self.set_actions()
+
+    # def start_download(self):
+
+    #     if self.main_widget.UrlEntry.text() == "":
+    #         self.show_error_message("Empty URL Warning", "Please provide a URL.")
+    #         return
+        
+    #     self.main_widget.OutputAreaBox.insertPlainText("Starting download...\n")
+
+    #     url = self.main_widget.UrlEntry.text()
+    #     path = self.settings_config.config['path']
+    #     file_type = self.main_widget.TypeComboBox.currentText()
+
+    #     # Create and set up worker thread
+    #     self.download_thread = QThread()
+    #     self.download_worker = DownloadWorker(url, path, file_type, self.download_service)
+    #     self.download_worker.moveToThread(self.download_thread)
+
+    #     # Connect signals
+    #     self.download_thread.started.connect(self.download_worker.run)
+    #     self.download_worker.finished.connect(self.download_thread.quit)
+    #     self.download_worker.finished.connect(self.download_worker.deleteLater)
+    #     self.download_thread.finished.connect(self.download_thread.deleteLater)
+    #     self.download_worker.error_occurred.connect(self.show_error_message)
+
+    #     # Start the thread
+    #     self.download_thread.start()
+
+    # def show_error_message(self, title, message):
+    #     msg = QMessageBox()
+    #     msg.critical(self.main_window, title, message)
+
+    # def set_actions(self):
+    #     url = QUrl('https://github.com/Kyle-Myre')
+    #     self.main_widget.DownloadButton.clicked.connect(self.start_download)
+    #     self.main_widget.WikiButton.clicked.connect(self.about_window.show)
+    #     self.main_widget.GithubButton.clicked.connect(lambda: QDesktopServices.openUrl(url))
+
+    # def run(self):
+    #     self.main_window.show()
+    #     sys.exit(self.app.exec())

app/app.py

@@ -1,6 +1,7 @@
-from app  import ApplicationContext
+from app import ApplicationContext
 
-class DandilionApplication():
+
+class DandilionApplication(object):
     """
     DandilionApplication is the main entry point for the Dandilion application.
 

app/services/DownloadService.py

@@ -1,12 +1,7 @@
-from PySide6.QtWidgets      import QProgressBar
-from PySide6.QtWidgets      import QPlainTextEdit
-
-from yt_dlp.utils           import DownloadError
-from yt_dlp                 import YoutubeDL
-
-from PySide6.QtCore         import QThread
-from PySide6.QtCore         import QObject
-from PySide6.QtCore         import Signal
+from PySide6.QtWidgets import QProgressBar
+from PySide6.QtWidgets import QPlainTextEdit
+from yt_dlp.utils import DownloadError
+from yt_dlp import YoutubeDL
 
 
 class DownloadService(object):
@@ -53,25 +48,3 @@ def download(self , url:str , path:str , type:str):
 
         except DownloadError as e:
             return {"error": str(e)}
-
-
-class DownloadWorker(QObject):
-
-    finished       = Signal()
-    error_occurred = Signal(str)
-
-    def __init__(self, url, path, file_type, download_service):
-        
-        super().__init__()
-        self.url = url
-        self.path = path
-        self.file_type = file_type
-        self.download_service = download_service
-
-    def run(self):
-        try:
-            self.download_service.download(self.url, self.path, self.file_type)
-        except Exception as e:
-            self.error_occurred.emit(str(e))
-        finally:
-            self.finished.emit()

app/settings/__init__.py

@@ -0,0 +1,4 @@
+{
+    "path": "C:\\Users\\simoa\\Downloads",
+    "theme": "Fusion"
+}

app/settings/settings.json

@@ -0,0 +1,16 @@
+from pathlib import Path
+import json
+import os
+
+
+__DIRNAME__ = os.path.join(os.path.dirname(__file__), "settings.json")
+
+
+class Settings:
+    def __init__(self):
+        with open(__DIRNAME__) as file:
+            self.config:dict = json.load(file)
+            if self.config["path"] == None:
+                self.config["path"] = str(Path.home() / "Downloads")
+                with open(__DIRNAME__, "w") as file:
+                    json.dump(self.config, file, indent=4)

app/settings/settings.py

@@ -268,6 +268,3 @@ def retranslateUi(self, Dandilion):
         )
 
     # retranslateUi
-
-
-

app/widgets/app.py

@@ -1,33 +1,7 @@
-"""
-This script serves as the entry point for the DandilionApplication.
-
-It disables the generation of `.pyc` bytecode files for cleaner project management 
-and initializes and runs the application.
-
-Modules:
-    sys: Provides system-specific parameters and functions.
-    app.app: Contains the definition of the `DandilionApplication` class, 
-             which encapsulates the functionality of the application.
-
-Classes:
-    DandilionApplication: The main application class imported from `app.app`.
-
-Usage:
-    Run this script directly to start the DandilionApplication.
-
-Example:
-    python main.py
-"""
-
 import sys
-
 sys.dont_write_bytecode = True
-
 from app.app import DandilionApplication
 
-def main():
-    app = DandilionApplication()
-    app.run()
-
+ 
 if __name__ == "__main__":
-    main()
+    app = DandilionApplication()