X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_lyrics.c;h=3350d8f067cdd90c64951774270e7a3a134bbb7b;hb=1006a43225842d77e5fdb32e9d02bada5cdc2377;hp=9b70a76bd3b82d55a45b0f5e5dae9e26ae2e3ff2;hpb=3b3a8367dd84f082fa5cf1f68bc485d895bcdebf;p=ncmpc.git

diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 9b70a76..3350d8f 100644
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -1,6 +1,6 @@
-/*
- * (c) 2006 by Kalle Wallin <kaw@linux.se>
- * Copyright (C) 2008 Max Kellermann <max@duempel.org>
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2010 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
@@ -11,41 +11,45 @@
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ * 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 <sys/stat.h>
+#include "screen_lyrics.h"
+#include "screen_interface.h"
+#include "screen_message.h"
+#include "screen_file.h"
+#include "screen_song.h"
 #include "i18n.h"
 #include "options.h"
 #include "mpdclient.h"
-#include "command.h"
 #include "screen.h"
-#include "screen_utils.h"
-#include "strfsong.h"
 #include "lyrics.h"
-#include "charset.h"
+#include "screen_text.h"
 
+#include <assert.h>
+#include <sys/stat.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <unistd.h>
 #include <stdio.h>
 
-static list_window_t *lw = NULL;
+static struct screen_text text;
 
-static const struct mpd_song *next_song;
+static struct mpd_song *next_song;
+static bool follow = false;
 
 static struct {
 	struct mpd_song *song;
 
-	char *artist, *title;
+	char *artist, *title, *plugin_name;
 
 	struct plugin_cycle *loader;
 
-	GPtrArray *lines;
+	guint loader_timeout;
 } current;
 
 static void
@@ -56,6 +60,16 @@ screen_lyrics_abort(void)
 		current.loader = NULL;
 	}
 
+	if (current.loader_timeout != 0) {
+		g_source_remove(current.loader_timeout);
+		current.loader_timeout = 0;
+	}
+
+	if (current.plugin_name != NULL) {
+		g_free(current.plugin_name);
+		current.plugin_name = NULL;
+	}
+
 	if (current.artist != NULL) {
 		g_free(current.artist);
 		current.artist = NULL;
@@ -63,41 +77,15 @@ screen_lyrics_abort(void)
 
 	if (current.title != NULL) {
 		g_free(current.title);
-		current.artist = NULL;
+		current.title = NULL;
 	}
 
 	if (current.song != NULL) {
-		mpd_freeSong(current.song);
+		mpd_song_free(current.song);
 		current.song = NULL;
 	}
 }
 
-static void
-screen_lyrics_clear(void)
-{
-	guint i;
-
-	list_window_reset(lw);
-
-	for (i = 0; i < current.lines->len; ++i)
-		g_free(g_ptr_array_index(current.lines, i));
-
-	g_ptr_array_set_size(current.lines, 0);
-}
-
-static void
-lyrics_paint(void);
-
-/**
- * Repaint and update the screen.
- */
-static void
-lyrics_repaint(void)
-{
-	lyrics_paint();
-	wrefresh(lw->w);
-}
-
 /**
  * Repaint and update the screen, if it is currently active.
  */
@@ -105,194 +93,232 @@ static void
 lyrics_repaint_if_active(void)
 {
 	if (screen_is_visible(&screen_lyrics)) {
-		lyrics_repaint();
+		screen_text_repaint(&text);
 
 		/* XXX repaint the screen title */
 	}
 }
 
 static void
-screen_lyrics_set(const GString *str)
+path_lyr_file(char *path, size_t size,
+		const char *artist, const char *title)
 {
-	const char *p, *eol, *next;
+	snprintf(path, size, "%s/.lyrics/%s - %s.txt",
+			getenv("HOME"), artist, title);
+}
 
