Combining all my work #1

Merged
kristy-fournier merged 10 commits from dev into main 2024-06-12 13:01:31 -04:00
3 changed files with 5 additions and 3 deletions
Showing only changes of commit dcb21d39a9 - Show all commits

3
.gitignore vendored
View file

@ -1,2 +1,3 @@
server/sound/ server/sound/
server/songDatabase.json server/songDatabase.json
start.bat

View file

@ -17,7 +17,7 @@ player = fakeplayer.media_player_new()
player.audio_set_volume(100) player.audio_set_volume(100)
app = Flask(__name__) app = Flask(__name__)
CORS(app) CORS(app)
with open('songDatabase.json', 'r') as handle: with open('./songDatabase.json', 'r') as handle:
songDatabaseList = json.load(handle) songDatabaseList = json.load(handle)
def queueSong(song): def queueSong(song):
@ -124,5 +124,5 @@ def getPlaylist():
return tempPlaylist return tempPlaylist
if __name__ == "__main__": if __name__ == "__main__":
app.run(host='0.0.0.0', port='25565') app.run(host='0.0.0.0', port='19054')

View file

@ -54,6 +54,7 @@ These are specific details on each section of the app, and how to use them
- `webbyBits.py` imports the database, runs all music playing, and accepts all commands from clients - `webbyBits.py` imports the database, runs all music playing, and accepts all commands from clients
- Searches return matching songs - Searches return matching songs
- Accepts Play-Pause and Skip commands - Accepts Play-Pause and Skip commands
- Uses port 19054 by default
### Client: ### Client:
![image](./Screenshot_RAW.png) \ ![image](./Screenshot_RAW.png) \