mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2024-12-22 09:00:27 +00:00
Code Issues Releases Wiki Activity

Dirble option and functionality removed

Browse Source 
Dirble is no longer available and per the author/old-owner, will probably not
be coming back.

This commit removes the configuration option and the code used to access
dirble. Everything else still appears to be functional.

re: https://dev.to/confact/what-happened-with-dirble-k3g
This commit is contained in:
Andrew Carr 2021-05-21 01:38:19 +00:00
parent d1416d8f34
commit 3fe238b169
9 changed files with 8 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -34,7 +34,6 @@ Usage: ./ympd [OPTION]...
-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]
-d, --dirbletoken <apitoken> Dirble API token
-u, --user <username> drop priviliges to user after socket bind -u, --user <username> drop priviliges to user after socket bind
-V, --version get version -V, --version get version
--help this help --help this help
@ -54,12 +53,6 @@ To run ympd with SSL support:
# ./ympd -w "ssl://8081:/path/to/ssl.pem" # ./ympd -w "ssl://8081:/path/to/ssl.pem"
``` ```
Dirble support
--------------
1. Get an API-key from http://dirble.com
2. Add the key at ```var TOKEN = "";```, in ```mpd.js```.
Copyright Copyright
--------- ---------

3
contrib/init.debian
View File