-	screen_lyrics_clear();
+static bool
+exists_lyr_file(const char *artist, const char *title)
+{
+	char path[1024];
+	struct stat result;
 
-	p = str->str;
-	while ((eol = strchr(p, '\n')) != NULL) {
-		char *line;
+	path_lyr_file(path, 1024, artist, title);
 
-		next = eol + 1;
+	return (stat(path, &result) == 0);
+}
 
-		/* strip whitespace at end */
+static FILE *
+create_lyr_file(const char *artist, const char *title)
+{
+	char path[1024];
 
-		while (eol > p && (unsigned char)eol[-1] <= 0x20)
-			--eol;
+	snprintf(path, 1024, "%s/.lyrics",
+		 getenv("HOME"));
+	mkdir(path, S_IRWXU);
 
-		/* create copy and append it to current.lines*/
+	path_lyr_file(path, 1024, artist, title);
 
-		line = g_malloc(eol - p + 1);
-		memcpy(line, p, eol - p);
-		line[eol - p] = 0;
+	return fopen(path, "w");
+}
 
-		g_ptr_array_add(current.lines, line);
+static int
+store_lyr_hd(void)
+{
+	FILE *lyr_file;
+	unsigned i;
 
-		/* reset control characters */
+	lyr_file = create_lyr_file(current.artist, current.title);
+	if (lyr_file == NULL)
+		return -1;
 
-		for (eol = line + (eol - p); line < eol; ++line)
-			if ((unsigned char)*line < 0x20)
-				*line = ' ';
+	for (i = 0; i < text.lines->len; ++i)
+		fprintf(lyr_file, "%s\n",
+			(const char*)g_ptr_array_index(text.lines, i));
 
-		p = next;
-	}
+	fclose(lyr_file);
+	return 0;
+}
 
-	if (*p != 0)
-		g_ptr_array_add(current.lines, g_strdup(p));
+static int
+delete_lyr_hd(void)
+{
+	char path[1024];
 
-	/* paint new data */
+	if (!exists_lyr_file(current.artist, current.title))
+		return -1;
 
-	lyrics_repaint_if_active();
+	path_lyr_file(path, 1024, current.artist, current.title);
+	if (unlink(path) != 0)
+		return -2;
+
+	return 0;
 }
 
 static void
-screen_lyrics_callback(const GString *result, G_GNUC_UNUSED void *data)
+screen_lyrics_set(const GString *str)
 {
-	assert(current.loader != NULL);
+	screen_text_set(&text, str);
 
-	if (result != NULL)
-		screen_lyrics_set(result);
-	else
-		screen_status_message (_("No lyrics"));
+	/* paint new data */
 
-	plugin_stop(current.loader);
-	current.loader = NULL;
+	lyrics_repaint_if_active();
 }
 
 static void
-screen_lyrics_load(const struct mpd_song *song)
+screen_lyrics_callback(const GString *result, const bool success,
+		       const char *plugin_name, G_GNUC_UNUSED void *data)
 {
-	char buffer[MAX_SONGNAME_LENGTH];
-
-	assert(song != NULL);
+	assert(current.loader != NULL);
 
-	screen_lyrics_abort();
-	screen_lyrics_clear();
+	current.plugin_name = g_strdup(plugin_name);
 
-	current.song = mpd_songDup(song);
+	/* Display result, which may be lyrics or error messages */
+	if (result != NULL)
+		screen_lyrics_set(result);
 
-	strfsong(buffer, sizeof(buffer), "%artist%", song);
-	current.artist = g_strdup(buffer);
+	if (success == true) {
+		if (options.lyrics_autosave &&
+		    !exists_lyr_file(current.artist, current.title))
+			store_lyr_hd();
+	} else {
+		/* translators: no lyrics were found for the song */
+		screen_status_message (_("No lyrics"));
+	}
 
-	strfsong(buffer, sizeof(buffer), "%title%", song);
-	current.title = g_strdup(buffer);
+	if (current.loader_timeout != 0) {
+		g_source_remove(current.loader_timeout);
+		current.loader_timeout = 0;
+	}
 
-	current.loader = lyrics_load(current.artist, current.title,
-				     screen_lyrics_callback, NULL);
+	plugin_stop(current.loader);
+	current.loader = NULL;
 }
 
-static FILE *create_lyr_file(const char *artist, const char *title)
+static gboolean
+screen_lyrics_timeout_callback(gpointer G_GNUC_UNUSED data)
 {
-	char path[1024];
-
-	snprintf(path, 1024, "%s/.lyrics",
-		 getenv("HOME"));
-	mkdir(path, S_IRWXU);
+	plugin_stop(current.loader);
+	current.loader = NULL;
 
-	snprintf(path, 1024, "%s/.lyrics/%s - %s.txt",
-		 getenv("HOME"), artist, title);
+	screen_status_printf(_("Lyrics timeout occurred after %d seconds"),
+			     options.lyrics_timeout);
 
-	return fopen(path, "w");
+	current.loader_timeout = 0;
+	return FALSE;
 }
 
