move bundle_dir to globals

Author: ScriptSmith

components/globals.py

@@ -1,8 +1,20 @@
 import appdirs
+import sys
+import os
 
 APP_NAME = "Reaper"
 APP_AUTHOR = "UQ"
 
 DATA_DIR = appdirs.user_data_dir(APP_NAME, APP_AUTHOR)
 LOG_DIR = appdirs.user_log_dir(APP_NAME, APP_AUTHOR)
 CACHE_DIR = appdirs.user_cache_dir(APP_NAME, APP_AUTHOR)
+
+def _calc_path(path):
+    head, tail = os.path.split(path)
+    if tail == 'reaper':
+        return path
+    else:
+        return _calc_path(head)
+
+BUNDLE_DIR = sys._MEIPASS if getattr(sys, "frozen", False) else \
+    _calc_path(os.path.dirname(os.path.abspath(__file__)))

components/sources.py

@@ -3,6 +3,7 @@
 from os import sep, path
 
 from components.widgets.nodes import *
+from components.globals import BUNDLE_DIR
 
 
 class NodeTree(QtWidgets.QTreeWidget):
@@ -424,7 +425,7 @@ def tree_click(item, column_no):
         item.sourceDescription.setCurrentIndex(item.pageIndex)
 
     def read_sources(self):
-        tree = ET.parse(f"{self.mainWindow.bundle_dir}{sep}{self.sourceFile}")
+        tree = ET.parse(f"{BUNDLE_DIR}{sep}{self.sourceFile}")
         sources_root = tree.getroot()
         source_files = sources_root.findall("source")
 
@@ -434,7 +435,7 @@ def read_sources(self):
             location = source_file.find("location").text
 
             source_tree = ET.parse(
-                f"{self.mainWindow.bundle_dir}{sep}sources/{location}"
+                f"{BUNDLE_DIR}{sep}sources/{location}"
             )
             source_root = source_tree.getroot()
             sources.append(source_root)

components/widgets/nodes.py

@@ -3,7 +3,9 @@
 from collections import OrderedDict
 from os import getcwd, path, sep
 
+
 from PyQt5 import QtWidgets, QtCore, QtGui
+from components.globals import BUNDLE_DIR
 
 
 class PrimaryInputWindow(QtWidgets.QMainWindow):
@@ -310,13 +312,13 @@ def __init__(self, primaryWindow, mainWindow, parent=None):
         self.data = []
 
         self.readAction = self.addAction(
-            QtGui.QIcon(f"{mainWindow.bundle_dir}{sep}ui/read.png"),
+            QtGui.QIcon(f"{BUNDLE_DIR}{sep}ui/read.png"),
             self.TrailingPosition,
         )
         self.readAction.triggered.connect(self.add_file)
 
         self.clearAction = self.addAction(
-            QtGui.QIcon(f"{mainWindow.bundle_dir}{sep}ui/remove.png"),
+            QtGui.QIcon(f"{BUNDLE_DIR}{sep}ui/remove.png"),
             self.TrailingPosition,
         )
         self.clearAction.triggered.connect(self.clear_file)

components/windows.py

@@ -73,33 +73,31 @@ def __init__(self, text, details, parent=None):
 
 class LicenseWindow(ScrollWindow):
 
-    def __init__(self, bundle_dir, parent=None):
+    def __init__(self, parent=None):
         super().__init__("Software licenses", "Licenses", parent=parent)
         self.setFixedWidth(400)
 
-        self.bundle_dir = bundle_dir
-
-        with open(f"{self.bundle_dir}{sep}LICENSE.txt", "r") as f:
+        with open(f"{BUNDLE_DIR}{sep}LICENSE.txt", "r") as f:
             reaper = LicenseWidget("Reaper GPL license", f.read(), self)
             self.contents.layout.addWidget(reaper)
 
