From 7091a9e08d9b6e382c63b5bf12eaddfea9f0e9d2 Mon Sep 17 00:00:00 2001
From: "Mr. Finch" <mr.finch@binary-io.net>
Date: Tue, 11 Feb 2025 19:39:42 +0100
Subject: [PATCH 1/2] refactor: introduces consts and optimizes the code

---
 src/OptimaLab35/__main__.py |  5 +--
 src/OptimaLab35/const.py    |  2 ++
 src/OptimaLab35/gui.py      | 68 +++++++++++++++++--------------------
 3 files changed, 35 insertions(+), 40 deletions(-)
 create mode 100644 src/OptimaLab35/const.py

diff --git a/src/OptimaLab35/__main__.py b/src/OptimaLab35/__main__.py
index 557cfbf..14932be 100644
--- a/src/OptimaLab35/__main__.py
+++ b/src/OptimaLab35/__main__.py
@@ -1,7 +1,4 @@
-from OptimaLab35 import gui, __version__
-
-def main():
-    gui.main()
+from .gui import main
 
 if __name__ == "__main__":
     main()
diff --git a/src/OptimaLab35/const.py b/src/OptimaLab35/const.py
new file mode 100644
index 0000000..2dcfd9c
--- /dev/null
+++ b/src/OptimaLab35/const.py
@@ -0,0 +1,2 @@
+APPLICATION_NAME = "OptimaLab35"
+CONFIG_BASE_PATH = "~/.config/OptimaLab35"
diff --git a/src/OptimaLab35/gui.py b/src/OptimaLab35/gui.py
index 904bc93..985a96d 100644
--- a/src/OptimaLab35/gui.py
+++ b/src/OptimaLab35/gui.py
@@ -1,40 +1,42 @@
+from os.path import join
 import sys
 import os
 from datetime import datetime
-import importlib.resources as pkg_resources
-try:
-    from OptimaLab35.ui import resources_rc
-    # keep the try for now
-except Exception as e:
-    print(e)
 
+from .ui import resources_rc
 from PyPiUpdater import PyPiUpdater
 from optima35.core import OptimaManager
-from OptimaLab35.utils.utility import Utilities
-from OptimaLab35.ui.main_window import Ui_MainWindow
-from OptimaLab35.ui.preview_window import Ui_Preview_Window
-from OptimaLab35.ui.settings_window import Ui_Settings_Window
-from OptimaLab35.ui.exif_handler_window import ExifEditor
-from OptimaLab35.ui.simple_dialog import SimpleDialog  # Import the SimpleDialog class
-from OptimaLab35 import __version__
 
-from PySide6.QtCore import QRunnable, QThreadPool, Signal, QObject, QRegularExpression, Qt, QTimer, Slot, QDir
+from .utils.utility import Utilities
+from .ui.main_window import Ui_MainWindow
+from .ui.preview_window import Ui_Preview_Window
+from .ui.settings_window import Ui_Settings_Window
+from .ui.exif_handler_window import ExifEditor
+from .ui.simple_dialog import SimpleDialog  # Import the SimpleDialog class
+from OptimaLab35 import __version__
+from .const import (
+    APPLICATION_NAME,
+    CONFIG_BASE_PATH
+)
 
 from PySide6 import QtWidgets, QtCore
+
+from PySide6.QtCore import (
+    QRunnable,
+    QThreadPool,
+    Signal,
+    QObject,
+    QRegularExpression,
+    Qt,
+    QTimer,
+    Slot
+)
+
 from PySide6.QtWidgets import (
     QMessageBox,
     QApplication,
     QMainWindow,
-    QWidget,
-    QVBoxLayout,
-    QLabel,
-    QLineEdit,
-    QPushButton,
-    QCheckBox,
-    QFileDialog,
-    QHBoxLayout,
-    QSpinBox,
-    #QProgressBar,
+    QFileDialog
 )
 
 from PySide6.QtGui import QPixmap, QRegularExpressionValidator, QIcon
@@ -42,14 +44,14 @@ from PySide6.QtGui import QPixmap, QRegularExpressionValidator, QIcon
 class OptimaLab35(QMainWindow, Ui_MainWindow):
     def __init__(self):
         super(OptimaLab35, self).__init__()
-        self.name = "OptimaLab35"
+        self.name = APPLICATION_NAME
         self.version = __version__
         self.o = OptimaManager()
-        self.u = Utilities(os.path.expanduser("~/.config/OptimaLab35"))
+        self.u = Utilities(os.path.expanduser(CONFIG_BASE_PATH))
         self.app_settings = self.u.load_settings()
         self.thread_pool = QThreadPool() # multi thread ChatGPT
         # Initiate internal object
-        self.exif_file = os.path.expanduser("~/.config/OptimaLab35/exif.yaml")
+        self.exif_file = os.path.expanduser(f"{CONFIG_BASE_PATH}/exif.yaml")
         self.available_exif_data = None
         self.settings = {}
         # UI elements
@@ -62,13 +64,7 @@ class OptimaLab35(QMainWindow, Ui_MainWindow):
         self.set_title()
         self.default_ui_layout()
         self.define_gui_interaction()
-
-        try:
-            self.setWindowIcon(QIcon(":app-icon.png"))
-            # keep the try for now
-        except Exception as e:
-            print(e)
-
+        self.setWindowIcon(QIcon(":app-icon.png"))
 
     # Init function
     def default_ui_layout(self):
@@ -910,7 +906,7 @@ class ImageProcessorRunnable(QRunnable):
         self.signals = WorkerSignals()
         self.signals.progress.connect(progress_callback)
         self.o = OptimaManager()
-        self.u = Utilities(os.path.expanduser("~/.config/OptimaLab35/"))
+        self.u = Utilities(os.path.expanduser(CONFIG_BASE_PATH))
 
     def run(self):
         input_folder = self.settings["input_folder"]
@@ -980,7 +976,7 @@ class ImageProcessorWorker(QRunnable):
             self.callback(None)
 
 def main():
-    u = Utilities(os.path.expanduser("~/.config/OptimaLab35"))
+    u = Utilities(os.path.expanduser(CONFIG_BASE_PATH))
     app_settings = u.load_settings()
     app = QtWidgets.QApplication(sys.argv)
 

From 7f59ee840d8bf336458ccdd7c67406c3c8f216f1 Mon Sep 17 00:00:00 2001
From: "Mr. Finch" <mr.finch@binary-io.net>
Date: Tue, 11 Feb 2025 19:45:44 +0100
Subject: [PATCH 2/2] fix: removes join import

---
 src/OptimaLab35/gui.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/OptimaLab35/gui.py b/src/OptimaLab35/gui.py
index 985a96d..35d8707 100644
--- a/src/OptimaLab35/gui.py
+++ b/src/OptimaLab35/gui.py
@@ -1,4 +1,3 @@
-from os.path import join
 import sys
 import os
 from datetime import datetime