From b01aa43f322fb79d700da026c40d6f7f63c88d84 Mon Sep 17 00:00:00 2001 From: Kosh Date: Sun, 15 Oct 2023 13:50:52 +0530 Subject: [PATCH] Make the file paths cross-platform compatible --- backend/data_handler.py | 6 ++++-- backend/rest_api.py | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/backend/data_handler.py b/backend/data_handler.py index d9d7a83..99adefb 100644 --- a/backend/data_handler.py +++ b/backend/data_handler.py @@ -54,7 +54,8 @@ class DataHandler: WARNING:- If this is the first time the app is opened, the user_name will be shown as wrong """ - self.__file_path = appdirs.user_data_dir(appname="Unnamed_Password_Manager") + self.__file_path = appdirs.user_data_dir() + self.__file_path = path.join(self.__file_path, "Unnamed_Password_Manager") self.__user_name = user_name self.__file_path = path.join(self.__file_path, self.__user_name) self.__password = password @@ -77,7 +78,8 @@ class DataHandler: If user_name exists, ValueError is thrown """ file_path = path.join( - appdirs.user_data_dir(appname="Unnamed_Password_Manager"), + appdirs.user_data_dir(), + "Unnamed_Password_Manager", user_name ) if path.exists(file_path): diff --git a/backend/rest_api.py b/backend/rest_api.py index c0dcf32..7cd1cd1 100644 --- a/backend/rest_api.py +++ b/backend/rest_api.py @@ -10,7 +10,11 @@ app: Flask = Flask(__name__) def handle_first_launched(): - folder_path: str = appdirs.user_data_dir(appname="Unnamed_Password_Manager") + """ + Makes sure everything is initialized correctly + """ + folder_path: str = appdirs.user_data_dir() + folder_path = path.join(folder_path, "Unnamed_Password_Manager") if not path.exists(folder_path): mkdir(folder_path)