-        with open(f"{self.bundle_dir}{sep}licenses/socialreaper.txt", "r") as f:
+        with open(f"{BUNDLE_DIR}{sep}licenses/socialreaper.txt", "r") as f:
             reaper = LicenseWidget("Social Reaper MIT license", f.read(), self)
             self.contents.layout.addWidget(reaper)
 
-        with open(f"{self.bundle_dir}{sep}LICENSE.txt", "r") as f:
+        with open(f"{BUNDLE_DIR}{sep}LICENSE.txt", "r") as f:
             reaper = LicenseWidget("PyQt GPL license", f.read(), self)
             self.contents.layout.addWidget(reaper)
 
-        with open(f"{self.bundle_dir}{sep}licenses/requests.txt", "r") as f:
+        with open(f"{BUNDLE_DIR}{sep}licenses/requests.txt", "r") as f:
             reaper = LicenseWidget("Requests Apache license", f.read(), self)
             self.contents.layout.addWidget(reaper)
 
-        with open(f"{self.bundle_dir}{sep}licenses/requests-oauthlib.txt", "r") as f:
+        with open(f"{BUNDLE_DIR}{sep}licenses/requests-oauthlib.txt", "r") as f:
             reaper = LicenseWidget("Requests-OAuthLib ISC license", f.read(), self)
             self.contents.layout.addWidget(reaper)
 
-        with open(f"{self.bundle_dir}{sep}licenses/oauthlib.txt", "r") as f:
+        with open(f"{BUNDLE_DIR}{sep}licenses/oauthlib.txt", "r") as f:
             reaper = LicenseWidget("OAuthLib BSD license", f.read(), self)
             self.contents.layout.addWidget(reaper)
 

reaper.py

@@ -60,10 +60,6 @@ def __init__(self, window, app, splash, show=True):
         self.dark_mode = False
 
         self.splash_msg("Identifying app type")
-        if getattr(sys, "frozen", False):
-            self.bundle_dir = sys._MEIPASS
-        else:
-            self.bundle_dir = os.path.dirname(os.path.abspath(__file__))
 
         # Add windows and actions
         self.splash_msg("Connecting widgets")
@@ -77,7 +73,7 @@ def __init__(self, window, app, splash, show=True):
         self.queue.job_error_log.connect(self.error_window.log_error)
         self.error_window.cancelButton.clicked.connect(self.queue.stop_retrying)
 
-        self.splash_msg("Adding iconds")
+        self.splash_msg("Adding icons")
         self.set_icons()
 
         # Create queue table
@@ -135,7 +131,7 @@ def add_actions(self):
         self.actionAPI_Keys.triggered.connect(self.export_keys)
 
     def add_windows(self):
-        self.license_window = LicenseWindow(self.bundle_dir, self.window)
+        self.license_window = LicenseWindow(self.window)
         self.actionLicenses.triggered.connect(self.license_window.pop)
 
         self.error_window = ErrorWindow(self.window)
@@ -144,10 +140,10 @@ def add_windows(self):
         self.actionSettings.triggered.connect(self.settings_window.show)
 
     def set_icons(self):
-        self.queueUp.setIcon(QIcon(f"{self.bundle_dir}{sep}ui/up.png"))
-        self.queueDown.setIcon(QIcon(f"{self.bundle_dir}{sep}ui/down.png"))
-        self.queueRemove.setIcon(QIcon(f"{self.bundle_dir}{sep}ui/remove.png"))
-        self.window.setWindowIcon(QIcon(f"{self.bundle_dir}{sep}ui/icon.ico"))
+        self.queueUp.setIcon(QIcon(f"{BUNDLE_DIR}{sep}ui/up.png"))
+        self.queueDown.setIcon(QIcon(f"{BUNDLE_DIR}{sep}ui/down.png"))
+        self.queueRemove.setIcon(QIcon(f"{BUNDLE_DIR}{sep}ui/remove.png"))
+        self.window.setWindowIcon(QIcon(f"{BUNDLE_DIR}{sep}ui/icon.ico"))
 
     def show_error_manager(self, _):
         self.error_window.show()