-static int store_lyr_hd(void)
+static void
+screen_lyrics_load(const struct mpd_song *song)
 {
-	FILE *lyr_file;
-	unsigned i;
-
-	lyr_file = create_lyr_file(current.artist, current.title);
-	if (lyr_file == NULL)
-		return -1;
+	const char *artist, *title;
 
-	for (i = 0; i < current.lines->len; ++i)
-		fprintf(lyr_file, "%s\n",
-			(const char*)g_ptr_array_index(current.lines, i));
+	assert(song != NULL);
 
-	fclose(lyr_file);
-	return 0;
-}
+	screen_lyrics_abort();
+	screen_text_clear(&text);
 
-static const char *
-list_callback(unsigned idx, G_GNUC_UNUSED bool *highlight,
-	      G_GNUC_UNUSED void *data)
-{
-	static char buffer[256];
-	char *value;
+	artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
+	title = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
 
-	if (idx >= current.lines->len)
-		return NULL;
+	current.song = mpd_song_dup(song);
+	current.artist = g_strdup(artist);
+	current.title = g_strdup(title);
 
-	value = utf8_to_locale(g_ptr_array_index(current.lines, idx));
-	g_strlcpy(buffer, value, sizeof(buffer));
-	free(value);
+	current.loader = lyrics_load(current.artist, current.title,
+				     screen_lyrics_callback, NULL);
 
-	return buffer;
+	if (options.lyrics_timeout != 0) {
+		current.loader_timeout =
+			g_timeout_add_seconds(options.lyrics_timeout,
+					      screen_lyrics_timeout_callback,
+					      NULL);
+	}
 }
 
-
 static void
 lyrics_screen_init(WINDOW *w, int cols, int rows)
 {
-	current.lines = g_ptr_array_new();
-	lw = list_window_init(w, cols, rows);
-	lw->hide_cursor = true;
+	screen_text_init(&text, w, cols, rows);
 }
 
 static void
 lyrics_resize(int cols, int rows)
 {
-	lw->cols = cols;
-	lw->rows = rows;
+	screen_text_resize(&text, cols, rows);
 }
 
 static void
 lyrics_exit(void)
 {
-	list_window_free(lw);
-
 	screen_lyrics_abort();
-	screen_lyrics_clear();
 
-	g_ptr_array_free(current.lines, TRUE);
-	current.lines = NULL;
+	screen_text_deinit(&text);
 }
 
 static void
-lyrics_open(mpdclient_t *c)
+lyrics_open(struct mpdclient *c)
 {
-	if (next_song == NULL)
-		next_song = c->song;
+	const struct mpd_song *next_song_c =
+		next_song != NULL ? next_song : c->song;
 
-	if (next_song != NULL &&
+	if (next_song_c != NULL &&
 	    (current.song == NULL ||
-	     strcmp(next_song->file, current.song->file) != 0))
-		screen_lyrics_load(next_song);
+	     strcmp(mpd_song_get_uri(next_song_c),
+		    mpd_song_get_uri(current.song)) != 0))
+		screen_lyrics_load(next_song_c);
 
-	next_song = NULL;
+	if (next_song != NULL) {
+		mpd_song_free(next_song);
+		next_song = NULL;
+	}
 }
 
+static void
+lyrics_update(struct mpdclient *c)
+{
+	if (!follow)
+		return;
+
+	if (c->song != NULL &&
+	    (current.song == NULL ||
+	     strcmp(mpd_song_get_uri(c->song),
+		    mpd_song_get_uri(current.song)) != 0))
+		screen_lyrics_load(c->song);
+}
 
 static const char *
 lyrics_title(char *str, size_t size)
 {
 	if (current.loader != NULL) {
 		snprintf(str, size, "%s (%s)",
-			 _("Lyrics"), _("loading..."));
+			 _("Lyrics"),
+			 /* translators: this message is displayed
+			    while data is retrieved */
+			 _("loading..."));
 		return str;
 	} else if (current.artist != NULL && current.title != NULL &&
-		   current.lines->len > 0) {
-		snprintf(str, size, "%s: %s - %s",
-			 _("Lyrics"),
-			 current.artist, current.title);
+		   !screen_text_is_empty(&text)) {
+		int n;
+		n = snprintf(str, size, "%s: %s - %s",
+			     _("Lyrics"),
+			     current.artist, current.title);
+
+		if (options.lyrics_show_plugin && current.plugin_name != NULL &&
+		    (unsigned int) n < size - 1)
+			snprintf(str + n, size - n, " (%s)",
+				 current.plugin_name);
+
 		return str;
 	} else
 		return _("Lyrics");
