diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index 3350d8f067cdd90c64951774270e7a3a134bbb7b..b937e79bc3792ca16030d766178989d746faec9c 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 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
#include "screen_lyrics.h"
#include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
#include "screen_file.h"
#include "screen_song.h"
#include "i18n.h"
#include "screen.h"
#include "lyrics.h"
#include "screen_text.h"
+#include "screen_utils.h"
+#include "ncu.h"
#include <assert.h>
+#include <errno.h>
#include <sys/stat.h>
+#include <sys/wait.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
static struct mpd_song *next_song;
static bool follow = false;
+/** Set if the cursor position shall be kept during the next lyrics update. */
+static bool reloading = false;
static struct {
struct mpd_song *song;
exists_lyr_file(const char *artist, const char *title)
{
char path[1024];
- struct stat result;
-
path_lyr_file(path, 1024, artist, title);
+ struct stat result;
return (stat(path, &result) == 0);
}
create_lyr_file(const char *artist, const char *title)
{
char path[1024];
-
snprintf(path, 1024, "%s/.lyrics",
getenv("HOME"));
mkdir(path, S_IRWXU);
static int
store_lyr_hd(void)
{
- FILE *lyr_file;
- unsigned i;
-
- lyr_file = create_lyr_file(current.artist, current.title);
+ FILE *lyr_file = create_lyr_file(current.artist, current.title);
if (lyr_file == NULL)
return -1;
- for (i = 0; i < text.lines->len; ++i)
+ for (unsigned i = 0; i < text.lines->len; ++i)
fprintf(lyr_file, "%s\n",
(const char*)g_ptr_array_index(text.lines, i));
static int
delete_lyr_hd(void)
{
- char path[1024];
-
if (!exists_lyr_file(current.artist, current.title))
return -1;
+ char path[1024];
path_lyr_file(path, 1024, current.artist, current.title);
if (unlink(path) != 0)
return -2;
static void
screen_lyrics_set(const GString *str)
{
- screen_text_set(&text, str);
+ if (reloading) {
+ unsigned saved_start = text.lw->start;
+
+ screen_text_set(&text, str->str);
+
+ /* restore the cursor and ensure that it's still valid */
+ text.lw->start = saved_start;
+ list_window_fetch_cursor(text.lw);
+ } else {
+ screen_text_set(&text, str->str);
+ }
+
+ reloading = false;
/* paint new data */
static void
screen_lyrics_callback(const GString *result, const bool success,
- const char *plugin_name, G_GNUC_UNUSED void *data)
+ const char *plugin_name, gcc_unused void *data)
{
assert(current.loader != NULL);
}
static gboolean
-screen_lyrics_timeout_callback(gpointer G_GNUC_UNUSED data)
+screen_lyrics_timeout_callback(gpointer gcc_unused data)
{
plugin_stop(current.loader);
current.loader = NULL;
static void
screen_lyrics_load(const struct mpd_song *song)
{
- const char *artist, *title;
-
assert(song != NULL);
screen_lyrics_abort();
screen_text_clear(&text);
- artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
- title = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
+ const char *artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
+ const char *title = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
current.song = mpd_song_dup(song);
current.artist = g_strdup(artist);
}
}
+static void
+screen_lyrics_reload(void)
+{
+ if (current.loader == NULL && current.artist != NULL &&
+ current.title != NULL) {
+ reloading = true;
+ current.loader = lyrics_load(current.artist, current.title,
+ screen_lyrics_callback, NULL);
+ screen_text_repaint(&text);
+ }
+}
+
static void
lyrics_screen_init(WINDOW *w, int cols, int rows)
{
screen_text_paint(&text);
}
+/* save current lyrics to a file and run editor on it */
+static void
+lyrics_edit(void)
+{
+ char *editor = options.text_editor;
+ if (editor == NULL) {
+ screen_status_message(_("Editor not configured"));
+ return;
+ }
+
+ if (options.text_editor_ask) {
+ char *buf = g_strdup_printf(
+ _("Do you really want to start an editor and edit these lyrics [%s/%s]? "),
+ YES, NO);
+ bool really = screen_get_yesno(buf, false);
+ g_free(buf);
+ if (!really) {
+ screen_status_message(_("Aborted"));
+ return;
+ }
+ }
+
+ if (store_lyr_hd() < 0)
+ return;
+
+ ncu_deinit();
+
+ /* TODO: fork/exec/wait won't work on Windows, but building a command
+ string for system() is too tricky */
+ int status;
+ pid_t pid = fork();
+ if (pid == -1) {
+ screen_status_printf(("%s (%s)"), _("Can't start editor"), g_strerror(errno));
+ ncu_init();
+ return;
+ } else if (pid == 0) {
+ char path[1024];
+ path_lyr_file(path, sizeof(path), current.artist, current.title);
+ execlp(editor, editor, path, NULL);
+ /* exec failed, do what system does */
+ _exit(127);
+ } else {
+ int ret;
+ do {
+ ret = waitpid(pid, &status, 0);
+ } while (ret == -1 && errno == EINTR);
+ }
+
+ ncu_init();
+
+ /* TODO: hardly portable */
+ if (WIFEXITED(status)) {
+ if (WEXITSTATUS(status) == 0)
+ /* update to get the changes */
+ screen_lyrics_reload();
+ else if (WEXITSTATUS(status) == 127)
+ screen_status_message(_("Can't start editor"));
+ else
+ screen_status_printf(_("Editor exited unexpectedly (%d)"),
+ WEXITSTATUS(status));
+ } else if (WIFSIGNALED(status)) {
+ screen_status_printf(_("Editor exited unexpectedly (signal %d)"),
+ WTERMSIG(status));
+ }
+}
+
static bool
lyrics_cmd(struct mpdclient *c, command_t cmd)
{
case CMD_LYRICS_UPDATE:
if (c->song != NULL) {
screen_lyrics_load(c->song);
- screen_text_repaint(&text);
+ screen_text_paint(&text);
}
return true;
+ case CMD_EDIT:
+ lyrics_edit();
+ 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);
- }
+ screen_lyrics_reload();
return true;
#ifdef ENABLE_SONG_SCREEN