mirror of https://github.com/SuperBFG7/ympd
Merge branch 'notandy-master'
This commit is contained in:
commit
94fed08434
|
@ -1,7 +1,7 @@
|
||||||
language: c
|
language: c
|
||||||
|
|
||||||
sudo: required
|
sudo: required
|
||||||
dist: precise
|
dist: trusty
|
||||||
|
|
||||||
compiler:
|
compiler:
|
||||||
- gcc
|
- gcc
|
||||||
|
|
|
@ -24,8 +24,8 @@ include_directories(${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR} ${LIBMPDCLIENT_I
|
||||||
|
|
||||||
include(CheckCSourceCompiles)
|
include(CheckCSourceCompiles)
|
||||||
|
|
||||||
set(CMAKE_C_FLAGS "-std=gnu99 -Wall")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall")
|
||||||
set(CMAKE_C_FLAGS_DEBUG "-ggdb -pedantic")
|
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -pedantic")
|
||||||
if(WITH_IPV6)
|
if(WITH_IPV6)
|
||||||
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS NS_ENABLE_IPV6)
|
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS NS_ENABLE_IPV6)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
FROM alpine:3.5
|
||||||
|
WORKDIR /app/build
|
||||||
|
COPY . /app
|
||||||
|
RUN apk add --no-cache g++ make cmake libmpdclient-dev openssl-dev
|
||||||
|
RUN cmake ..
|
||||||
|
RUN make
|
||||||
|
|
||||||
|
FROM alpine:3.5
|
||||||
|
RUN apk add --no-cache libmpdclient openssl
|
||||||
|
EXPOSE 8080
|
||||||
|
COPY --from=0 /app/build/ympd /usr/bin/ympd
|
||||||
|
COPY --from=0 /app/build/mkdata /usr/bin/mkdata
|
||||||
|
CMD ympd
|
20
README.md
20
README.md
|
@ -13,11 +13,12 @@ Dependencies
|
||||||
------------
|
------------
|
||||||
- libmpdclient 2: http://www.musicpd.org/libs/libmpdclient/
|
- libmpdclient 2: http://www.musicpd.org/libs/libmpdclient/
|
||||||
- cmake 2.6: http://cmake.org/
|
- cmake 2.6: http://cmake.org/
|
||||||
|
- OpenSSL: https://www.openssl.org/
|
||||||
|
|
||||||
Unix Build Instructions
|
Unix Build Instructions
|
||||||
-----------------------
|
-----------------------
|
||||||
|
|
||||||
1. install dependencies, cmake and libmpdclient are available from all major distributions.
|
1. install dependencies. cmake, libmpdclient (dev), and OpenSSL (dev) are available from all major distributions.
|
||||||
2. create build directory ```cd /path/to/src; mkdir build; cd build```
|
2. create build directory ```cd /path/to/src; mkdir build; cd build```
|
||||||
3. create makefile ```cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr```
|
3. create makefile ```cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr```
|
||||||
4. build ```make```
|
4. build ```make```
|
||||||
|
@ -28,14 +29,15 @@ Run flags
|
||||||
```
|
```
|
||||||
Usage: ./ympd [OPTION]...
|
Usage: ./ympd [OPTION]...
|
||||||
|
|
||||||
-d, --digest <htdigest> path to htdigest file for authorization
|
-D, --digest <htdigest> path to htdigest file for authorization
|
||||||
(realm ympd) [no authorization]
|
(realm ympd) [no authorization]
|
||||||
-h, --host <host> connect to mpd at host [localhost]
|
-h, --host <host> connect to mpd at host [localhost]
|
||||||
-p, --port <port> connect to mpd at port [6600]
|
-p, --port <port> connect to mpd at port [6600]
|
||||||
-w, --webport [ip:]<port> listen interface/port for webserver [8080]
|
-w, --webport [ip:]<port> listen interface/port for webserver [8080]
|
||||||
-u, --user <username> drop priviliges to user after socket bind
|
-d, --dirbletoken <apitoken> Dirble API token
|
||||||
-V, --version get version
|
-u, --user <username> drop priviliges to user after socket bind
|
||||||
--help this help
|
-V, --version get version
|
||||||
|
--help this help
|
||||||
```
|
```
|
||||||
|
|
||||||
SSL Support
|
SSL Support
|
||||||
|
|
|
@ -24,6 +24,7 @@ YMPD_USER=nobody
|
||||||
MPD_HOST=localhost
|
MPD_HOST=localhost
|
||||||
MPD_PORT=6600
|
MPD_PORT=6600
|
||||||
WEB_PORT=8080
|
WEB_PORT=8080
|
||||||
|
DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a
|
||||||
#DIGEST=--digest /path/to/htdigest
|
#DIGEST=--digest /path/to/htdigest
|
||||||
|
|
||||||
|
|
||||||
|
@ -36,7 +37,7 @@ WEB_PORT=8080
|
||||||
# Load the VERBOSE setting and other rcS variables
|
# Load the VERBOSE setting and other rcS variables
|
||||||
[ -f /etc/default/rcS ] && . /etc/default/rcS
|
[ -f /etc/default/rcS ] && . /etc/default/rcS
|
||||||
|
|
||||||
DAEMON_OPT="--user $YMPD_USER --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT $DIGEST"
|
DAEMON_OPT="--user $YMPD_USER --mpdpass '$MPD_PASSWORD' --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN $DIGEST"
|
||||||
|
|
||||||
do_start()
|
do_start()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
MPD_HOST=localhost
|
MPD_HOST=localhost
|
||||||
MPD_PORT=6600
|
MPD_PORT=6600
|
||||||
|
MPD_PASSWORD=
|
||||||
WEB_PORT=8080
|
WEB_PORT=8080
|
||||||
YMPD_USER=nobody
|
YMPD_USER=nobody
|
||||||
|
DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a
|
||||||
#DIGEST=--digest /path/to/htdigest
|
#DIGEST=--digest /path/to/htdigest
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# PROVIDE: ympd
|
||||||
|
# REQUIRE: DAEMON musicpd
|
||||||
|
# KEYWORD: shutdown
|
||||||
|
|
||||||
|
# Add the following line to /etc/rc.conf to enable ympd:
|
||||||
|
#
|
||||||
|
# ympd_enable="YES"
|
||||||
|
|
||||||
|
. /etc/rc.subr
|
||||||
|
|
||||||
|
name="ympd"
|
||||||
|
rcvar="${name}_enable"
|
||||||
|
command="/usr/local/bin/ympd"
|
||||||
|
pidfile="/var/run/${name}.pid"
|
||||||
|
start_cmd="ympd_start"
|
||||||
|
|
||||||
|
load_rc_config "$name"
|
||||||
|
: ${ympd_enable:="NO"}
|
||||||
|
: ${ympd_user:="nobody"}
|
||||||
|
|
||||||
|
ympd_start()
|
||||||
|
{
|
||||||
|
check_startmsgs && echo "Starting ${name}."
|
||||||
|
/usr/sbin/daemon -f -p "${pidfile}" -t "${name}" -u "${ympd_user}" "${command}"
|
||||||
|
}
|
||||||
|
|
||||||
|
run_rc_command "$1"
|
|
@ -5,11 +5,13 @@ Requires=network.target local-fs.target
|
||||||
[Service]
|
[Service]
|
||||||
Environment=MPD_HOST=localhost
|
Environment=MPD_HOST=localhost
|
||||||
Environment=MPD_PORT=6600
|
Environment=MPD_PORT=6600
|
||||||
|
Environment=MPD_PASSWORD=
|
||||||
Environment=WEB_PORT=8080
|
Environment=WEB_PORT=8080
|
||||||
Environment=YMPD_USER=nobody
|
Environment=YMPD_USER=nobody
|
||||||
|
Environment=DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a
|
||||||
Environment=DIGEST=
|
Environment=DIGEST=
|
||||||
EnvironmentFile=/etc/default/ympd
|
EnvironmentFile=/etc/default/ympd
|
||||||
ExecStart=/usr/bin/ympd --user $YMPD_USER --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT $DIGEST
|
ExecStart=/usr/bin/ympd --user $YMPD_USER --mpdpass "$MPD_PASSWORD" --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKE $DIGEST
|
||||||
Type=simple
|
Type=simple
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
<ol id="breadcrump" class="breadcrumb">
|
<ol id="breadcrump" class="breadcrumb">
|
||||||
</ol>
|
</ol>
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12" id="filter">
|
||||||
<button id="add-all-songs" class="btn btn-primary pull-right">Add all</button>
|
<button id="add-all-songs" class="btn btn-primary pull-right">Add all</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
154
htdocs/js/mpd.js
154
htdocs/js/mpd.js
|
@ -1,6 +1,6 @@
|
||||||
/* ympd
|
/* ympd
|
||||||
(c) 2013-2014 Andrew Karpow <andy@ndyk.de>
|
(c) 2013-2014 Andrew Karpow <andy@ndyk.de>
|
||||||
This project's homepage is: http://www.ympd.org
|
This project's homepage is: https://www.ympd.org
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
This program is free software; you can redistribute it and/or modify
|
||||||
it under the terms of the GNU General Public License as published by
|
it under the terms of the GNU General Public License as published by
|
||||||
|
@ -31,6 +31,9 @@ var dirble_selected_cat = "";
|
||||||
var dirble_catid = "";
|
var dirble_catid = "";
|
||||||
var dirble_page = 1;
|
var dirble_page = 1;
|
||||||
var isTouch = Modernizr.touch ? 1 : 0;
|
var isTouch = Modernizr.touch ? 1 : 0;
|
||||||
|
var filter = undefined;
|
||||||
|
var dirble_api_token = "";
|
||||||
|
var dirble_stations = false;
|
||||||
|
|
||||||
var app = $.sammy(function() {
|
var app = $.sammy(function() {
|
||||||
|
|
||||||
|
@ -38,6 +41,7 @@ var app = $.sammy(function() {
|
||||||
current_app = 'queue';
|
current_app = 'queue';
|
||||||
|
|
||||||
$('#breadcrump').addClass('hide');
|
$('#breadcrump').addClass('hide');
|
||||||
|
$('#filter').addClass('hide');
|
||||||
$('#salamisandwich').removeClass('hide').find("tr:gt(0)").remove();
|
$('#salamisandwich').removeClass('hide').find("tr:gt(0)").remove();
|
||||||
$('#dirble_panel').addClass('hide');
|
$('#dirble_panel').addClass('hide');
|
||||||
socket.send('MPD_API_GET_QUEUE,'+pagination);
|
socket.send('MPD_API_GET_QUEUE,'+pagination);
|
||||||
|
@ -65,7 +69,8 @@ var app = $.sammy(function() {
|
||||||
browsepath = this.params['splat'][1];
|
browsepath = this.params['splat'][1];
|
||||||
pagination = parseInt(this.params['splat'][0]);
|
pagination = parseInt(this.params['splat'][0]);
|
||||||
current_app = 'browse';
|
current_app = 'browse';
|
||||||
$('#breadcrump').removeClass('hide').empty().append("<li><a href=\"#/browse/0/\">root</a></li>");
|
$('#breadcrump').removeClass('hide').empty().append("<li><a href=\"#/browse/0/\" onclick=\"set_filter()\">root</a></li>");
|
||||||
|
$('#filter').removeClass('hide');
|
||||||
$('#salamisandwich').removeClass('hide').find("tr:gt(0)").remove();
|
$('#salamisandwich').removeClass('hide').find("tr:gt(0)").remove();
|
||||||
$('#dirble_panel').addClass('hide');
|
$('#dirble_panel').addClass('hide');
|
||||||
socket.send('MPD_API_GET_BROWSE,'+pagination+','+(browsepath ? browsepath : "/"));
|
socket.send('MPD_API_GET_BROWSE,'+pagination+','+(browsepath ? browsepath : "/"));
|
||||||
|
@ -132,7 +137,13 @@ var app = $.sammy(function() {
|
||||||
dirble_catid = this.params['splat'][0];
|
dirble_catid = this.params['splat'][0];
|
||||||
dirble_page = this.params['splat'][1];
|
dirble_page = this.params['splat'][1];
|
||||||
|
|
||||||
dirble_load_stations();
|
dirble_stations = true;
|
||||||
|
|
||||||
|
if(dirble_api_token) {
|
||||||
|
dirble_load_stations();
|
||||||
|
} else {
|
||||||
|
getDirbleApiToken();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -152,7 +163,13 @@ var app = $.sammy(function() {
|
||||||
$('#panel-heading').text("Dirble");
|
$('#panel-heading').text("Dirble");
|
||||||
$('#dirble').addClass('active');
|
$('#dirble').addClass('active');
|
||||||
|
|
||||||
dirble_load_categories();
|
dirble_stations = false;
|
||||||
|
|
||||||
|
if(dirble_api_token) {
|
||||||
|
dirble_load_categories();
|
||||||
|
} else {
|
||||||
|
getDirbleApiToken();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
this.get("/", function(context) {
|
this.get("/", function(context) {
|
||||||
|
@ -186,6 +203,8 @@ $(document).ready(function(){
|
||||||
else
|
else
|
||||||
if ($.cookie("notification") === "true")
|
if ($.cookie("notification") === "true")
|
||||||
$('#btnnotify').addClass("active")
|
$('#btnnotify').addClass("active")
|
||||||
|
|
||||||
|
add_filter();
|
||||||
|
|
||||||
document.getElementById('player').addEventListener('stalled', function() {
|
document.getElementById('player').addEventListener('stalled', function() {
|
||||||
if ( !document.getElementById('player').paused ) {
|
if ( !document.getElementById('player').paused ) {
|
||||||
|
@ -373,20 +392,33 @@ function webSocketConnect() {
|
||||||
for (var item in obj.data) {
|
for (var item in obj.data) {
|
||||||
switch(obj.data[item].type) {
|
switch(obj.data[item].type) {
|
||||||
case "directory":
|
case "directory":
|
||||||
|
var clazz = 'dir';
|
||||||
|
if (filter !== undefined) {
|
||||||
|
var first = obj.data[item].dir[0];
|
||||||
|
if (filter === "#" && isNaN(first)) {
|
||||||
|
clazz += ' hide';
|
||||||
|
} else if (filter >= "A" && filter <= "Z" && first.toUpperCase() !== filter) {
|
||||||
|
clazz += ' hide';
|
||||||
|
} else if (filter === "||") {
|
||||||
|
clazz += ' hide';
|
||||||
|
}
|
||||||
|
}
|
||||||
$('#salamisandwich > tbody').append(
|
$('#salamisandwich > tbody').append(
|
||||||
"<tr uri=\"" + encodeURI(obj.data[item].dir) + "\" class=\"dir\">" +
|
"<tr uri=\"" + encodeURI(obj.data[item].dir) + "\" class=\"" + clazz + "\">" +
|
||||||
"<td><span class=\"glyphicon glyphicon-folder-open\"></span></td>" +
|
"<td><span class=\"glyphicon glyphicon-folder-open\"></span></td>" +
|
||||||
"<td><a>" + basename(obj.data[item].dir) + "</a></td>" +
|
"<td><a>" + basename(obj.data[item].dir) + "</a></td>" +
|
||||||
"<td></td><td></td>" +
|
|
||||||
"<td></td><td></td></tr>"
|
"<td></td><td></td></tr>"
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case "playlist":
|
case "playlist":
|
||||||
|
var clazz = 'plist';
|
||||||
|
if (filter !== "||") {
|
||||||
|
clazz += ' hide';
|
||||||
|
}
|
||||||
$('#salamisandwich > tbody').append(
|
$('#salamisandwich > tbody').append(
|
||||||
"<tr uri=\"" + encodeURI(obj.data[item].plist) + "\" class=\"plist\">" +
|
"<tr uri=\"" + encodeURI(obj.data[item].plist) + "\" class=\"" + clazz + "\">" +
|
||||||
"<td><span class=\"glyphicon glyphicon-list\"></span></td>" +
|
"<td><span class=\"glyphicon glyphicon-list\"></span></td>" +
|
||||||
"<td><a>" + basename(obj.data[item].plist) + "</a></td>" +
|
"<td><a>" + basename(obj.data[item].plist) + "</a></td>" +
|
||||||
"<td></td><td></td>" +
|
|
||||||
"<td></td><td></td></tr>"
|
"<td></td><td></td></tr>"
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
|
@ -603,6 +635,15 @@ function webSocketConnect() {
|
||||||
if(obj.data.passwort_set)
|
if(obj.data.passwort_set)
|
||||||
$('#mpd_password_set').removeClass('hide');
|
$('#mpd_password_set').removeClass('hide');
|
||||||
break;
|
break;
|
||||||
|
case "dirbleapitoken":
|
||||||
|
dirble_api_token = obj.data;
|
||||||
|
|
||||||
|
if(dirble_stations) {
|
||||||
|
dirble_load_stations();
|
||||||
|
} else {
|
||||||
|
dirble_load_categories();
|
||||||
|
}
|
||||||
|
break;
|
||||||
case "error":
|
case "error":
|
||||||
$('.top-right').notify({
|
$('.top-right').notify({
|
||||||
message:{text: obj.data},
|
message:{text: obj.data},
|
||||||
|
@ -713,16 +754,6 @@ function clickPlay() {
|
||||||
socket.send('MPD_API_SET_PAUSE');
|
socket.send('MPD_API_SET_PAUSE');
|
||||||
}
|
}
|
||||||
|
|
||||||
function renumber_table(tableID,item) {
|
|
||||||
was = item.children("td").first().text();//Check if first item exists!
|
|
||||||
is = item.index() + 1;//maybe add pagination
|
|
||||||
|
|
||||||
if (was != is) {
|
|
||||||
socket.send("MPD_API_MOVE_TRACK," + was + "," + is);
|
|
||||||
socket.send('MPD_API_GET_QUEUE,'+pagination);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function clickLocalPlay() {
|
function clickLocalPlay() {
|
||||||
var player = document.getElementById('player');
|
var player = document.getElementById('player');
|
||||||
$("#localplay-icon").removeClass("glyphicon-play").removeClass("glyphicon-pause");
|
$("#localplay-icon").removeClass("glyphicon-play").removeClass("glyphicon-pause");
|
||||||
|
@ -782,6 +813,16 @@ function trash(tr) {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function renumber_table(tableID,item) {
|
||||||
|
was = item.children("td").first().text();//Check if first item exists!
|
||||||
|
is = item.index() + 1;//maybe add pagination
|
||||||
|
|
||||||
|
if (was != is) {
|
||||||
|
socket.send("MPD_API_MOVE_TRACK," + was + "," + is);
|
||||||
|
socket.send('MPD_API_GET_QUEUE,'+pagination);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function basename(path) {
|
function basename(path) {
|
||||||
return path.split('/').reverse()[0];
|
return path.split('/').reverse()[0];
|
||||||
}
|
}
|
||||||
|
@ -854,6 +895,10 @@ function getHost() {
|
||||||
$('#mpd_pw_con').keypress(onEnter);
|
$('#mpd_pw_con').keypress(onEnter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getDirbleApiToken() {
|
||||||
|
socket.send('MPD_API_GET_DIRBLEAPITOKEN');
|
||||||
|
}
|
||||||
|
|
||||||
$('#search').submit(function () {
|
$('#search').submit(function () {
|
||||||
app.setLocation("#/search/"+$('#search > div > input').val());
|
app.setLocation("#/search/"+$('#search > div > input').val());
|
||||||
$('#wait').modal('show');
|
$('#wait').modal('show');
|
||||||
|
@ -987,7 +1032,7 @@ function dirble_load_categories() {
|
||||||
|
|
||||||
dirble_page = 1;
|
dirble_page = 1;
|
||||||
|
|
||||||
$.getJSON( "http://api.dirble.com/v2/categories?token="+TOKEN, function( data ) {
|
$.getJSON( "https://api.dirble.com/v2/categories?token=" + dirble_api_token, function( data ) {
|
||||||
|
|
||||||
$('#dirble_loading').addClass('hide');
|
$('#dirble_loading').addClass('hide');
|
||||||
|
|
||||||
|
@ -1035,7 +1080,7 @@ function dirble_load_categories() {
|
||||||
|
|
||||||
function dirble_load_stations() {
|
function dirble_load_stations() {
|
||||||
|
|
||||||
$.getJSON( "http://api.dirble.com/v2/category/"+dirble_catid+"/stations?page="+dirble_page+"&per_page=20&token="+TOKEN, function( data ) {
|
$.getJSON( "https://api.dirble.com/v2/category/"+dirble_catid+"/stations?page="+dirble_page+"&per_page=20&token=" + dirble_api_token, function( data ) {
|
||||||
|
|
||||||
$('#dirble_loading').addClass('hide');
|
$('#dirble_loading').addClass('hide');
|
||||||
if (data.length == 20) $('#next').removeClass('hide');
|
if (data.length == 20) $('#next').removeClass('hide');
|
||||||
|
@ -1062,7 +1107,7 @@ function dirble_load_stations() {
|
||||||
click: function() {
|
click: function() {
|
||||||
var _this = $(this);
|
var _this = $(this);
|
||||||
|
|
||||||
$.getJSON( "http://api.dirble.com/v2/station/"+$(this).attr("radioid")+"?token="+TOKEN, function( data ) {
|
$.getJSON( "https://api.dirble.com/v2/station/"+$(this).attr("radioid")+"?token=" + dirble_api_token, function( data ) {
|
||||||
|
|
||||||
socket.send("MPD_API_ADD_TRACK," + data.streams[0].stream);
|
socket.send("MPD_API_ADD_TRACK," + data.streams[0].stream);
|
||||||
$('.top-right').notify({
|
$('.top-right').notify({
|
||||||
|
@ -1080,7 +1125,7 @@ function dirble_load_stations() {
|
||||||
"<span class=\"glyphicon glyphicon-play\"></span></a>").find('a').click(function(e) {
|
"<span class=\"glyphicon glyphicon-play\"></span></a>").find('a').click(function(e) {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
$.getJSON( "http://api.dirble.com/v2/station/"+_this.attr("radioid")+"?token="+TOKEN, function( data ) {
|
$.getJSON( "https://api.dirble.com/v2/station/"+_this.attr("radioid")+"?token=" + dirble_api_token, function( data ) {
|
||||||
|
|
||||||
socket.send("MPD_API_ADD_PLAY_TRACK," + data.streams[0].stream);
|
socket.send("MPD_API_ADD_PLAY_TRACK," + data.streams[0].stream);
|
||||||
$('.top-right').notify({
|
$('.top-right').notify({
|
||||||
|
@ -1101,7 +1146,7 @@ function dirble_load_stations() {
|
||||||
click: function() {
|
click: function() {
|
||||||
var _this = $(this);
|
var _this = $(this);
|
||||||
|
|
||||||
$.getJSON( "http://api.dirble.com/v2/station/"+$(this).attr("radioid")+"?token="+TOKEN, function( data ) {
|
$.getJSON( "https://api.dirble.com/v2/station/"+$(this).attr("radioid")+"?token=" + dirble_api_token, function( data ) {
|
||||||
|
|
||||||
socket.send("MPD_API_ADD_TRACK," + data.streams[0].stream);
|
socket.send("MPD_API_ADD_TRACK," + data.streams[0].stream);
|
||||||
$('.top-right').notify({
|
$('.top-right').notify({
|
||||||
|
@ -1119,7 +1164,7 @@ function dirble_load_stations() {
|
||||||
"<span class=\"glyphicon glyphicon-play\"></span></a>").find('a').click(function(e) {
|
"<span class=\"glyphicon glyphicon-play\"></span></a>").find('a').click(function(e) {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
$.getJSON( "http://api.dirble.com/v2/station/"+_this.attr("radioid")+"?token="+TOKEN, function( data ) {
|
$.getJSON( "https://api.dirble.com/v2/station/"+_this.attr("radioid")+"?token=" + dirble_api_token, function( data ) {
|
||||||
|
|
||||||
socket.send("MPD_API_ADD_PLAY_TRACK," + data.streams[0].stream);
|
socket.send("MPD_API_ADD_PLAY_TRACK," + data.streams[0].stream);
|
||||||
$('.top-right').notify({
|
$('.top-right').notify({
|
||||||
|
@ -1137,3 +1182,56 @@ function dirble_load_stations() {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function set_filter (c) {
|
||||||
|
filter = c;
|
||||||
|
|
||||||
|
$.each($('#salamisandwich > tbody > tr.dir'), function(i, line) {
|
||||||
|
var first = $(line).attr('uri')[0];
|
||||||
|
|
||||||
|
if (filter === undefined) {
|
||||||
|
$(line).removeClass('hide');
|
||||||
|
}
|
||||||
|
|
||||||
|
else if (filter === "#") {
|
||||||
|
if (!isNaN(first)) {
|
||||||
|
$(line).removeClass('hide');
|
||||||
|
} else {
|
||||||
|
$(line).addClass('hide');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
else if (filter >= "A" && filter <= "Z") {
|
||||||
|
if (first.toUpperCase() === filter) {
|
||||||
|
$(line).removeClass('hide');
|
||||||
|
} else {
|
||||||
|
$(line).addClass('hide');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
else if (filter === "||") {
|
||||||
|
$(line).addClass('hide');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$.each($('#salamisandwich > tbody > tr.plist'), function(i, line) {
|
||||||
|
if (filter === undefined) {
|
||||||
|
$(line).removeClass('hide');
|
||||||
|
} else if (filter === "||") {
|
||||||
|
$(line).removeClass('hide');
|
||||||
|
} else {
|
||||||
|
$(line).addClass('hide');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function add_filter () {
|
||||||
|
$('#filter').append(' <a onclick="set_filter(\'#\')" href="#/browse/0/">#</a>');
|
||||||
|
|
||||||
|
for (i = 65; i <= 90; i++) {
|
||||||
|
var c = String.fromCharCode(i);
|
||||||
|
$('#filter').append(' <a onclick="set_filter(\'' + c + '\')" href="#/browse/0/">' + c + '</a>');
|
||||||
|
}
|
||||||
|
|
||||||
|
$('#filter').append(' <a onclick="set_filter(\'||\')" href="#/browse/0/" class="glyphicon glyphicon-list"></a>');
|
||||||
|
}
|
||||||
|
|
|
@ -64,7 +64,8 @@ int callback_mpd(struct mg_connection *c)
|
||||||
return MG_TRUE;
|
return MG_TRUE;
|
||||||
|
|
||||||
if(mpd.conn_state != MPD_CONNECTED && cmd_id != MPD_API_SET_MPDHOST &&
|
if(mpd.conn_state != MPD_CONNECTED && cmd_id != MPD_API_SET_MPDHOST &&
|
||||||
cmd_id != MPD_API_GET_MPDHOST && cmd_id != MPD_API_SET_MPDPASS)
|
cmd_id != MPD_API_GET_MPDHOST && cmd_id != MPD_API_SET_MPDPASS &&
|
||||||
|
cmd_id != MPD_API_GET_DIRBLEAPITOKEN)
|
||||||
return MG_TRUE;
|
return MG_TRUE;
|
||||||
|
|
||||||
switch(cmd_id)
|
switch(cmd_id)
|
||||||
|
@ -290,6 +291,10 @@ out_host_change:
|
||||||
"{\"host\" : \"%s\", \"port\": \"%d\", \"passwort_set\": %s}"
|
"{\"host\" : \"%s\", \"port\": \"%d\", \"passwort_set\": %s}"
|
||||||
"}", mpd.host, mpd.port, mpd.password ? "true" : "false");
|
"}", mpd.host, mpd.port, mpd.password ? "true" : "false");
|
||||||
break;
|
break;
|
||||||
|
case MPD_API_GET_DIRBLEAPITOKEN:
|
||||||
|
n = snprintf(mpd.buf, MAX_SIZE, "{\"type\":\"dirbleapitoken\", \""
|
||||||
|
"data\": \"%s\"}", dirble_api_token);
|
||||||
|
break;
|
||||||
case MPD_API_SET_MPDPASS:
|
case MPD_API_SET_MPDPASS:
|
||||||
p_charbuf = strdup(c->content);
|
p_charbuf = strdup(c->content);
|
||||||
if(strcmp(strtok(p_charbuf, ","), "MPD_API_SET_MPDPASS"))
|
if(strcmp(strtok(p_charbuf, ","), "MPD_API_SET_MPDPASS"))
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
X(MPD_API_GET_QUEUE) \
|
X(MPD_API_GET_QUEUE) \
|
||||||
X(MPD_API_GET_BROWSE) \
|
X(MPD_API_GET_BROWSE) \
|
||||||
X(MPD_API_GET_MPDHOST) \
|
X(MPD_API_GET_MPDHOST) \
|
||||||
|
X(MPD_API_GET_DIRBLEAPITOKEN) \
|
||||||
X(MPD_API_ADD_TRACK) \
|
X(MPD_API_ADD_TRACK) \
|
||||||
X(MPD_API_ADD_PLAY_TRACK) \
|
X(MPD_API_ADD_PLAY_TRACK) \
|
||||||
X(MPD_API_ADD_PLAYLIST) \
|
X(MPD_API_ADD_PLAYLIST) \
|
||||||
|
@ -97,6 +98,8 @@ struct t_mpd {
|
||||||
unsigned queue_version;
|
unsigned queue_version;
|
||||||
} mpd;
|
} mpd;
|
||||||
|
|
||||||
|
char dirble_api_token[28];
|
||||||
|
|
||||||
struct t_mpd_client_session {
|
struct t_mpd_client_session {
|
||||||
int song_id;
|
int song_id;
|
||||||
unsigned queue_version;
|
unsigned queue_version;
|
||||||
|
|
20
src/ympd.c
20
src/ympd.c
|
@ -95,21 +95,25 @@ int main(int argc, char **argv)
|
||||||
mpd.port = 6600;
|
mpd.port = 6600;
|
||||||
strcpy(mpd.host, "127.0.0.1");
|
strcpy(mpd.host, "127.0.0.1");
|
||||||
|
|
||||||
|
strcpy(dirble_api_token, "2e223c9909593b94fc6577361a");
|
||||||
|
|
||||||
static struct option long_options[] = {
|
static struct option long_options[] = {
|
||||||
{"digest", required_argument, 0, 'd'},
|
{"digest", required_argument, 0, 'D'},
|
||||||
{"host", required_argument, 0, 'h'},
|
{"host", required_argument, 0, 'h'},
|
||||||
{"port", required_argument, 0, 'p'},
|
{"port", required_argument, 0, 'p'},
|
||||||
{"webport", required_argument, 0, 'w'},
|
{"webport", required_argument, 0, 'w'},
|
||||||
|
{"dirbletoken", required_argument, 0, 'd'},
|
||||||
{"user", required_argument, 0, 'u'},
|
{"user", required_argument, 0, 'u'},
|
||||||
{"version", no_argument, 0, 'v'},
|
{"version", no_argument, 0, 'v'},
|
||||||
{"help", no_argument, 0, 0 },
|
{"help", no_argument, 0, 0 },
|
||||||
|
{"mpdpass", required_argument, 0, 'm'},
|
||||||
{0, 0, 0, 0 }
|
{0, 0, 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
while((n = getopt_long(argc, argv, "d:h:p:w:u:v",
|
while((n = getopt_long(argc, argv, "D:h:p:w:u:d:v:m",
|
||||||
long_options, &option_index)) != -1) {
|
long_options, &option_index)) != -1) {
|
||||||
switch (n) {
|
switch (n) {
|
||||||
case 'd':
|
case 'D':
|
||||||
gpass = strdup(optarg);
|
gpass = strdup(optarg);
|
||||||
break;
|
break;
|
||||||
case 'h':
|
case 'h':
|
||||||
|
@ -121,9 +125,15 @@ int main(int argc, char **argv)
|
||||||
case 'w':
|
case 'w':
|
||||||
webport = strdup(optarg);
|
webport = strdup(optarg);
|
||||||
break;
|
break;
|
||||||
|
case 'd':
|
||||||
|
strncpy(dirble_api_token, optarg, sizeof(dirble_api_token));
|
||||||
|
break;
|
||||||
case 'u':
|
case 'u':
|
||||||
run_as_user = strdup(optarg);
|
run_as_user = strdup(optarg);
|
||||||
break;
|
break;
|
||||||
|
case 'm':
|
||||||
|
mpd.password = strdup(optarg);
|
||||||
|
break;
|
||||||
case 'v':
|
case 'v':
|
||||||
fprintf(stdout, "ympd %d.%d.%d\n"
|
fprintf(stdout, "ympd %d.%d.%d\n"
|
||||||
"Copyright (C) 2014 Andrew Karpow <andy@ndyk.de>\n"
|
"Copyright (C) 2014 Andrew Karpow <andy@ndyk.de>\n"
|
||||||
|
@ -133,13 +143,15 @@ int main(int argc, char **argv)
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
fprintf(stderr, "Usage: %s [OPTION]...\n\n"
|
fprintf(stderr, "Usage: %s [OPTION]...\n\n"
|
||||||
" -d, --digest <htdigest>\tpath to htdigest file for authorization\n"
|
" -D, --digest <htdigest>\tpath to htdigest file for authorization\n"
|
||||||
" \t(realm ympd) [no authorization]\n"
|
" \t(realm ympd) [no authorization]\n"
|
||||||
" -h, --host <host>\t\tconnect to mpd at host [localhost]\n"
|
" -h, --host <host>\t\tconnect to mpd at host [localhost]\n"
|
||||||
" -p, --port <port>\t\tconnect to mpd at port [6600]\n"
|
" -p, --port <port>\t\tconnect to mpd at port [6600]\n"
|
||||||
" -w, --webport [ip:]<port>\tlisten interface/port for webserver [8080]\n"
|
" -w, --webport [ip:]<port>\tlisten interface/port for webserver [8080]\n"
|
||||||
" -u, --user <username>\t\tdrop priviliges to user after socket bind\n"
|
" -u, --user <username>\t\tdrop priviliges to user after socket bind\n"
|
||||||
|
" -d, --dirbletoken <apitoken>\tDirble API token\n"
|
||||||
" -v, --version\t\t\tget version\n"
|
" -v, --version\t\t\tget version\n"
|
||||||
|
" -m, --mpdpass <password>\tspecifies the password to use when connecting to mpd\n"
|
||||||
" --help\t\t\t\tthis help\n"
|
" --help\t\t\t\tthis help\n"
|
||||||
, argv[0]);
|
, argv[0]);
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|
3
ympd.1
3
ympd.1
|
@ -23,6 +23,9 @@ specifies the port for the webserver to listen to, defaults to 8080
|
||||||
\fB\-u\fR, \fB\-\-user username\fR
|
\fB\-u\fR, \fB\-\-user username\fR
|
||||||
drop privileges to the provided username after socket binding
|
drop privileges to the provided username after socket binding
|
||||||
.TP
|
.TP
|
||||||
|
\fB\-m\fR, \fB\-\-mpdpass password\fR
|
||||||
|
specifies the password to use when connecting to mpd
|
||||||
|
.TP
|
||||||
\fB\-V\fR, \fB\-\-version\fR
|
\fB\-V\fR, \fB\-\-version\fR
|
||||||
print version and exit
|
print version and exit
|
||||||
.TP
|
.TP
|
||||||
|
|
Loading…
Reference in New Issue