@@ -301,38 +327,58 @@ lyrics_title(char *str, size_t size)
 static void
 lyrics_paint(void)
 {
-	list_window_paint(lw, list_callback, NULL);
+	screen_text_paint(&text);
 }
 
 static bool
-lyrics_cmd(mpdclient_t *c, command_t cmd)
+lyrics_cmd(struct mpdclient *c, command_t cmd)
 {
-	if (list_window_scroll_cmd(lw, current.lines->len, cmd)) {
-		lyrics_repaint();
+	if (screen_text_cmd(&text, c, cmd))
 		return true;
-	}
 
 	switch(cmd) {
 	case CMD_INTERRUPT:
 		if (current.loader != NULL) {
 			screen_lyrics_abort();
-			screen_lyrics_clear();
+			screen_text_clear(&text);
 		}
 		return true;
-	case CMD_ADD:
+	case CMD_SAVE_PLAYLIST:
 		if (current.loader == NULL && current.artist != NULL &&
 		    current.title != NULL && store_lyr_hd() == 0)
+			/* lyrics for the song were saved on hard disk */
 			screen_status_message (_("Lyrics saved"));
 		return true;
+	case CMD_DELETE:
+		if (current.loader == NULL && current.artist != NULL &&
+		    current.title != NULL) {
+			switch (delete_lyr_hd()) {
+			case 0:
+				screen_status_message (_("Lyrics deleted"));
+				break;
+			case -1:
+				screen_status_message (_("No saved lyrics"));
+				break;
+			}
+		}
+		return true;
 	case CMD_LYRICS_UPDATE:
 		if (c->song != NULL) {
 			screen_lyrics_load(c->song);
-			lyrics_repaint();
+			screen_text_repaint(&text);
+		}
+		return true;
+	case CMD_SELECT:
+		if (current.loader == NULL && current.artist != NULL &&
+		    current.title != NULL) {
+			current.loader = lyrics_load(current.artist, current.title,
+						     screen_lyrics_callback, NULL);
+			screen_text_repaint(&text);
 		}
 		return true;
 
 #ifdef ENABLE_SONG_SCREEN
-	case CMD_VIEW:
+	case CMD_SCREEN_SONG:
 		if (current.song != NULL) {
 			screen_song_switch(c, current.song);
 			return true;
@@ -340,6 +386,9 @@ lyrics_cmd(mpdclient_t *c, command_t cmd)
 
 		break;
 #endif
+	case CMD_SCREEN_SWAP:
+		screen_swap(c, current.song);
+		return true;
 
 	case CMD_LOCATE:
 		if (current.song != NULL) {
@@ -353,15 +402,6 @@ lyrics_cmd(mpdclient_t *c, command_t cmd)
 		break;
 	}
 
-	lw->selected = lw->start+lw->rows;
-	if (screen_find(lw, current.lines->len,
-			cmd, list_callback, NULL)) {
-		/* center the row */
-		list_window_center(lw, current.lines->len, lw->selected);
-		lyrics_repaint();
-		return true;
-	}
-
 	return false;
 }
 
@@ -369,6 +409,7 @@ const struct screen_functions screen_lyrics = {
 	.init = lyrics_screen_init,
 	.exit = lyrics_exit,
 	.open = lyrics_open,
+	.update = lyrics_update,
 	.close = NULL,
 	.resize = lyrics_resize,
 	.paint = lyrics_paint,
@@ -377,10 +418,11 @@ const struct screen_functions screen_lyrics = {
 };
 
 void
-screen_lyrics_switch(struct mpdclient *c, const struct mpd_song *song)
+screen_lyrics_switch(struct mpdclient *c, const struct mpd_song *song, bool f)
 {
 	assert(song != NULL);
 
-	next_song = song;
+	follow = f;
+	next_song = mpd_song_dup(song);
 	screen_switch(&screen_lyrics, c);
 }