diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index b9896f11bebb4a5a3d4f4dd44176ec58f97cd33f..7f5d47c8f638a0ca40dfdb6702d7f52a514782e3 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (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
* 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 "strfsong.h"
#include "lyrics.h"
#include "screen_text.h"
+#include <assert.h>
+#include <sys/stat.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
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;
}
if (current.song != NULL) {
- mpd_freeSong(current.song);
+ mpd_song_free(current.song);
current.song = NULL;
}
}
}
}
+static void
+path_lyr_file(char *path, size_t size,
+ const char *artist, const char *title)
+{
+ snprintf(path, size, "%s/.lyrics/%s - %s.txt",
+ getenv("HOME"), artist, title);
+}
+
+static bool
+exists_lyr_file(const char *artist, const char *title)
+{
+ char path[1024];
+ struct stat result;
+
+ path_lyr_file(path, 1024, artist, title);
+
+ return (stat(path, &result) == 0);
+}
+
+static FILE *
+create_lyr_file(const char *artist, const char *title)
+{
+ char path[1024];
+
+ snprintf(path, 1024, "%s/.lyrics",
+ getenv("HOME"));
+ mkdir(path, S_IRWXU);
+
+ path_lyr_file(path, 1024, artist, title);
+
+ return fopen(path, "w");
+}
+
+static int
+store_lyr_hd(void)
+{
+ FILE *lyr_file;
+ unsigned i;
+
+ lyr_file = create_lyr_file(current.artist, current.title);
+ if (lyr_file == NULL)
+ return -1;
+
+ for (i = 0; i < text.lines->len; ++i)
+ fprintf(lyr_file, "%s\n",
+ (const char*)g_ptr_array_index(text.lines, i));
+
+ fclose(lyr_file);
+ return 0;
+}
+
+static int
+delete_lyr_hd(void)
+{
+ char path[1024];
+
+ if (!exists_lyr_file(current.artist, current.title))
+ return -1;
+
+ path_lyr_file(path, 1024, current.artist, current.title);
+ if (unlink(path) != 0)
+ return -2;
+
+ return 0;
+}
+
static void
screen_lyrics_set(const GString *str)
{
}
static void
-screen_lyrics_callback(const GString *result, G_GNUC_UNUSED void *data)
+screen_lyrics_callback(const GString *result, const bool success,
+ G_GNUC_UNUSED void *data)
{
assert(current.loader != NULL);
+ /* Display result, which may be lyrics or error messages */
if (result != NULL)
screen_lyrics_set(result);
- else
+
+ 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"));
+ }
plugin_stop(current.loader);
current.loader = NULL;
static void
screen_lyrics_load(const struct mpd_song *song)
{
- char buffer[MAX_SONGNAME_LENGTH];
+ const char *artist, *title;
assert(song != NULL);
screen_lyrics_abort();
screen_text_clear(&text);
- current.song = mpd_songDup(song);
-
- strfsong(buffer, sizeof(buffer), "%artist%", song);
- current.artist = g_strdup(buffer);
+ artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
+ title = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
- strfsong(buffer, sizeof(buffer), "%title%", song);
- current.title = g_strdup(buffer);
+ current.song = mpd_song_dup(song);
+ current.artist = g_strdup(artist);
+ current.title = g_strdup(title);
current.loader = lyrics_load(current.artist, current.title,
screen_lyrics_callback, NULL);
}
-static FILE *create_lyr_file(const char *artist, const char *title)
-{
- char path[1024];
-
- snprintf(path, 1024, "%s/.lyrics",
- getenv("HOME"));
- mkdir(path, S_IRWXU);
-
- snprintf(path, 1024, "%s/.lyrics/%s - %s.txt",
- getenv("HOME"), artist, title);
-
- return fopen(path, "w");
-}
-
-static int store_lyr_hd(void)
-{
- FILE *lyr_file;
- unsigned i;
-
- lyr_file = create_lyr_file(current.artist, current.title);
- if (lyr_file == NULL)
- return -1;
-
- for (i = 0; i < text.lines->len; ++i)
- fprintf(lyr_file, "%s\n",
- (const char*)g_ptr_array_index(text.lines, i));
-
- fclose(lyr_file);
- return 0;
-}
-
static void
lyrics_screen_init(WINDOW *w, int cols, int rows)
{
}
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);
+ 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)
}
static bool
-lyrics_cmd(mpdclient_t *c, command_t cmd)
+lyrics_cmd(struct mpdclient *c, command_t cmd)
{
if (screen_text_cmd(&text, c, cmd))
return true;
/* 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);
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;
break;
#endif
+ case CMD_SCREEN_SWAP:
+ screen_swap(c, current.song);
+ return true;
case CMD_LOCATE:
if (current.song != NULL) {
.init = lyrics_screen_init,
.exit = lyrics_exit,
.open = lyrics_open,
+ .update = lyrics_update,
.close = NULL,
.resize = lyrics_resize,
.paint = lyrics_paint,
};
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);
}