switched to dirpath(abspath()) to be save on linux

AndreWohnsland · Nov 20, 2021 · 48c7f7f · 48c7f7f
1 parent 281c8d0
commit 48c7f7f
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/config/config_manager.py b/config/config_manager.py
@@ -1,7 +1,7 @@
 import os
 import yaml
 
-CONFIG_FILE = os.path.join(os.path.dirname(__file__), "..", "custom_config.yaml")
+CONFIG_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "custom_config.yaml")
 
 
 class ConfigManager:

diff --git a/dashboard/backend/main.py b/dashboard/backend/main.py
@@ -8,7 +8,7 @@
 from pydantic import BaseModel
 
 DATABASE_NAME = "team"
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 database_path = os.path.join(DIRPATH, "storage", f"{DATABASE_NAME}.db")
 
 app = FastAPI()

diff --git a/dashboard/frontend/main.py b/dashboard/frontend/main.py
@@ -20,7 +20,7 @@
 mpl.rcParams.update({'text.color': "white", 'axes.labelcolor': "white"})
 
 DATABASE_NAME = "team"
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 load_dotenv(os.path.join(DIRPATH, ".language.env"))
 database_path = os.path.join(DIRPATH, "storage", f"{DATABASE_NAME}.db")
 

diff --git a/microservice/database.py b/microservice/database.py
@@ -3,7 +3,7 @@
 import sqlite3
 
 DATABASE_NAME = "failed_data"
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 
 
 class DatabaseHandler:

diff --git a/src/database_commander.py b/src/database_commander.py
@@ -6,7 +6,7 @@
 from typing import Any, Dict, List
 
 DATABASE_NAME = "Cocktail_database"
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 
 
 class DatabaseCommander:

diff --git a/src/logger_handler.py b/src/logger_handler.py
@@ -1,7 +1,7 @@
 import os
 import logging
 
-dirpath = os.path.dirname(__file__)
+dirpath = os.path.dirname(os.path.abspath(__file__))
 
 
 class LoggerHandler:

diff --git a/src/save_handler.py b/src/save_handler.py
@@ -6,7 +6,7 @@
 from src.display_controller import DP_CONTROLLER
 from src.service_handler import SERVICE_HANDLER
 
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 
 
 class SaveHandler:

diff --git a/src_ui/setup_mainwindow.py b/src_ui/setup_mainwindow.py
@@ -40,7 +40,8 @@ def __init__(self, parent=None):
         self.logger_handler.log_start_program()
         self.connect_objects()
         self.connect_other_windows()
-        self.icon_path = os.path.join(os.path.dirname(__file__), "..", "ui_elements", "Cocktail-icon.png")
+        self.icon_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                                      "..", "ui_elements", "Cocktail-icon.png")
         # as long as its not UI_DEVENVIRONMENT (usually touchscreen) hide the cursor
         if not self.UI_DEVENVIRONMENT:
             self.setCursor(Qt.BlankCursor)