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

Allow moving multiple items in the Current tab

This commit is contained in:
Přemysl Eric Janouch 2018-10-29 14:45:25 +01:00
parent 2cd100af7a
commit cbdec0552d
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nncmpp.c
View File

@ -2219,32 +2219,48 @@ mpd_on_move_response (const struct mpd_response *response,
print_error ("%s: %s", "command failed", response->message_text); print_error ("%s: %s", "command failed", response->message_text);
} }
static void
current_tab_move (int from, int to)
{
compact_map_t map;
const char *id;
if (!(map = item_list_get (&g.playlist, from))
|| !(id = compact_map_find (map, "id")))
return;
char *target_str = xstrdup_printf ("%d", to);
mpd_client_send_command (&g.client, "moveid", id, target_str, NULL);
free (target_str);
}
static bool static bool
current_tab_move_selection (int diff) current_tab_move_selection (int diff)
{ {
static bool already_moving; static bool already_moving;
if (already_moving) if (already_moving || diff == 0)
return true; return true;
// TODO: handle multiselect properly
struct tab *self = &g_current_tab;
struct mpd_client *c = &g.client; struct mpd_client *c = &g.client;
compact_map_t map = item_list_get (&g.playlist, self->item_selected); if (c->state != MPD_CONNECTED)
const char *id;
if (!map || !(id = compact_map_find (map, "id")))
return false; return false;
int target = self->item_selected + diff; struct tab *self = &g_current_tab;
if (c->state != MPD_CONNECTED || target < 0) struct tab_range range = tab_selection_range (self);
if (range.from + diff < 0
|| range.upto + diff >= (int) self->item_count)
return false; return false;
char *target_str = xstrdup_printf ("%d", target); mpd_client_list_begin (c);
mpd_client_send_command (c, "moveid", id, target_str, NULL); if (diff < 0)
free (target_str); for (int i = range.from; i <= range.upto; i++)
current_tab_move (i, i + diff);
else
for (int i = range.upto; i >= range.from; i--)
current_tab_move (i, i + diff);
mpd_client_list_end (c);
mpd_client_add_task (c, mpd_on_move_response, &already_moving); mpd_client_add_task (c, mpd_on_move_response, &already_moving);
mpd_client_idle (c, 0); mpd_client_idle (c, 0);
return already_moving = true; return already_moving = true;
} }