Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
commit
fa73c6de66
5 changed files with 58 additions and 10 deletions
|
@ -1,11 +1,15 @@
|
||||||
from flask import Flask, request, Response, jsonify
|
from flask import Flask, Response, jsonify, request
|
||||||
from flask_cors import CORS
|
from flask_cors import CORS
|
||||||
|
<<<<<<< HEAD
|
||||||
import dotenv
|
import dotenv
|
||||||
|
|
||||||
from .classes import Room
|
from .classes import Room
|
||||||
# from . import song_fetch
|
# from . import song_fetch
|
||||||
|
|
||||||
dotenv.load_dotenv()
|
dotenv.load_dotenv()
|
||||||
|
=======
|
||||||
|
from room import Room
|
||||||
|
>>>>>>> refs/remotes/origin/main
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
CORS(app)
|
CORS(app)
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
from dataclasses import dataclass
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
|
||||||
class Room:
|
|
||||||
id: int
|
|
||||||
coord: ...
|
|
||||||
name: str
|
|
||||||
pin: int | None
|
|
6
backend/src/connect.py
Normal file
6
backend/src/connect.py
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
import sqlite3
|
||||||
|
|
||||||
|
|
||||||
|
def get_connection():
|
||||||
|
conn = sqlite3.connect("jukebox.db")
|
||||||
|
return conn
|
18
backend/src/room.py
Normal file
18
backend/src/room.py
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
from dataclasses import dataclass
|
||||||
|
|
||||||
|
from song import Song
|
||||||
|
|
||||||
|
type UserScoredSong = tuple[Song, int]
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class Room:
|
||||||
|
id: int
|
||||||
|
coord: tuple[float, float]
|
||||||
|
name: str
|
||||||
|
pin: int | None
|
||||||
|
tags: set[str]
|
||||||
|
creative: bool
|
||||||
|
|
||||||
|
playlist: set[UserScoredSong]
|
||||||
|
history: list[Song]
|
29
backend/src/song.py
Normal file
29
backend/src/song.py
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from connect import get_connection
|
||||||
|
|
||||||
|
|
||||||
|
def init_db():
|
||||||
|
conn = get_connection()
|
||||||
|
cursor = conn.cursor()
|
||||||
|
cursor.execute("""
|
||||||
|
CREATE TABLE IF NOT EXISTS songs (
|
||||||
|
mbid TEXT PRIMARY KEY,
|
||||||
|
title TEXT NOT NULL,
|
||||||
|
artist TEXT NOT NULL,
|
||||||
|
tags TEXT NOT NULL,
|
||||||
|
lastfm_image_id TEXT NOT NULL,
|
||||||
|
youtube_id TEXT NOT NULL
|
||||||
|
);
|
||||||
|
""")
|
||||||
|
conn.commit()
|
||||||
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class Song:
|
||||||
|
mbid: str
|
||||||
|
title: str
|
||||||
|
artist: str
|
||||||
|
tags: list[str]
|
||||||
|
image_id: str
|
||||||
|
youtube_id: str
|
Loading…
Add table
Add a link
Reference in a new issue