diff --git a/app.py b/app.py index deedefc..bea1e78 100644 --- a/app.py +++ b/app.py @@ -1,9 +1,10 @@ import os +from pathlib import Path from dotenv import load_dotenv -dotenv_path = os.path.join(os.path.dirname(__file__), '.env') -if os.path.exists(dotenv_path): +dotenv_path = Path(__file__).resolve().parent / '.env' +if dotenv_path.exists(): load_dotenv(dotenv_path) from greybook import create_app # noqa diff --git a/greybook/blueprints/admin.py b/greybook/blueprints/admin.py index cce140f..b0df347 100644 --- a/greybook/blueprints/admin.py +++ b/greybook/blueprints/admin.py @@ -1,5 +1,3 @@ -import os - from flask import Blueprint, abort, current_app, flash, redirect, render_template, request, url_for from flask_ckeditor import upload_fail, upload_success from flask_login import current_user, login_required @@ -280,6 +278,6 @@ def upload_image(): if not allowed_file(f.filename): return upload_fail('Image only!') filename = random_filename(f.filename) - f.save(os.path.join(current_app.config['GREYBOOK_UPLOAD_PATH'], filename)) + f.save(current_app.config['GREYBOOK_UPLOAD_PATH'] / filename) url = url_for('blog.get_image', filename=filename) return upload_success(url, filename) diff --git a/greybook/core/commands.py b/greybook/core/commands.py index eb729d9..7d2ae23 100644 --- a/greybook/core/commands.py +++ b/greybook/core/commands.py @@ -1,5 +1,3 @@ -import os - import click from flask import current_app from sqlalchemy import select @@ -56,9 +54,9 @@ def init_blog_command(username, password): db.session.commit() - upload_path = os.path.join(current_app.config['GREYBOOK_UPLOAD_PATH']) - if not os.path.exists(upload_path): - os.makedirs(upload_path) + upload_path = current_app.config['GREYBOOK_UPLOAD_PATH'] + if not upload_path.exists(): + upload_path.mkdir(parents=True, exist_ok=True) click.echo('Created the upload folder.') @app.cli.command('lorem') diff --git a/greybook/models.py b/greybook/models.py index d94216b..f5c7883 100644 --- a/greybook/models.py +++ b/greybook/models.py @@ -1,4 +1,3 @@ -import os import re from datetime import datetime, timezone from typing import List, Optional @@ -88,9 +87,9 @@ def delete(self): upload_url = url_for('blog.get_image', filename='') images = re.findall(rf'