From b6bd448d4fa7beee25c55765ea15c30dd0d19188 Mon Sep 17 00:00:00 2001 From: Chris Fulljames Date: Sun, 30 Mar 2025 14:04:28 -0400 Subject: [PATCH] Convert from standalone module to package --- .gitignore | 1 + pyproject.toml | 17 +++++++++++++++++ main.py => src/littlesongplace/__init__.py | 7 +++++-- .../littlesongplace/static}/coloris.min.css | 0 .../littlesongplace/static}/coloris.min.js | 0 .../static}/littlesongplace02.gif | Bin .../littlesongplace/static}/lsp_btn_add02.gif | Bin .../static}/lsp_btn_delete02.gif | Bin .../littlesongplace/static}/lsp_btn_edit02.gif | Bin .../littlesongplace/static}/lsp_btn_hide02.gif | Bin .../littlesongplace/static}/lsp_btn_next02.gif | Bin .../static}/lsp_btn_pause02.gif | Bin .../littlesongplace/static}/lsp_btn_play02.gif | Bin .../littlesongplace/static}/lsp_btn_prev02.gif | Bin .../littlesongplace/static}/lsp_btn_show02.gif | Bin .../littlesongplace/static}/lsp_notes.png | Bin {static => src/littlesongplace/static}/nav.js | 0 .../littlesongplace/static}/player.js | 0 .../littlesongplace/static}/styles.css | 0 .../littlesongplace/templates}/activity.html | 0 .../littlesongplace/templates}/base.html | 0 .../templates}/comment-thread.html | 0 .../littlesongplace/templates}/comment.html | 0 .../littlesongplace/templates}/edit-song.html | 0 .../littlesongplace/templates}/index.html | 0 .../littlesongplace/templates}/login.html | 0 .../littlesongplace/templates}/news.html | 0 .../littlesongplace/templates}/playlist.html | 0 .../littlesongplace/templates}/profile.html | 0 .../littlesongplace/templates}/signup.html | 0 .../littlesongplace/templates}/song-list.html | 0 .../templates}/song-macros.html | 0 .../littlesongplace/templates}/song.html | 0 .../templates}/songs-by-tag.html | 0 34 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 pyproject.toml rename main.py => src/littlesongplace/__init__.py (99%) rename {static => src/littlesongplace/static}/coloris.min.css (100%) rename {static => src/littlesongplace/static}/coloris.min.js (100%) rename {static => src/littlesongplace/static}/littlesongplace02.gif (100%) rename {static => src/littlesongplace/static}/lsp_btn_add02.gif (100%) rename {static => src/littlesongplace/static}/lsp_btn_delete02.gif (100%) rename {static => src/littlesongplace/static}/lsp_btn_edit02.gif (100%) rename {static => src/littlesongplace/static}/lsp_btn_hide02.gif (100%) rename {static => src/littlesongplace/static}/lsp_btn_next02.gif (100%) rename {static => src/littlesongplace/static}/lsp_btn_pause02.gif (100%) rename {static => src/littlesongplace/static}/lsp_btn_play02.gif (100%) rename {static => src/littlesongplace/static}/lsp_btn_prev02.gif (100%) rename {static => src/littlesongplace/static}/lsp_btn_show02.gif (100%) rename {static => src/littlesongplace/static}/lsp_notes.png (100%) rename {static => src/littlesongplace/static}/nav.js (100%) rename {static => src/littlesongplace/static}/player.js (100%) rename {static => src/littlesongplace/static}/styles.css (100%) rename {templates => src/littlesongplace/templates}/activity.html (100%) rename {templates => src/littlesongplace/templates}/base.html (100%) rename {templates => src/littlesongplace/templates}/comment-thread.html (100%) rename {templates => src/littlesongplace/templates}/comment.html (100%) rename {templates => src/littlesongplace/templates}/edit-song.html (100%) rename {templates => src/littlesongplace/templates}/index.html (100%) rename {templates => src/littlesongplace/templates}/login.html (100%) rename {templates => src/littlesongplace/templates}/news.html (100%) rename {templates => src/littlesongplace/templates}/playlist.html (100%) rename {templates => src/littlesongplace/templates}/profile.html (100%) rename {templates => src/littlesongplace/templates}/signup.html (100%) rename {templates => src/littlesongplace/templates}/song-list.html (100%) rename {templates => src/littlesongplace/templates}/song-macros.html (100%) rename {templates => src/littlesongplace/templates}/song.html (100%) rename {templates => src/littlesongplace/templates}/songs-by-tag.html (100%) diff --git a/.gitignore b/.gitignore index aee6f1c..ded378a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ venv .venv .data __pycache__ +*.egg-info database.db songs images diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..7304c26 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,17 @@ +[project] +name = "littlesongplace" +version = "1.0.0" +dependencies = [ + "bcrypt", + "bleach[css]", + "flask", + "gunicorn", + "pillow", + "yt-dlp", +] +requires-python = ">=3.11" + +[build-system] +requires = ["setuptools >= 77.0.3"] +build-backend = "setuptools.build_meta" + diff --git a/main.py b/src/littlesongplace/__init__.py similarity index 99% rename from main.py rename to src/littlesongplace/__init__.py index 67ca490..c8cdf95 100644 --- a/main.py +++ b/src/littlesongplace/__init__.py @@ -29,8 +29,8 @@ from yt_dlp import YoutubeDL from yt_dlp.utils import DownloadError DB_VERSION = 4 -DATA_DIR = Path(os.environ["DATA_DIR"]) if "DATA_DIR" in os.environ else Path(".data") SCRIPT_DIR = Path(__file__).parent +DATA_DIR = Path(os.environ["DATA_DIR"]) if "DATA_DIR" in os.environ else Path(".data").absolute() # Make sure DATA_DIR exists os.makedirs(DATA_DIR, exist_ok=True) @@ -263,7 +263,10 @@ def edit_profile(): @app.get("/pfp/") def pfp(userid): - return send_from_directory(DATA_DIR / "images" / str(userid), "pfp.jpg") + print(userid) + print(get_user_images_path(userid).exists()) + print((get_user_images_path(userid)/"pfp.jpg").exists()) + return send_from_directory(get_user_images_path(userid), "pfp.jpg") @app.get("/edit-song") def edit_song(): diff --git a/static/coloris.min.css b/src/littlesongplace/static/coloris.min.css similarity index 100% rename from static/coloris.min.css rename to src/littlesongplace/static/coloris.min.css diff --git a/static/coloris.min.js b/src/littlesongplace/static/coloris.min.js similarity index 100% rename from static/coloris.min.js rename to src/littlesongplace/static/coloris.min.js diff --git a/static/littlesongplace02.gif b/src/littlesongplace/static/littlesongplace02.gif similarity index 100% rename from static/littlesongplace02.gif rename to src/littlesongplace/static/littlesongplace02.gif diff --git a/static/lsp_btn_add02.gif b/src/littlesongplace/static/lsp_btn_add02.gif similarity index 100% rename from static/lsp_btn_add02.gif rename to src/littlesongplace/static/lsp_btn_add02.gif diff --git a/static/lsp_btn_delete02.gif b/src/littlesongplace/static/lsp_btn_delete02.gif similarity index 100% rename from static/lsp_btn_delete02.gif rename to src/littlesongplace/static/lsp_btn_delete02.gif diff --git a/static/lsp_btn_edit02.gif b/src/littlesongplace/static/lsp_btn_edit02.gif similarity index 100% rename from static/lsp_btn_edit02.gif rename to src/littlesongplace/static/lsp_btn_edit02.gif diff --git a/static/lsp_btn_hide02.gif b/src/littlesongplace/static/lsp_btn_hide02.gif similarity index 100% rename from static/lsp_btn_hide02.gif rename to src/littlesongplace/static/lsp_btn_hide02.gif diff --git a/static/lsp_btn_next02.gif b/src/littlesongplace/static/lsp_btn_next02.gif similarity index 100% rename from static/lsp_btn_next02.gif rename to src/littlesongplace/static/lsp_btn_next02.gif diff --git a/static/lsp_btn_pause02.gif b/src/littlesongplace/static/lsp_btn_pause02.gif similarity index 100% rename from static/lsp_btn_pause02.gif rename to src/littlesongplace/static/lsp_btn_pause02.gif diff --git a/static/lsp_btn_play02.gif b/src/littlesongplace/static/lsp_btn_play02.gif similarity index 100% rename from static/lsp_btn_play02.gif rename to src/littlesongplace/static/lsp_btn_play02.gif diff --git a/static/lsp_btn_prev02.gif b/src/littlesongplace/static/lsp_btn_prev02.gif similarity index 100% rename from static/lsp_btn_prev02.gif rename to src/littlesongplace/static/lsp_btn_prev02.gif diff --git a/static/lsp_btn_show02.gif b/src/littlesongplace/static/lsp_btn_show02.gif similarity index 100% rename from static/lsp_btn_show02.gif rename to src/littlesongplace/static/lsp_btn_show02.gif diff --git a/static/lsp_notes.png b/src/littlesongplace/static/lsp_notes.png similarity index 100% rename from static/lsp_notes.png rename to src/littlesongplace/static/lsp_notes.png diff --git a/static/nav.js b/src/littlesongplace/static/nav.js similarity index 100% rename from static/nav.js rename to src/littlesongplace/static/nav.js diff --git a/static/player.js b/src/littlesongplace/static/player.js similarity index 100% rename from static/player.js rename to src/littlesongplace/static/player.js diff --git a/static/styles.css b/src/littlesongplace/static/styles.css similarity index 100% rename from static/styles.css rename to src/littlesongplace/static/styles.css diff --git a/templates/activity.html b/src/littlesongplace/templates/activity.html similarity index 100% rename from templates/activity.html rename to src/littlesongplace/templates/activity.html diff --git a/templates/base.html b/src/littlesongplace/templates/base.html similarity index 100% rename from templates/base.html rename to src/littlesongplace/templates/base.html diff --git a/templates/comment-thread.html b/src/littlesongplace/templates/comment-thread.html similarity index 100% rename from templates/comment-thread.html rename to src/littlesongplace/templates/comment-thread.html diff --git a/templates/comment.html b/src/littlesongplace/templates/comment.html similarity index 100% rename from templates/comment.html rename to src/littlesongplace/templates/comment.html diff --git a/templates/edit-song.html b/src/littlesongplace/templates/edit-song.html similarity index 100% rename from templates/edit-song.html rename to src/littlesongplace/templates/edit-song.html diff --git a/templates/index.html b/src/littlesongplace/templates/index.html similarity index 100% rename from templates/index.html rename to src/littlesongplace/templates/index.html diff --git a/templates/login.html b/src/littlesongplace/templates/login.html similarity index 100% rename from templates/login.html rename to src/littlesongplace/templates/login.html diff --git a/templates/news.html b/src/littlesongplace/templates/news.html similarity index 100% rename from templates/news.html rename to src/littlesongplace/templates/news.html diff --git a/templates/playlist.html b/src/littlesongplace/templates/playlist.html similarity index 100% rename from templates/playlist.html rename to src/littlesongplace/templates/playlist.html diff --git a/templates/profile.html b/src/littlesongplace/templates/profile.html similarity index 100% rename from templates/profile.html rename to src/littlesongplace/templates/profile.html diff --git a/templates/signup.html b/src/littlesongplace/templates/signup.html similarity index 100% rename from templates/signup.html rename to src/littlesongplace/templates/signup.html diff --git a/templates/song-list.html b/src/littlesongplace/templates/song-list.html similarity index 100% rename from templates/song-list.html rename to src/littlesongplace/templates/song-list.html diff --git a/templates/song-macros.html b/src/littlesongplace/templates/song-macros.html similarity index 100% rename from templates/song-macros.html rename to src/littlesongplace/templates/song-macros.html diff --git a/templates/song.html b/src/littlesongplace/templates/song.html similarity index 100% rename from templates/song.html rename to src/littlesongplace/templates/song.html diff --git a/templates/songs-by-tag.html b/src/littlesongplace/templates/songs-by-tag.html similarity index 100% rename from templates/songs-by-tag.html rename to src/littlesongplace/templates/songs-by-tag.html -- 2.39.5