screen_file: always set new list_window length

[ncmpc.git] / src / screen_file.c

diff --git a/src/screen_file.c b/src/screen_file.c
index b4dc24d6d1a23a01231614fbc2c0e867221372bb..1387cee519fc066f0bc96bf0b02d8627de5d187c 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
@@ -21,6 +21,7 @@
 #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"
@@ -28,7 +29,6 @@
 #include "mpdclient.h"
 #include "filelist.h"
 #include "screen_utils.h"
-#include "screen_play.h"
 #include "screen_client.h"
 
 #include <mpd/client.h>
@@ -51,19 +51,40 @@ screen_file_repaint(void)
        wrefresh(browser.lw->w);
 }
 
+static void
+screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
+{
+       struct mpd_connection *connection;
+
+       if (!mpdclient_is_connected(c))
+               return;
+
+       connection = mpdclient_get_connection(c);
+
+       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));
 }
 
 /**
@@ -113,9 +134,8 @@ change_to_parent(struct mpdclient *c)
 
        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;
@@ -152,18 +172,18 @@ screen_file_handle_enter(struct mpdclient *c)
 static int
 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))
+       list_window_get_range(browser.lw, &range);
+       if (range.start == range.end)
                return -1;
 
-       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) {
@@ -185,19 +205,17 @@ handle_save(struct mpdclient *c)
 static int
 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;
 
-               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;
 
@@ -224,8 +242,12 @@ handle_delete(struct mpdclient *c)
                        return 0;
                }
 
-               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 */
@@ -245,8 +267,7 @@ screen_file_init(WINDOW *w, int cols, int rows)
 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
@@ -292,7 +313,7 @@ screen_file_get_title(char *str, size_t size)
 static void
 screen_file_paint(void)
 {
-       list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
+       screen_browser_paint(&browser);
 }
 
 static void
@@ -301,8 +322,6 @@ screen_file_update(struct mpdclient *c)
        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
@@ -346,30 +365,14 @@ screen_file_cmd(struct mpdclient *c, command_t cmd)
                   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
                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;
        }
@@ -380,6 +383,27 @@ screen_file_cmd(struct mpdclient *c, command_t cmd)
                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;
 }
 
@@ -429,7 +453,7 @@ screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song)
        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);