![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_file.c b/src/screen_file.c
index 3aaade12a03896d727d92e34cbc8062c40dc7f6f..67dc3e081182da8addac2436b3b77b54103b1e8b 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
*/
#include "screen_file.h"
+#include "screen_browser.h"
#include "screen_interface.h"
+#include "screen_message.h"
+#include "screen_queue.h"
+#include "screen.h"
#include "config.h"
#include "i18n.h"
-#include "options.h"
#include "charset.h"
#include "mpdclient.h"
#include "filelist.h"
-#include "command.h"
#include "screen_utils.h"
-#include "screen_browser.h"
-#include "screen_play.h"
#include "screen_client.h"
#include <mpd/client.h>
wrefresh(browser.lw->w);
}
+static void
+screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
+{
+ struct mpd_connection *connection;
+
+ connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ return;
+
+ mpd_send_list_meta(connection, current_path);
+ filelist_recv(filelist, connection);
+
+ if (mpd_response_finish(connection))
+ filelist_sort_dir_play(filelist, compare_filelist_entry_path);
+ else
+ mpdclient_handle_error(c);
+}
+
static void
screen_file_reload(struct mpdclient *c)
{
if (browser.filelist != NULL)
filelist_free(browser.filelist);
- browser.filelist = mpdclient_filelist_get(c, current_path);
- if (browser.filelist == NULL)
- browser.filelist = filelist_new();
-
+ browser.filelist = filelist_new();
if (*current_path != 0)
/* add a dummy entry for ./.. */
- filelist_prepend(browser.filelist, NULL);
+ filelist_append(browser.filelist, NULL);
+
+ screen_file_load_list(c, browser.filelist);
+
+ list_window_set_length(browser.lw,
+ filelist_length(browser.filelist));
}
/**
screen_file_reload(c);
#ifndef NCMPC_MINI
- sync_highlights(c, browser.filelist);
+ screen_browser_sync_highlights(browser.filelist, &c->playlist);
#endif
list_window_reset(browser.lw);
if (success && idx >= 0) {
/* set the cursor on the previous working directory */
- list_window_set_selected(browser.lw, idx);
- list_window_center(browser.lw,
- filelist_length(browser.filelist), idx);
+ list_window_set_cursor(browser.lw, idx);
+ list_window_center(browser.lw, idx);
}
return success;
return change_to_entry(c, entry);
}
-static int
+static void
handle_save(struct mpdclient *c)
{
- struct filelist_entry *entry;
+ struct list_window_range range;
const char *defaultname = NULL;
char *defaultname_utf8 = NULL;
- int ret;
- unsigned selected;
- if (browser.lw->selected >= filelist_length(browser.filelist))
- return -1;
+ list_window_get_range(browser.lw, &range);
+ if (range.start == range.end)
+ return;
- for(selected = browser.lw->selected_start; selected <= browser.lw->selected_end; ++selected)
- {
- entry = filelist_get(browser.filelist, selected);
+ for (unsigned i = range.start; i < range.end; ++i) {
+ struct filelist_entry *entry =
+ filelist_get(browser.filelist, i);
if( entry && entry->entity ) {
struct mpd_entity *entity = entry->entity;
if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST) {
if(defaultname)
defaultname_utf8 = utf8_to_locale(defaultname);
- ret = playlist_save(c, NULL, defaultname_utf8);
+ playlist_save(c, NULL, defaultname_utf8);
g_free(defaultname_utf8);
-
- return ret;
}
-static int
+static void
handle_delete(struct mpdclient *c)
{
- struct filelist_entry *entry;
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ struct list_window_range range;
struct mpd_entity *entity;
const struct mpd_playlist *playlist;
char *str, *buf;
int key;
- unsigned selected;
- for(selected = browser.lw->selected_start; selected <= browser.lw->selected_end; ++selected)
- {
- if (selected >= filelist_length(browser.filelist))
- return -1;
+ if (connection == NULL)
+ return;
- entry = filelist_get(browser.filelist, selected);
+ list_window_get_range(browser.lw, &range);
+ for (unsigned i = range.start; i < range.end; ++i) {
+ struct filelist_entry *entry =
+ filelist_get(browser.filelist, i);
if( entry==NULL || entry->entity==NULL )
continue;
if( key != YES[0] ) {
/* translators: a dialog was aborted by the user */
screen_status_printf(_("Aborted"));
- return 0;
+ return;
}
- if (mpdclient_cmd_delete_playlist(c, mpd_playlist_get_path(playlist)))
- continue;
+ if (!mpd_run_rm(connection, mpd_playlist_get_path(playlist))) {
+ mpdclient_handle_error(c);
+ break;
+ }
+
+ c->events |= MPD_IDLE_STORED_PLAYLIST;
/* translators: MPD deleted the playlist, as requested by the
user */
screen_status_printf(_("Playlist deleted"));
}
- return 0;
}
static void
static void
screen_file_resize(int cols, int rows)
{
- browser.lw->cols = cols;
- browser.lw->rows = rows;
+ list_window_resize(browser.lw, cols, rows);
}
static void
static void
screen_file_paint(void)
{
- list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
+ screen_browser_paint(&browser);
}
static void
if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST)) {
/* the db has changed -> update the filelist */
screen_file_reload(c);
- list_window_check_selected(browser.lw,
- filelist_length(browser.filelist));
}
#ifndef NCMPC_MINI
if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST |
MPD_IDLE_PLAYLIST))
- sync_highlights(c, browser.filelist);
+ screen_browser_sync_highlights(browser.filelist, &c->playlist);
#endif
if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST
segmentation fault in the current implementation */
return false;
- case CMD_DELETE:
- handle_delete(c);
- screen_file_repaint();
- break;
- case CMD_SAVE_PLAYLIST:
- handle_save(c);
- break;
case CMD_SCREEN_UPDATE:
screen_file_reload(c);
#ifndef NCMPC_MINI
- sync_highlights(c, browser.filelist);
+ screen_browser_sync_highlights(browser.filelist, &c->playlist);
#endif
- list_window_check_selected(browser.lw,
- filelist_length(browser.filelist));
screen_file_repaint();
return false;
- case CMD_DB_UPDATE:
- if (c->status == NULL)
- return true;
-
- screen_database_update(c, current_path);
- return true;
-
default:
break;
}
return true;
}
+ if (!mpdclient_is_connected(c))
+ return false;
+
+ switch(cmd) {
+ case CMD_DELETE:
+ handle_delete(c);
+ screen_file_repaint();
+ break;
+
+ case CMD_SAVE_PLAYLIST:
+ handle_save(c);
+ break;
+
+ case CMD_DB_UPDATE:
+ screen_database_update(c, current_path);
+ return true;
+
+ default:
+ break;
+ }
+
return false;
}
if (i < 0)
i = 0;
- list_window_set_selected(browser.lw, i);
+ list_window_set_cursor(browser.lw, i);
/* finally, switch to the file screen */
screen_switch(&screen_browse, c);