From 80834b989f8e755e0b7761c924acca3fc571e985 Mon Sep 17 00:00:00 2001 From: eb041592 <35889760+eb041592@users.noreply.github.com> Date: Sun, 28 Jan 2018 21:22:06 +0100 Subject: [PATCH 01/23] Update FreeBSD RC script - removed /usr/sbin/daemon's option "-t" (first appeared in FreeBSD 11, leading to an error in previous versions; since the [t]itle defaults to the daemonized invocation anyways, this shouldn't make a difference for FreeBSD 11+) - removed /usr/sbin/daemon's option "-u" and the respective variable in the script (ympd has to be started as root to be able to bind to port 80) - allow for additional arguments via ympd_flags="" in rc.conf (which would again allow to drop privileges after binding to the port) --- contrib/ympd.freebsd | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/ympd.freebsd b/contrib/ympd.freebsd index 4dcbedd..532a90c 100755 --- a/contrib/ympd.freebsd +++ b/contrib/ympd.freebsd @@ -12,18 +12,17 @@ name="ympd" rcvar="${name}_enable" -command="/usr/local/bin/ympd" +command="/usr/local/bin/${name}" pidfile="/var/run/${name}.pid" start_cmd="ympd_start" -load_rc_config "$name" +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}" + /usr/sbin/daemon -f -p "${pidfile}" "${command}" "${rc_flags}" } run_rc_command "$1" From cf572b705efd678662fd9eae896c1da6bfe79793 Mon Sep 17 00:00:00 2001 From: eb041592 <35889760+eb041592@users.noreply.github.com> Date: Fri, 2 Feb 2018 02:14:31 +0100 Subject: [PATCH 02/23] Added artist and album to both queue and search results; minor spelling --- htdocs/index.html | 6 +++--- htdocs/js/mpd.js | 26 +++++++++++++------------- src/mpd_client.c | 42 ++++++++++++++++++++++++++++++------------ 3 files changed, 46 insertions(+), 28 deletions(-) diff --git a/htdocs/index.html b/htdocs/index.html index 9d8f9a3..3996042 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -34,7 +34,7 @@ -
+
From b4084034d0f87bbec1ae23781d62bc49d75f066e Mon Sep 17 00:00:00 2001 From: eb041592 <35889760+eb041592@users.noreply.github.com> Date: Sun, 4 Feb 2018 13:24:44 +0100 Subject: [PATCH 13/23] Reverted some formatting; aligned CSS --- htdocs/css/mpd.css | 14 +++++++------- htdocs/index.html | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/css/mpd.css b/htdocs/css/mpd.css index 88987e2..5d6afd3 100644 --- a/htdocs/css/mpd.css +++ b/htdocs/css/mpd.css @@ -22,10 +22,10 @@ body { } #counter { - font-size: 24px; - margin-top: -6px; - margin-left: 10px; - min-width: 50px; + font-size: 24px; + margin-top: -6px; + margin-left: 10px; + min-width: 50px; } #search { @@ -33,7 +33,7 @@ body { } .btn-group-hover { - opacity: 20%; + opacity: 20%; } .btn:active, @@ -60,8 +60,8 @@ body { } #salamisandwich td:nth-child(2) span { - font-style:italic; - font-size:90%; + font-style:italic; + font-size:90%; } tbody { diff --git a/htdocs/index.html b/htdocs/index.html index 726d193..683f860 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -177,15 +177,15 @@
From d4865aca9d1c45bcd8cc5aa86c6f5198b8f61b89 Mon Sep 17 00:00:00 2001 From: Archphile Date: Mon, 5 Mar 2018 13:54:46 +0200 Subject: [PATCH 14/23] fixed a typo Replaced $DIRBLE_API_TOKE with $DIRBLE_API_TOKEN in order for the service to be functional. --- contrib/ympd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ympd.service b/contrib/ympd.service index 7b42ebb..49559c7 100644 --- a/contrib/ympd.service +++ b/contrib/ympd.service @@ -10,7 +10,7 @@ Environment=WEB_PORT=8080 Environment=YMPD_USER=nobody Environment=DIRBLE_API_TOKEN=2e223c9909593b94fc6577361a EnvironmentFile=/etc/default/ympd -ExecStart=/usr/bin/ympd --user $YMPD_USER --mpdpass "$MPD_PASSWORD" --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKE +ExecStart=/usr/bin/ympd --user $YMPD_USER --mpdpass "$MPD_PASSWORD" --webport $WEB_PORT --host $MPD_HOST --port $MPD_PORT --dirbletoken $DIRBLE_API_TOKEN Type=simple [Install] From 54e334a2a0cb60b6df4d1c336fdfdee5fbefbeb5 Mon Sep 17 00:00:00 2001 From: eb041592 <35889760+eb041592@users.noreply.github.com> Date: Wed, 4 Apr 2018 15:04:25 +0200 Subject: [PATCH 15/23] Added additional "totalTime" field to "obj" for the queue's total time. --- src/mpd_client.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/mpd_client.c b/src/mpd_client.c index 1054ede..9679b2b 100644 --- a/src/mpd_client.c +++ b/src/mpd_client.c @@ -600,6 +600,7 @@ int mpd_put_queue(char *buffer, unsigned int offset) char *cur = buffer; const char *end = buffer + MAX_SIZE; struct mpd_entity *entity; + unsigned long totalTime = 0; if (!mpd_send_list_queue_range_meta(mpd.conn, offset, offset+MAX_ELEMENTS_PER_PAGE)) RETURN_ERROR_AND_RECOVER("mpd_send_list_queue_meta"); @@ -608,16 +609,18 @@ int mpd_put_queue(char *buffer, unsigned int offset) while((entity = mpd_recv_entity(mpd.conn)) != NULL) { const struct mpd_song *song; + unsigned int drtn; if(mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG) { song = mpd_entity_get_song(entity); + drtn = mpd_song_get_duration(song); cur += json_emit_raw_str(cur, end - cur, "{\"id\":"); cur += json_emit_int(cur, end - cur, mpd_song_get_id(song)); cur += json_emit_raw_str(cur, end - cur, ",\"pos\":"); cur += json_emit_int(cur, end - cur, mpd_song_get_pos(song)); cur += json_emit_raw_str(cur, end - cur, ",\"duration\":"); - cur += json_emit_int(cur, end - cur, mpd_song_get_duration(song)); + cur += json_emit_int(cur, end - cur, drtn); cur += json_emit_raw_str(cur, end - cur, ",\"title\":"); cur += json_emit_quoted_str(cur, end - cur, mpd_get_title(song)); cur += json_emit_raw_str(cur, end - cur, ",\"artist\":"); @@ -625,6 +628,8 @@ int mpd_put_queue(char *buffer, unsigned int offset) cur += json_emit_raw_str(cur, end - cur, ",\"album\":"); cur += json_emit_quoted_str(cur, end - cur, mpd_get_album(song)); cur += json_emit_raw_str(cur, end - cur, "},"); + + totalTime += drtn; } mpd_entity_free(entity); } @@ -632,7 +637,9 @@ int mpd_put_queue(char *buffer, unsigned int offset) /* remove last ',' */ cur--; - cur += json_emit_raw_str(cur, end - cur, "]}"); + cur += json_emit_raw_str(cur, end - cur, "],\"totalTime\":"); + cur += json_emit_int(cur, end - cur, totalTime); + cur += json_emit_raw_str(cur, end - cur, "}"); return cur - buffer; } From 0faf70ad05b90731638c6d760a59a0036ecc6d36 Mon Sep 17 00:00:00 2001 From: eb041592 <35889760+eb041592@users.noreply.github.com> Date: Wed, 4 Apr 2018 19:40:12 +0200 Subject: [PATCH 16/23] Add queue's total time to panel header. --- htdocs/index.html | 9 +++++---- htdocs/js/mpd.js | 12 ++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/htdocs/index.html b/htdocs/index.html index 6bf5c60..eb3319a 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -81,10 +81,11 @@
- +
-
Queue
+
Queue +

@@ -218,7 +219,7 @@

ympd uses following excellent software:
Mongoose GPLv2
libMPDClient BSD License
-
+
- +