@ -24,7 +24,6 @@ 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
#LOCALPORT=8080 #LOCALPORT=8080
@ -38,7 +37,7 @@ DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a
# 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 --mpdpass '$MPD_PASSWORD' --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN $DIGEST $LOCALPORT" DAEMON_OPT="--user $YMPD_USER --mpdpass '$MPD_PASSWORD' --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT $DIGEST $LOCALPORT"
do_start() do_start()
{ {

1
contrib/ympd.default
View File

@ -2,6 +2,5 @@ MPD_HOST=localhost
MPD_PORT=6600 MPD_PORT=6600
MPD_PASSWORD= MPD_PASSWORD=
WEB_PORT=8080 WEB_PORT=8080
DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a
#DIGEST=--digest /path/to/htdigest #DIGEST=--digest /path/to/htdigest
#LOCALPORT=--localport 8080 #LOCALPORT=--localport 8080

3
contrib/ympd.service
View File

@ -28,11 +28,10 @@ Environment=MPD_PORT=6600
Environment=MPD_PASSWORD= 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=
Environment=LOCALPORT= Environment=LOCALPORT=
EnvironmentFile=/etc/default/ympd EnvironmentFile=/etc/default/ympd
ExecStart=/usr/bin/ympd --user $USER --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN $DIGEST $LOCALPORT ExecStart=/usr/bin/ympd --user $USER --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT $DIGEST $LOCALPORT
Type=simple Type=simple
[Install] [Install]

23
htdocs/index.html
View File

@ -35,7 +35,6 @@
<ul id="nav_links" class="nav navbar-nav"> <ul id="nav_links" class="nav navbar-nav">
<li id="queue"><a href="#/">Queue</a></li> <li id="queue"><a href="#/">Queue</a></li>
<li id="browse"><a href="#/browse/0/">Browse</a></li> <li id="browse"><a href="#/browse/0/">Browse</a></li>
<li id="dirble"><a href="#/dirble/">Dirble</a></li>
<li><a href="#" data-toggle="modal" data-target="#addstream">Add Stream</a></li> <li><a href="#" data-toggle="modal" data-target="#addstream">Add Stream</a></li>
<li><a href="#" data-toggle="modal" data-target="#settings" onclick="getHost();">Settings</a></li> <li><a href="#" data-toggle="modal" data-target="#settings" onclick="getHost();">Settings</a></li>
</ul> </ul>
@ -137,28 +136,6 @@
</tbody> </tbody>
</table> </table>
<div id="dirble_panel">
<p id="dirble_loading" style="font-size:16px;font-weight:bold;margin-left:4em;">Loading...</p>
<table style="float:right; width:44%; margin-right:4%;" id="dirble_right" class="table table-hover">
<thead>
<tr>
<th></th>
</tr>
</thead>
<tbody>
</tbody>
</table>
<table style="width:44%; margin-left:4%;" id="dirble_left" class="table table-hover">
<thead>
<tr>
<th></th>
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>
</div><!-- /.panel --> </div><!-- /.panel -->
<ul class="pager"> <ul class="pager">
<li id="prev" class="page-btn hide"><a href="">Previous</a></li> <li id="prev" class="page-btn hide"><a href="">Previous</a></li>

242
htdocs/js/mpd.js
View File

@ -27,13 +27,8 @@ var browsepath = "";
var lastSongTitle = ""; var lastSongTitle = "";
var current_song = new Object(); var current_song = new Object();
var MAX_ELEMENTS_PER_PAGE = 512; var MAX_ELEMENTS_PER_PAGE = 512;
var dirble_selected_cat = "";
var dirble_catid = "";
var dirble_page = 1;
var isTouch = Modernizr.touch ? 1 : 0; var isTouch = Modernizr.touch ? 1 : 0;
var filter = ""; var filter = "";
var dirble_api_token = "";
var dirble_stations = false;
var app = $.sammy(function() { var app = $.sammy(function() {
@ -43,7 +38,6 @@ var app = $.sammy(function() {
$('#breadcrump').addClass('hide'); $('#breadcrump').addClass('hide');
$('#filter').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');
socket.send('MPD_API_GET_QUEUE,'+pagination); socket.send('MPD_API_GET_QUEUE,'+pagination);
$('#panel-heading').text("Queue"); $('#panel-heading').text("Queue");
@ -74,7 +68,6 @@ var app = $.sammy(function() {
$('#breadcrump').removeClass('hide').empty().append("<li><a uri=\"\" onclick=\"set_filter('')\">root</a></li>"); $('#breadcrump').removeClass('hide').empty().append("<li><a uri=\"\" onclick=\"set_filter('')\">root</a></li>");
add_filter(); add_filter();
$('#salamisandwich').removeClass('hide').find("tr:gt(0)").remove(); $('#salamisandwich').removeClass('hide').find("tr:gt(0)").remove();
$('#dirble_panel').addClass('hide');
socket.send('MPD_API_GET_BROWSE,'+pagination+','+(browsepath ? browsepath : "/")); socket.send('MPD_API_GET_BROWSE,'+pagination+','+(browsepath ? browsepath : "/"));
// Don't add all songs from root // Don't add all songs from root
if (browsepath) { if (browsepath) {
@ -104,7 +97,6 @@ var app = $.sammy(function() {
this.get(/\#\/search\/(.*)/, function() { this.get(/\#\/search\/(.*)/, function() {
current_app = 'search'; current_app = 'search';
$('#salamisandwich').find("tr:gt(0)").remove(); $('#salamisandwich').find("tr:gt(0)").remove();
$('#dirble_panel').addClass('hide');
var searchstr = this.params['splat'][0]; var searchstr = this.params['splat'][0];
$('#search > div > input').val(searchstr); $('#search > div > input').val(searchstr);
@ -113,60 +105,6 @@ var app = $.sammy(function() {
$('#panel-heading').text("Search: "+searchstr); $('#panel-heading').text("Search: "+searchstr);
}); });
this.get(/\#\/dirble\/(\d+)\/(\d+)/, function() {
if (TOKEN === "") context.redirect("#/0");
prepare();
current_app = 'dirble';
$('#breadcrump').removeClass('hide').empty().append("<li><a href=\"#/dirble/\">Categories</a></li><li>"+dirble_selected_cat+"</li>");
$('#salamisandwich').addClass('hide');
$('#dirble_panel').removeClass('hide');
$('#dirble_loading').removeClass('hide');
$('#dirble_left').find("tr:gt(0)").remove();
$('#dirble_right').find("tr:gt(0)").remove();
$('#panel-heading').text("Dirble");
$('#panel-heading-info').empty();
$('#dirble').addClass('active');
$('#next').addClass('hide');
if (this.params['splat'][1] > 1) $('#prev').removeClass('hide');
else $('#prev').addClass('hide');
dirble_catid = this.params['splat'][0];
dirble_page = this.params['splat'][1];
dirble_stations = true;
if (dirble_api_token) { dirble_load_stations(); }
});
this.get(/\#\/dirble\//, function() {
if (TOKEN === "") context.redirect("#/0");
prepare();
current_app = 'dirble';
$('#breadcrump').removeClass('hide').empty().append("<li>Categories</li>");
$('#salamisandwich').addClass('hide');
$('#dirble_panel').removeClass('hide');
$('#dirble_loading').removeClass('hide');
$('#dirble_left').find("tr:gt(0)").remove();
$('#dirble_right').find("tr:gt(0)").remove();
$('#panel-heading').text("Dirble");
$('#panel-heading-info').empty();
$('#dirble').addClass('active');
dirble_stations = false;
if (dirble_api_token) { dirble_load_categories(); }
});
this.get("/", function(context) { this.get("/", function(context) {
context.redirect("#/0"); context.redirect("#/0");
}); });
@ -260,8 +198,6 @@ $(document).ready(function(){
break; break;
} }
}, true); }, true);
if (TOKEN === "") $('#dirble').addClass('hide');
}); });
function webSocketConnect() { function webSocketConnect() {
@ -282,8 +218,6 @@ function webSocketConnect() {
app.run(); app.run();
/* emit initial request for output names */ /* emit initial request for output names */
socket.send('MPD_API_GET_OUTPUTS'); socket.send('MPD_API_GET_OUTPUTS');
/* emit initial request for dirble api token */
socket.send('MPD_API_GET_DIRBLEAPITOKEN');
} }
socket.onmessage = function got_packet(msg) { socket.onmessage = function got_packet(msg) {
@ -667,19 +601,7 @@ 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_api_token) {
$('#dirble').removeClass('hide');
if (dirble_stations) { dirble_load_stations(); }
else { dirble_load_categories(); }
} else {
$('#dirble').addClass('hide');
}
break;
case 'error': case 'error':
$('.top-right').notify({ $('.top-right').notify({
message:{text: obj.data}, message:{text: obj.data},
@ -969,16 +891,12 @@ $('.page-btn').on('click', function (e) {
switch ($(this).text()) { switch ($(this).text()) {
case "Next": case "Next":
if (current_app == "dirble") dirble_page++; pagination += MAX_ELEMENTS_PER_PAGE;
else pagination += MAX_ELEMENTS_PER_PAGE;
break; break;
case "Previous": case "Previous":
if (current_app == "dirble") dirble_page--
else {
pagination -= MAX_ELEMENTS_PER_PAGE; pagination -= MAX_ELEMENTS_PER_PAGE;
if(pagination <= 0) if(pagination <= 0)
pagination = 0; pagination = 0;
}
break; break;
} }
@ -989,9 +907,6 @@ $('.page-btn').on('click', function (e) {
case "browse": case "browse":
app.setLocation('#/browse/'+pagination+'/'+browsepath); app.setLocation('#/browse/'+pagination+'/'+browsepath);
break; break;
case "dirble":
app.setLocation("#/dirble/"+dirble_catid+"/"+dirble_page);
break;
} }
e.preventDefault(); e.preventDefault();
}); });
@ -1085,161 +1000,6 @@ $(document).keydown(function(e){
e.preventDefault(); e.preventDefault();
}); });
function dirble_load_categories() {
dirble_page = 1;
$.getJSON( "https://api.dirble.com/v2/categories?token=" + dirble_api_token, function( data ) {
$('#dirble_loading').addClass('hide');
data = data.sort(function(a, b) {
return (a.title > b.title) ? 1 : 0;
});
var max = data.length - data.length%2;
for(i = 0; i < max; i+=2) {
$('#dirble_left > tbody').append(
"<tr><td catid=\""+data[i].id+"\">"+data[i].title+"</td></tr>"
);
$('#dirble_right > tbody').append(
"<tr><td catid=\""+data[i+1].id+"\">"+data[i+1].title+"</td></tr>"
);
}
if (max != data.length) {
$('#dirble_left > tbody').append(
"<tr><td catid=\""+data[max].id+"\">"+data[max].title+"</td></tr>"
);
}
$('#dirble_left > tbody > tr > td').on({
click: function() {
dirble_selected_cat = $(this).text();
dirble_catid = $(this).attr("catid");
app.setLocation("#/dirble/"+dirble_catid+"/"+dirble_page);
}
});
$('#dirble_right > tbody > tr > td').on({
click: function() {
dirble_selected_cat = $(this).text();
dirble_catid = $(this).attr("catid");
app.setLocation("#/dirble/"+dirble_catid+"/"+dirble_page);
}
});
});
}
function dirble_load_stations() {
$.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');
if (data.length == 20) $('#next').removeClass('hide');
var max = data.length - data.length%2;
for(i = 0; i < max; i+=2) {
$('#dirble_left > tbody').append(
"<tr><td radioid=\""+data[i].id+"\">"+data[i].name+"</td></tr>"
);
$('#dirble_right > tbody').append(
"<tr><td radioid=\""+data[i+1].id+"\">"+data[i+1].name+"</td></tr>"
);
}
if (max != data.length) {
$('#dirble_left > tbody').append(
"<tr><td radioid=\""+data[max].id+"\">"+data[max].name+"</td></tr>"
);
}
$('#dirble_left > tbody > tr > td').on({
click: function() {
var _this = $(this);
$.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);
$('.top-right').notify({
message:{
text: _this.text() + " added"
}
}).show();
});
},
mouseenter: function() {
var _this = $(this);
$(this).last().append(
"<a role=\"button\" class=\"pull-right btn-group-hover\">" +
"<span class=\"glyphicon glyphicon-play\"></span></a>").find('a').click(function(e) {
e.stopPropagation();
$.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);
$('.top-right').notify({
message:{
text: _this.text() + " added"
}
}).show();
});
}).fadeTo('fast',1);
},
mouseleave: function(){
$(this).last().find("a").stop().remove();
}
});
$('#dirble_right> tbody > tr > td').on({
click: function() {
var _this = $(this);
$.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);
$('.top-right').notify({
message:{
text: _this.text() + " added"
}
}).show();
});
},
mouseenter: function() {
var _this = $(this);
$(this).last().append(
"<a role=\"button\" class=\"pull-right btn-group-hover\">" +
"<span class=\"glyphicon glyphicon-play\"></span></a>").find('a').click(function(e) {
e.stopPropagation();
$.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);
$('.top-right').notify({
message:{
text: _this.text() + " added"
}
}).show();
});
}).fadeTo('fast',1);
},
mouseleave: function(){
$(this).last().find("a").stop().remove();
}
});
});
}
function set_filter (c) { function set_filter (c) {
filter = c; filter = c;
$('#filter > a').removeClass('active'); $('#filter > a').removeClass('active');

8
src/mpd_client.c
View File

@ -30,7 +30,6 @@
/* forward declaration */ /* forward declaration */
static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev); static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev);
char dirble_api_token[28];
struct t_mpd mpd; struct t_mpd mpd;
const char * mpd_cmd_strs[] = { const char * mpd_cmd_strs[] = {
@ -66,8 +65,7 @@ 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)
@ -293,10 +291,6 @@ 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"))

3
src/mpd_client.h
View File

@ -40,7 +40,6 @@
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) \
@ -102,8 +101,6 @@ struct t_mpd {
extern struct t_mpd mpd; extern struct t_mpd mpd;
extern 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;

5
src/ympd.c
View File

@ -101,7 +101,6 @@ int main(int argc, char **argv)
{"port", required_argument, 0, 'p'}, {"port", required_argument, 0, 'p'},
{"localport", required_argument, 0, 'l'}, {"localport", required_argument, 0, 'l'},
{"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 },
@ -127,9 +126,6 @@ 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;
@ -153,7 +149,6 @@ int main(int argc, char **argv)
" -l, --localport <port>\t\tskip authorization for local port\n" " -l, --localport <port>\t\tskip authorization for local port\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" " -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"