iou1name/Musik
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

added autoplay/shuffle feature

Browse Source
This commit is contained in:
iou1name 2018-09-14 08:02:24 -04:00
parent 5eb70cefd5
commit fbec8d886e
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
musik.py
View File

@ -4,6 +4,7 @@ Music streaming.
""" """
import os import os
import json import json
import random
import subprocess import subprocess
from urllib import parse from urllib import parse
@ -11,6 +12,7 @@ from flask import Flask, Response, render_template
from werkzeug.utils import secure_filename from werkzeug.utils import secure_filename
MUSIC_DIR = "/mnt/music/Music" MUSIC_DIR = "/mnt/music/Music"
MUSIC_EXT = ['flac', 'mp3', 'wav', 'm4a']
FFMPEG_CMD = [ FFMPEG_CMD = [
'ffmpeg', '-y', 'ffmpeg', '-y',
'-loglevel', 'panic', '-loglevel', 'panic',
@ -80,5 +82,19 @@ def get_dir(directory):
return json.dumps(nav_items_new) return json.dumps(nav_items_new)
@app.route('/get_shuffle')
def shuffle():
"""Returns a randomly selected song from the library."""
item = random.choice(os.listdir(MUSIC_DIR))
path = os.path.join(MUSIC_DIR, item)
while not path.rpartition('.')[2] in MUSIC_EXT:
item = random.choice(os.listdir(path))
if os.path.isdir(os.path.join(path, item)):
path = os.path.join(path, item)
if item.rpartition('.')[2] in MUSIC_EXT:
path = os.path.join(path, item)
return path.replace(MUSIC_DIR, '')
if __name__ == "__main__": if __name__ == "__main__":
app.run(host='0.0.0.0', port=5150) app.run(host='0.0.0.0', port=5150)

24
static/musik.js
View File

@ -1,16 +1,36 @@
var httpRequest var httpRequest
function load() {
document.getElementById('player').addEventListener('ended', function() {
if (!document.getElementById('shuffle').checked) { return; }
httpRequest = new XMLHttpRequest();
httpRequest.onreadystatechange = function() {
if (httpRequest.readyState !== XMLHttpRequest.DONE) { return; }
if (httpRequest.status !== 200) { return; }
let track = httpRequest.responseText;
change_track(track);
}
httpRequest.open('GET', '/musik/get_shuffle', true);
httpRequest.send();
});
}
function navigate(item) { function navigate(item) {
if (/\..{3,5}$/.test(item)) { if (/\..{3,5}$/.test(item)) {
change_track(item); select_track(item);
} }
else { else {
get_dir(item); get_dir(item);
} }
} }
function change_track(item) { function select_track(item) {
let cd = document.getElementById('currentDirectory').innerText; let cd = document.getElementById('currentDirectory').innerText;
let track = cd + item; let track = cd + item;
change_track(track);
}
function change_track(track) {
let source = document.getElementById('stream'); let source = document.getElementById('stream');
source.src = '/musik/stream' + track; source.src = '/musik/stream' + track;
let player = document.getElementById('player'); let player = document.getElementById('player');

2
templates/index.html
View File

@ -4,6 +4,7 @@
<title>Musik</title> <title>Musik</title>
<link rel="stylesheet" type="text/css" href="/static/musik.css"> <link rel="stylesheet" type="text/css" href="/static/musik.css">
<script type="text/javascript" src="/static/musik.js"></script> <script type="text/javascript" src="/static/musik.js"></script>
<script>window.onload = load;</script>
</head> </head>
<body> <body>
<div id="mainContainer"> <div id="mainContainer">
@ -22,6 +23,7 @@
<audio id="player" controls> <audio id="player" controls>
<source id="stream" src="{{ url_for('stream', track=initial_track) }}" type="audio/ogg"> <source id="stream" src="{{ url_for('stream', track=initial_track) }}" type="audio/ogg">
</audio> </audio>
<div><input type="checkbox" id="shuffle">Shuffle</input>
</center> </center>
</div> </div>
</div> </div>