[PR #17] [MERGED] Dev edition merge #17

New issue

Closed

opened 2026-02-28 15:18:48 +03:00 by kerem · 0 comments

kerem commented

2026-02-28 15:18:48 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/TheTedLab/SpotiStats/pull/17
Author: @TheTedLab
Created: 12/14/2023
Status: ✅ Merged
Merged: 12/14/2023
Merged by: @TheTedLab

Base: main ← Head: dev

📝 Commits (10+)

a5d4ae5 Add entity definition - on conflict update
a720066 Update entity definition - on conflict do nothing
5ad8cfb Complete saveArtist action
0116760 Add api for retrieving stats; prepare docker for api
5dedaac Add flags for python optimization
9e1f6b8 Fix CORS
dd7738b Implement web side
7d4cd4d API service depends on DB
485078d Restructure and dockerize web
5d8bc3e Merge pull request #4 from TheTedLab/web

📊 Changes

51 files changed (+39516 additions, -7 deletions)

View changed files

📝 .gitignore (+145 -1)
➕ src/aggregator/Dockerfile (+18 -0)
📝 src/aggregator/__init__.py (+0 -0)
➕ src/aggregator/aggregator.py (+400 -0)
➕ src/aggregator/artist_aggregate.py (+80 -0)
➕ src/aggregator/auth_credentials.template (+13 -0)
➕ src/aggregator/classes/__init__.py (+0 -0)
➕ src/aggregator/classes/album.py (+14 -0)
➕ src/aggregator/classes/artist.py (+14 -0)
➕ src/aggregator/classes/track.py (+30 -0)
➕ src/aggregator/requirements.txt (+0 -0)
➕ src/aggregator/resources/artists-ids-list.json (+12981 -0)
➕ src/aggregator/resources/artists/artist-00FQb4jTyendYWaN8pK0wa.json (+7513 -0)
➕ src/aggregator/resources/artists/artist-0M2HHtY3OOQzIZxrHkbJLT.json (+2030 -0)
➕ src/aggregator/resources/artists/artist-4tZwfgrHOc3mvqYlEYSvVi.json (+7850 -0)
➕ src/aggregator/resources/spotify-followed-artists.json (+1809 -0)
➕ src/aggregator/save_artist.py (+26 -0)
➕ src/aggregator/server_vars.py (+2 -0)
➕ src/aggregator/stats_from_files.py (+86 -0)
➕ src/aggregator/stats_update.py (+91 -0)

...and 31 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/TheTedLab/SpotiStats/pull/17 **Author:** [@TheTedLab](https://github.com/TheTedLab) **Created:** 12/14/2023 **Status:** ✅ Merged **Merged:** 12/14/2023 **Merged by:** [@TheTedLab](https://github.com/TheTedLab) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`a5d4ae5`](https://github.com/TheTedLab/SpotiStats/commit/a5d4ae57b6c2f2223632844b09882c29f3c8cbd7) Add entity definition - on conflict update - [`a720066`](https://github.com/TheTedLab/SpotiStats/commit/a7200669fe8b4c7963579c2d70068c038ff8c475) Update entity definition - on conflict do nothing - [`5ad8cfb`](https://github.com/TheTedLab/SpotiStats/commit/5ad8cfb5ec05cf382fbdb9fa068d17c1e39b0116) Complete saveArtist action - [`0116760`](https://github.com/TheTedLab/SpotiStats/commit/011676037c2f4efc26e23f6f812ef630097cbb3b) Add api for retrieving stats; prepare docker for api - [`5dedaac`](https://github.com/TheTedLab/SpotiStats/commit/5dedaac9ced253205a88dd2c49d3f1ee649587a4) Add flags for python optimization - [`9e1f6b8`](https://github.com/TheTedLab/SpotiStats/commit/9e1f6b8e4383940a2b41978d9d0c24511636fd44) Fix CORS - [`dd7738b`](https://github.com/TheTedLab/SpotiStats/commit/dd7738b86b80c35c1c32d66a25a489a6ab1e2393) Implement web side - [`7d4cd4d`](https://github.com/TheTedLab/SpotiStats/commit/7d4cd4d78510bd8f2471b79f7a2f4322475150ba) API service depends on DB - [`485078d`](https://github.com/TheTedLab/SpotiStats/commit/485078db90d86dfc5a58ec433f10008bbe020316) Restructure and dockerize web - [`5d8bc3e`](https://github.com/TheTedLab/SpotiStats/commit/5d8bc3e7cbcff785de7f08f957c7150d67bd64b1) Merge pull request #4 from TheTedLab/web ### 📊 Changes **51 files changed** (+39516 additions, -7 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+145 -1) ➕ `src/aggregator/Dockerfile` (+18 -0) 📝 `src/aggregator/__init__.py` (+0 -0) ➕ `src/aggregator/aggregator.py` (+400 -0) ➕ `src/aggregator/artist_aggregate.py` (+80 -0) ➕ `src/aggregator/auth_credentials.template` (+13 -0) ➕ `src/aggregator/classes/__init__.py` (+0 -0) ➕ `src/aggregator/classes/album.py` (+14 -0) ➕ `src/aggregator/classes/artist.py` (+14 -0) ➕ `src/aggregator/classes/track.py` (+30 -0) ➕ `src/aggregator/requirements.txt` (+0 -0) ➕ `src/aggregator/resources/artists-ids-list.json` (+12981 -0) ➕ `src/aggregator/resources/artists/artist-00FQb4jTyendYWaN8pK0wa.json` (+7513 -0) ➕ `src/aggregator/resources/artists/artist-0M2HHtY3OOQzIZxrHkbJLT.json` (+2030 -0) ➕ `src/aggregator/resources/artists/artist-4tZwfgrHOc3mvqYlEYSvVi.json` (+7850 -0) ➕ `src/aggregator/resources/spotify-followed-artists.json` (+1809 -0) ➕ `src/aggregator/save_artist.py` (+26 -0) ➕ `src/aggregator/server_vars.py` (+2 -0) ➕ `src/aggregator/stats_from_files.py` (+86 -0) ➕ `src/aggregator/stats_update.py` (+91 -0) _...and 31 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>