From a8bc73c532d72a594553f90a73a0a4594295654c Mon Sep 17 00:00:00 2001 From: Firq Date: Mon, 2 Oct 2023 15:55:13 +0200 Subject: [PATCH] moved from os to pathlib --- backend/src/config/api_settings.py | 5 ++--- backend/src/config/db_settings.py | 4 ++-- backend/src/database/database.py | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/backend/src/config/api_settings.py b/backend/src/config/api_settings.py index 5551acf..2d27cf9 100644 --- a/backend/src/config/api_settings.py +++ b/backend/src/config/api_settings.py @@ -1,5 +1,5 @@ # pylint: disable=too-few-public-methods -import os +from pathlib import Path import __main__ class DefaultSettings: @@ -26,5 +26,4 @@ class DefaultSettings: 'description': 'Support Organizer for FGO' } } - - FILE_SAVE_DIRECTORY = f"{os.path.dirname(__main__.__file__)}/temp" + FILE_SAVE_DIRECTORY = Path(__main__.__file__).parent / "temp" diff --git a/backend/src/config/db_settings.py b/backend/src/config/db_settings.py index 52a3a44..fb4dd24 100644 --- a/backend/src/config/db_settings.py +++ b/backend/src/config/db_settings.py @@ -1,6 +1,6 @@ # pylint: disable=too-few-public-methods -import os +from pathlib import Path import __main__ class DatabaseSettings: - DATABASE_DIRECTORY = f"{os.path.dirname(__main__.__file__)}/database/storage" + DATABASE_DIRECTORY = Path(__main__.__file__).parent / "database/storage" diff --git a/backend/src/database/database.py b/backend/src/database/database.py index 6c58890..37aa28d 100644 --- a/backend/src/database/database.py +++ b/backend/src/database/database.py @@ -1,6 +1,5 @@ # pylint: disable=too-few-public-methods -import os import dictdatabase as DDB from config.db_settings import DatabaseSettings @@ -13,8 +12,8 @@ class Database: """ __instance = None db = DDB - if not os.path.isdir(DatabaseSettings.DATABASE_DIRECTORY): - os.mkdir(DatabaseSettings.DATABASE_DIRECTORY) + if not DatabaseSettings.DATABASE_DIRECTORY.is_dir(): + DatabaseSettings.DATABASE_DIRECTORY.mkdir() db.config.storage_directory = DatabaseSettings.DATABASE_DIRECTORY if not db.at("requests").exists(): db.at("requests").create({})