p
/
nncmpp
1
1
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Add interface for database updates

This commit is contained in:
Přemysl Eric Janouch 2017-06-05 00:18:53 +02:00
parent 92f350ef04
commit 2223680504
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nncmpp.c
View File

@ -1275,7 +1275,9 @@ app_write_mpd_status (struct row_buffer *buf)
// TODO: "N hours N minutes" ("stats" -> "playtime" or count in code) // TODO: "N hours N minutes" ("stats" -> "playtime" or count in code)
char *stats; char *stats;
if (g.playlist.len == 1) if (str_map_find (map, "updating_db"))
stats = xstrdup ("Updating database...");
else if (g.playlist.len == 1)
stats = xstrdup_printf ("%zu song", g.playlist.len); stats = xstrdup_printf ("%zu song", g.playlist.len);
else else
stats = xstrdup_printf ("%zu songs", g.playlist.len); stats = xstrdup_printf ("%zu songs", g.playlist.len);
@ -1314,7 +1316,6 @@ app_draw_statusbar (void)
struct row_buffer buf; struct row_buffer buf;
row_buffer_init (&buf); row_buffer_init (&buf);
// TODO: task status such as "Updating database..."
if (g.message) if (g.message)
row_buffer_append (&buf, g.message, APP_ATTR (HIGHLIGHT)); row_buffer_append (&buf, g.message, APP_ATTR (HIGHLIGHT));
else if (g.client.state == MPD_CONNECTED) else if (g.client.state == MPD_CONNECTED)
@ -1459,6 +1460,7 @@ app_goto_tab (int tab_index)
\ \
XX( MPD_ADD, "Add song to playlist" ) \ XX( MPD_ADD, "Add song to playlist" ) \
XX( MPD_REPLACE, "Replace playlist with song" ) \ XX( MPD_REPLACE, "Replace playlist with song" ) \
XX( MPD_UPDATE_DB, "Update MPD database" ) \
\ \
XX( CHOOSE, "Choose item" ) \ XX( CHOOSE, "Choose item" ) \
XX( DELETE, "Delete item" ) \ XX( DELETE, "Delete item" ) \
@ -1569,6 +1571,12 @@ app_process_action (enum action action)
app_switch_tab (g.help_tab); app_switch_tab (g.help_tab);
break; break;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case ACTION_MPD_UPDATE_DB:
MPD_SIMPLE ("update");
break;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case ACTION_MPD_PREVIOUS: case ACTION_MPD_PREVIOUS:
@ -1791,6 +1799,7 @@ g_default_bindings[] =
{ "Backspace", ACTION_UP, {}}, { "Backspace", ACTION_UP, {}},
{ "a", ACTION_MPD_ADD, {}}, { "a", ACTION_MPD_ADD, {}},
{ "r", ACTION_MPD_REPLACE, {}}, { "r", ACTION_MPD_REPLACE, {}},
{ "u", ACTION_MPD_UPDATE_DB, {}},
{ "Left", ACTION_MPD_PREVIOUS, {}}, { "Left", ACTION_MPD_PREVIOUS, {}},
{ "Right", ACTION_MPD_NEXT, {}}, { "Right", ACTION_MPD_NEXT, {}},
@ -2827,7 +2836,7 @@ mpd_on_events (unsigned subsystems, void *user_data)
library_tab_reload (NULL); library_tab_reload (NULL);
if (subsystems & (MPD_SUBSYSTEM_PLAYER | MPD_SUBSYSTEM_OPTIONS if (subsystems & (MPD_SUBSYSTEM_PLAYER | MPD_SUBSYSTEM_OPTIONS
| MPD_SUBSYSTEM_PLAYLIST | MPD_SUBSYSTEM_MIXER)) | MPD_SUBSYSTEM_PLAYLIST | MPD_SUBSYSTEM_MIXER | MPD_SUBSYSTEM_UPDATE))
mpd_request_info (); mpd_request_info ();
else else
mpd_client_idle (c, 0); mpd_client_idle (c, 0);