X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fstrfsong.c;h=b64c350ba6dace76d83b8c70f0dd49d591b1eefc;hb=b3e29d017a77d1cd34bfde94bd7182422e6d695c;hp=714a0b0040c9fb932bfea7589d4003e2f725033c;hpb=e67ad30e9bea8ce099b4a6311cf2b20ce6d86263;p=ncmpc.git

diff --git a/src/strfsong.c b/src/strfsong.c
index 714a0b0..b64c350 100644
--- a/src/strfsong.c
+++ b/src/strfsong.c
@@ -1,24 +1,27 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "strfsong.h"
 #include "charset.h"
+#include "time_format.h"
+
+#include <mpd/client.h>
 
 #include <string.h>
 
@@ -46,6 +49,57 @@ skip(const gchar * p)
 	return p;
 }
 
+#ifndef NCMPC_MINI
+
+static char *
+concat_tag_values(const char *a, const char *b)
+{
+	return g_strconcat(a, ", ", b, NULL);
+}
+
+static char *
+song_more_tag_values(const struct mpd_song *song, enum mpd_tag_type tag,
+		     const char *first)
+{
+	const char *p = mpd_song_get_tag(song, tag, 1);
+	if (p == NULL)
+		return NULL;
+
+	char *buffer = concat_tag_values(first, p);
+	for (unsigned i = 2; (p = mpd_song_get_tag(song, tag, i)) != NULL;
+	     ++i) {
+		char *prev = buffer;
+		buffer = concat_tag_values(buffer, p);
+		g_free(prev);
+	}
+
+	return buffer;
+}
+
+#endif /* !NCMPC_MINI */
+
+static char *
+song_tag_locale(const struct mpd_song *song, enum mpd_tag_type tag)
+{
+	const char *value = mpd_song_get_tag(song, tag, 0);
+	if (value == NULL)
+		return NULL;
+
+#ifndef NCMPC_MINI
+	char *all = song_more_tag_values(song, tag, value);
+	if (all != NULL)
+		value = all;
+#endif /* !NCMPC_MINI */
+
+	char *result = utf8_to_locale(value);
+
+#ifndef NCMPC_MINI
+	g_free(all);
+#endif /* !NCMPC_MINI */
+
+	return result;
+}
+
 static gsize
 _strfsong(gchar *s,
 	  gsize max,
@@ -53,22 +107,26 @@ _strfsong(gchar *s,
 	  const struct mpd_song *song,
 	  const gchar **last)
 {
-	const gchar *p, *end;
-	gchar *temp;
-	gsize n, length = 0;
-	gboolean found = FALSE;
+	bool found = false;
+	/* "missed" helps handling the case of mere literal text like
+	   found==true instead of found==false. */
+	bool missed = false;
+
+	s[0] = '\0';
 
-	memset(s, 0, max);
 	if (song == NULL)
 		return 0;
 
+	const char *p;
+	size_t length = 0;
 	for (p = format; *p != '\0' && length<max;) {
 		/* OR */
 		if (p[0] == '|') {
 			++p;
-			if(!found) {
-				memset(s, 0, max);
+			if(missed && !found) {
+				s[0] = '\0';
 				length = 0;
+				missed = false;
 			} else {
 				p = skip(p);
 			}
@@ -78,21 +136,24 @@ _strfsong(gchar *s,
 		/* AND */
 		if (p[0] == '&') {
 			++p;
-			if(!found) {
+			if(missed && !found) {
 				p = skip(p);
 			} else {
-				found = FALSE;
+				found = false;
+				missed = false;
 			}
 			continue;
 		}
 
 		/* EXPRESSION START */
 		if (p[0] == '[') {
-			temp = g_malloc0(max);
+			char *temp = g_malloc0(max);
 			if( _strfsong(temp, max, p+1, song, &p) >0 ) {
 				g_strlcat(s, temp, max);
 				length = strlen(s);
-				found = TRUE;
+				found = true;
+			} else {
+				missed = true;
 			}
 			g_free(temp);
 			continue;
@@ -101,8 +162,8 @@ _strfsong(gchar *s,
 		/* EXPRESSION END */
 		if (p[0] == ']') {
 			if(last) *last = p+1;
-			if(!found && length) {
-				memset(s, 0, max);
+			if(missed && !found && length) {
+				s[0] = '\0';
 				length = 0;
 			}
 			return length;
@@ -111,6 +172,7 @@ _strfsong(gchar *s,
 		/* pass-through non-escaped portions of the format string */
 		if (p[0] != '#' && p[0] != '%' && length<max) {
 			s[length++] = *p;
+			s[length] = '\0';
 			p++;
 			continue;
 		}
@@ -118,6 +180,7 @@ _strfsong(gchar *s,
 		/* let the escape character escape itself */
 		if (p[0] == '#' && p[1] != '\0' && length<max) {
 			s[length++] = *(p+1);
+			s[length] = '\0';
 			p+=2;
 			continue;
 		}
@@ -125,24 +188,37 @@ _strfsong(gchar *s,
 		/* advance past the esc character */
 
 		/* find the extent of this format specifier (stop at \0, ' ', or esc) */
-		temp = NULL;
-		end  = p+1;
+		char *temp = NULL;
+		const char *end = p + 1;
 		while(*end >= 'a' && *end <= 'z') {
 			end++;
 		}
-		n = end - p + 1;
+		size_t n = end - p + 1;
 		if(*end != '%')
 			n--;
 		else if (strncmp("%file%", p, n) == 0)
-			temp = utf8_to_locale(song->file);
-		else if (strncmp("%artist%", p, n) == 0)
-			temp = song->artist ? utf8_to_locale(song->artist) : NULL;
-		else if (strncmp("%title%", p, n) == 0)
-			temp = song->title ? utf8_to_locale(song->title) : NULL;
-		else if (strncmp("%album%", p, n) == 0)
-			temp = song->album ? utf8_to_locale(song->album) : NULL;
+			temp = utf8_to_locale(mpd_song_get_uri(song));
+		else if (strncmp("%artist%", p, n) == 0) {
+			temp = song_tag_locale(song, MPD_TAG_ARTIST);
+			if (temp == NULL) {
+				temp = song_tag_locale(song, MPD_TAG_PERFORMER);
+				if (temp == NULL)
+					temp = song_tag_locale(song, MPD_TAG_COMPOSER);
+			}
+		} else if (strncmp("%albumartist", p, n) == 0)
+			temp = song_tag_locale(song, MPD_TAG_ALBUM_ARTIST);
+		else if (strncmp("%composer%", p, n) == 0)
+			temp = song_tag_locale(song, MPD_TAG_COMPOSER);
+		else if (strncmp("%performer%", p, n) == 0)
+			temp = song_tag_locale(song, MPD_TAG_PERFORMER);
+		else if (strncmp("%title%", p, n) == 0) {
+			temp = song_tag_locale(song, MPD_TAG_TITLE);
+			if (temp == NULL)
+				temp = song_tag_locale(song, MPD_TAG_NAME);
+		} else if (strncmp("%album%", p, n) == 0)
+			temp = song_tag_locale(song, MPD_TAG_ALBUM);
 		else if (strncmp("%shortalbum%", p, n) == 0) {
-			temp = song->album ? utf8_to_locale(song->album) : NULL;
+			temp = song_tag_locale(song, MPD_TAG_ALBUM);
 			if (temp) {
 				gchar *temp2 = g_strndup(temp, 25);
 				if (strlen(temp) > 25) {
@@ -155,46 +231,47 @@ _strfsong(gchar *s,
 			}
 		}
 		else if (strncmp("%track%", p, n) == 0)
-			temp = song->track ? utf8_to_locale(song->track) : NULL;
+			temp = song_tag_locale(song, MPD_TAG_TRACK);
+		else if (strncmp("%disc%", p, n) == 0)
+			temp = song_tag_locale(song, MPD_TAG_DISC);
 		else if (strncmp("%name%", p, n) == 0)
-			temp = song->name ? utf8_to_locale(song->name) : NULL;
+			temp = song_tag_locale(song, MPD_TAG_NAME);
 		else if (strncmp("%date%", p, n) == 0)
-			temp = song->date ? utf8_to_locale(song->date) : NULL;
+			temp = song_tag_locale(song, MPD_TAG_DATE);
 		else if (strncmp("%genre%", p, n) == 0)
-			temp = song->genre ? utf8_to_locale(song->genre) : NULL;
+			temp = song_tag_locale(song, MPD_TAG_GENRE);
 		else if (strncmp("%shortfile%", p, n) == 0) {
-			if( strstr(song->file, "://") )
-				temp = utf8_to_locale(song->file);
+			const char *uri = mpd_song_get_uri(song);
+			if (strstr(uri, "://") != NULL)
+				temp = utf8_to_locale(uri);
 			else
-				temp = utf8_to_locale(g_basename(song->file));
+				temp = utf8_to_locale(g_basename(uri));
 		} else if (strncmp("%time%", p, n) == 0) {
-			if (song->time != MPD_SONG_NO_TIME)  {
-				if (song->time > 3600) {
-					temp = g_strdup_printf("%d:%02d:%02d",
-							       song->time / 3600,
-							       (song->time % 3600) / 60,
-							       song->time % 60);
-				} else {
-					temp = g_strdup_printf("%d:%02d",
-							       song->time / 60,
-							       song->time % 60);
-				}
+			unsigned duration = mpd_song_get_duration(song);
+
+			if (duration > 0)  {
+				char buffer[32];
+				format_duration_short(buffer, sizeof(buffer),
+						      duration);
+				temp = g_strdup(buffer);
 			}
 		}
 
 		if( temp == NULL) {
 			gsize templen=n;
 			/* just pass-through any unknown specifiers (including esc) */
-			/* drop a null char in so printf stops at the end of this specifier,
-			   but put the real character back in (pseudo-const) */
 			if( length+templen > max )
 				templen = max-length;
-			g_strlcat(s, p,max);
+			gchar *ident = g_strndup(p, templen);
+			g_strlcat(s, ident, max);
 			length+=templen;
+			g_free(ident);
+
+			missed = true;
 		} else {
 			gsize templen = strlen(temp);
 
-			found = TRUE;
+			found = true;
 			if( length+templen > max )
 				templen = max-length;
 			g_strlcat(s, temp, max);