DragMusicV2

Running

App Files Files Community

dragxd commited on 11 days ago

Commit

410048c

1 Parent(s): 83168a2

Add mini web player with UI and streaming for /play command

Browse files

Files changed (4) hide show

DragMusic/core/nowplaying.py +12 -0
DragMusic/plugins/play/play.py +5 -1
DragMusic/web/player.html +100 -0
server.py +32 -1

DragMusic/core/nowplaying.py ADDED Viewed

	@@ -0,0 +1,12 @@

+# Module to store the current song info and file path for web streaming
+from typing import Optional, Dict
+_current_song: Optional[Dict] = None
+def set_current_song(song_info: Dict):
+    global _current_song
+    _current_song = song_info
+def get_current_song() -> Optional[Dict]:
+    return _current_song

DragMusic/plugins/play/play.py CHANGED Viewed

@@ -22,6 +22,7 @@ from DragMusic.utils.inline import (
 )
 from DragMusic.utils.logger import play_logs
 from DragMusic.utils.stream.stream import stream
 from config import BANNED_USERS, lyrical
@@ -91,7 +92,8 @@ async def play_commnd(
                 "path": file_path,
                 "dur": dur,
             }
             try:
                 await stream(
                     _,
@@ -136,6 +138,8 @@ async def play_commnd(
                 "path": file_path,
                 "dur": dur,
             }
             try:
                 await stream(
                     _,

 )
 from DragMusic.utils.logger import play_logs
 from DragMusic.utils.stream.stream import stream
+from DragMusic.core import nowplaying
 from config import BANNED_USERS, lyrical
                 "path": file_path,
                 "dur": dur,
             }
+            # Store current song info for web player
+            nowplaying.set_current_song(details)
             try:
                 await stream(
                     _,
                 "path": file_path,
                 "dur": dur,
             }
+            # Store current song info for web player
+            nowplaying.set_current_song(details)
             try:
                 await stream(
                     _,

DragMusic/web/player.html ADDED Viewed

	@@ -0,0 +1,100 @@

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Mini Web Player</title>
+    <style>
+        body {
+            background: #181818;
+            color: #fff;
+            font-family: 'Segoe UI', Arial, sans-serif;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            min-height: 100vh;
+            margin: 0;
+        }
+        .player-container {
+            background: #232323;
+            border-radius: 16px;
+            box-shadow: 0 4px 24px rgba(0,0,0,0.4);
+            padding: 32px 24px 24px 24px;
+            max-width: 350px;
+            width: 100%;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+        }
+        .album-art {
+            width: 180px;
+            height: 180px;
+            border-radius: 12px;
+            background: #333;
+            margin-bottom: 20px;
+            object-fit: cover;
+            box-shadow: 0 2px 12px rgba(0,0,0,0.3);
+        }
+        .song-title {
+            font-size: 1.2em;
+            font-weight: bold;
+            margin-bottom: 6px;
+            text-align: center;
+        }
+        .song-meta {
+            font-size: 0.95em;
+            color: #aaa;
+            margin-bottom: 18px;
+            text-align: center;
+        }
+        audio {
+            width: 100%;
+            margin-top: 10px;
+        }
+        .no-song {
+            color: #ff7675;
+            margin-top: 20px;
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+    <div class="player-container">
+        <img id="album-art" class="album-art" src="" alt="Album Art" style="display:none;"/>
+        <div id="song-title" class="song-title">Loading...</div>
+        <div id="song-meta" class="song-meta"></div>
+        <audio id="audio" controls autoplay>
+            <source id="audio-src" src="/stream" type="audio/mpeg">
+            Your browser does not support the audio element.
+        </audio>
+        <div id="no-song" class="no-song" style="display:none;">No song playing.</div>
+    </div>
+    <script>
+    async function fetchSongInfo() {
+        try {
+            const res = await fetch('/current');
+            if (!res.ok) throw new Error('No song');
+            const data = await res.json();
+            document.getElementById('no-song').style.display = 'none';
+            document.getElementById('song-title').innerText = data.title || 'Unknown Title';
+            document.getElementById('song-meta').innerText = (data.dur ? `Duration: ${data.dur}` : '') + (data.link ? ` | <a href='${data.link}' target='_blank' style='color:#1db954;'>Source</a>` : '');
+            // Album art
+            if (data.thumb || data.img) {
+                document.getElementById('album-art').src = data.thumb || data.img;
+                document.getElementById('album-art').style.display = 'block';
+            } else {
+                document.getElementById('album-art').style.display = 'none';
+            }
+        } catch (e) {
+            document.getElementById('song-title').innerText = '';
+            document.getElementById('song-meta').innerText = '';
+            document.getElementById('album-art').style.display = 'none';
+            document.getElementById('no-song').style.display = 'block';
+        }
+    }
+    fetchSongInfo();
+    setInterval(fetchSongInfo, 5000);
+    </script>
+</body>
+</html>

server.py CHANGED Viewed

@@ -1,12 +1,43 @@
 import os
 import uvicorn
 from fastapi import FastAPI
 app = FastAPI(docs_url=None, redoc_url="/")
 @app.get("/status")
 def hello():
     return {"message": "running"}
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)

 import os
 import uvicorn
 from fastapi import FastAPI
+from fastapi.responses import HTMLResponse, StreamingResponse, JSONResponse, FileResponse
+from DragMusic.core import nowplaying
 app = FastAPI(docs_url=None, redoc_url="/")
 @app.get("/status")
 def hello():
     return {"message": "running"}
+def get_audio_stream(file_path):
+    def iterfile():
+        with open(file_path, mode="rb") as file_like:
+            yield from file_like
+    return iterfile
+@app.get("/", response_class=HTMLResponse)
+def mini_web_player():
+    html_path = os.path.join(os.path.dirname(__file__), "DragMusic", "web", "player.html")
+    if not os.path.exists(html_path):
+        # fallback to old inline HTML if file missing
+        return "<h2>Mini Web Player</h2><p>UI file missing.</p>"
+    return FileResponse(html_path, media_type="text/html")
+@app.get("/current")
+def get_current_song():
+    song = nowplaying.get_current_song()
+    if song:
+        return JSONResponse(content=song)
+    return JSONResponse(content={"error": "No song playing"}, status_code=404)
+@app.get("/stream")
+def stream_audio():
+    song = nowplaying.get_current_song()
+    if not song or not song.get("path") or not os.path.exists(song["path"]):
+        return JSONResponse(content={"error": "No song playing or file missing"}, status_code=404)
+    file_path = song["path"]
+    return StreamingResponse(get_audio_stream(file_path)(), media_type="audio/mpeg")
 if __name__ == "__main__":
     uvicorn.run(app, host="0.0.0.0", port=7860)