use global variables for appdirs paths

ScriptSmith · ScriptSmith · commit ecfc07d2d7cb · 2018-05-23T14:01:24.000+10:00
diff --git a/components/globals.py b/components/globals.py
@@ -0,0 +1,8 @@
+import appdirs
+
+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)
diff --git a/components/job_queue.py b/components/job_queue.py
@@ -7,11 +7,12 @@
 from uuid import uuid4
 
 from PyQt5 import QtCore
-from appdirs import user_log_dir, user_cache_dir
 
 import socialreaper
 from socialreaper import IterError
 
+from components.globals import *
+
 
 class QueueState(Enum):
     RUNNING = "running"
@@ -31,7 +32,7 @@ def __init__(self, cache=True):
         self.MAX_ROWS = 1000
 
         self.cache_enabled = cache
-        self.location = path.join(user_cache_dir('Reaper', 'UQ'), str(uuid4()))
+        self.location = path.join(CACHE_DIR, str(uuid4()))
         self.cache_count = 0
         self.failed = False
 
@@ -208,7 +209,7 @@ def pickle(self):
         self.log_function = None
         self.job_update = None
 
-        dir = user_log_dir('Reaper', 'UQ')
+        dir = LOG_DIR
 
         if not path.exists(dir):
             makedirs(dir)
diff --git a/components/widgets/nodes.py b/components/widgets/nodes.py
@@ -119,7 +119,7 @@ def extract_file(self):
 
     def read_csv_headings(self):
         self.columnName.clear()
-        with open(self.filePath, 'r', encoding='utf-8') as f:
+        with open(self.filePath, 'r', encoding='utf-8', newline='') as f:
             reader = csv.DictReader(f)
             for col in reader.fieldnames:
                 self.columnName.insertItem(self.columnName.count(), col)
diff --git a/components/windows.py b/components/windows.py
@@ -6,8 +6,8 @@
 
 from PyQt5 import QtWidgets, QtGui, QtCore
 from PyQt5.QtCore import pyqtSignal
-from appdirs import user_cache_dir
 
+from components.globals import *
 from .job_queue import Job
 from .widgets.nodes import PathWidget
 
@@ -212,7 +212,7 @@ class SettingsWindow(ScrollWindow):
     def __init__(self, parent):
         super().__init__("Settings", None, layout=QtWidgets.QFormLayout, parent=parent.window)
         self.setMinimumSize(400, 475)
-        self.location = f"{parent.data_dir}{sep}settings.json"
+        self.location = f"{DATA_DIR}{sep}settings.json"
         self.parent = parent
 
         self.data = {
@@ -287,7 +287,7 @@ def set_save_path(self, text):
         self.data['save_path'] = text
 
     def clear_cache(self, boolean):
-        rmtree(user_cache_dir('Reaper', 'UQ'), ignore_errors=True)
+        rmtree(CACHE_DIR, ignore_errors=True)
 
     def save(self, _):
         self.hide()
diff --git a/reaper.py b/reaper.py
@@ -24,7 +24,6 @@
 import qdarkstyle
 from PyQt5.QtCore import QUrl
 from PyQt5.QtGui import QIcon, QDesktopServices
-from appdirs import user_data_dir
 
 from components.job_queue import Queue
 from components.keys import KeyPage
@@ -33,6 +32,7 @@
 from components.widgets.progress import ProgressWidget
 from components.widgets.queue import QueueTable
 from components.windows import *
+from components.globals import *
 from ui.mainwindow import Ui_MainWindow
 
 
@@ -65,8 +65,6 @@ def __init__(self, window, app, show=True):
         else:
             self.bundle_dir = os.path.dirname(os.path.abspath(__file__))
 
-        self.data_dir = user_data_dir("Reaper", "UQ")
-
         # Add windows and actions
         self.add_windows()
         self.add_actions()
@@ -87,7 +85,7 @@ def __init__(self, window, app, show=True):
         self.primaryInputWindow = PrimaryInputWindow(window)
 
         # Create api key page
-        self.key_page = KeyPage(self.scrollAreaWidgetContents, self.data_dir)
+        self.key_page = KeyPage(self.scrollAreaWidgetContents, DATA_DIR)
 
         # Create sources page
         self.source_tabs = SourceTabs(self, self.key_page, self.source_file, self.primaryInputWindow)
