From ac3d34d2d7c63c2e4c7ea5ed1124e3afacf2091f Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Tue, 11 Mar 2025 11:55:58 +0100 Subject: fixed some stuff --- .gitignore | 1 + app.py | 14 ++++++++++---- database.py | 5 ++++- pyproject.toml | 9 +++++++++ uv.lock | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 791e527..56f2aad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ __pycache__/ .venv/ content/ +website.egg-info/ .python-version *.db diff --git a/app.py b/app.py index e4f2f7d..610cf8a 100755 --- a/app.py +++ b/app.py @@ -1,5 +1,6 @@ from paste.translogger import TransLogger from waitress import serve +from pathlib import Path import datetime import database @@ -11,6 +12,8 @@ import os app = flask.Flask(__name__) +THIS_FOLDER = Path(__file__).parent.resolve() + def get_correct_article_headers(db:database.Database, title): db_headers = list(db.get_header_links()) if title in [i[0] for i in db_headers]: @@ -33,7 +36,7 @@ def get_template_items(title, db): @app.route("/~") def index(): with database.Database() as db: - with open(os.path.join("static", "index.md"), "r") as f: + with open(os.path.join(THIS_FOLDER, "static", "index.md"), "r") as f: return flask.render_template( "index.html.j2", **get_template_items("eva's site", db), @@ -42,7 +45,7 @@ def index(): @app.route("/robots.txt") def robots(): - return flask.send_from_directory("static", "robots.txt") + return flask.send_from_directory(THIS_FOLDER, "static", "robots.txt") @app.route("/thoughts") def get_thoughts(): @@ -83,11 +86,14 @@ def get_thought(): category = category_name ) -if __name__ == "__main__": +def main(): try: if sys.argv[1] == "--production": - serve(TransLogger(app), host='0.0.0.0', port = 6969) + serve(TransLogger(app), host='0.0.0.0', port = 5173) else: app.run(host = "0.0.0.0", port = 5001, debug = True) except IndexError: app.run(host = "0.0.0.0", port = 5001, debug = True) + +if __name__ == "__main__": + main() diff --git a/database.py b/database.py index a910a07..a6c6c77 100755 --- a/database.py +++ b/database.py @@ -1,12 +1,15 @@ from dataclasses import dataclass +from pathlib import Path import sqlite3 import datetime +THIS_FOLDER = Path(__file__).parent.resolve() + @dataclass class Database: def __enter__(self): - self.__connection = sqlite3.connect("website.db") + self.__connection = sqlite3.connect(f"{THIS_FOLDER}/website.db") return self def __exit__(self, type, value, traceback): diff --git a/pyproject.toml b/pyproject.toml index dc77b1b..5eab0bf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,3 +14,12 @@ dependencies = [ "pygments>=2.19.1", "waitress>=3.0.2", ] + +[tool.uv] +package = true + +[tool.setuptools] +py-modules = ['app', 'database', 'parser'] + +[project.scripts] +start-website = "app:main" diff --git a/uv.lock b/uv.lock index cab9c34..eb1df2a 100644 --- a/uv.lock +++ b/uv.lock @@ -211,7 +211,7 @@ wheels = [ [[package]] name = "website" version = "0.1.0" -source = { virtual = "." } +source = { editable = "." } dependencies = [ { name = "flask" }, { name = "houdini-py" }, -- cgit v1.2.3