X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_file.c;h=b23a1c84a1363126d3a55aeb2d119997407500da;hb=48538b851eee960b84f066188512e358b6c01181;hp=5a37c0c6a1b84b51a2275926974d66550cd9bb08;hpb=61b1bbfadfb80ad2162370d438e10bdd18c2e991;p=ncmpc.git diff --git a/src/screen_file.c b/src/screen_file.c index 5a37c0c..b23a1c8 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -1,26 +1,27 @@ /* ncmpc (Ncurses MPD Client) - * (c) 2004-2009 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 * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + */ #include "screen_file.h" #include "screen_browser.h" #include "screen_interface.h" -#include "screen_message.h" +#include "screen_status.h" +#include "save_playlist.h" #include "screen.h" #include "config.h" #include "i18n.h" @@ -28,8 +29,8 @@ #include "mpdclient.h" #include "filelist.h" #include "screen_utils.h" -#include "screen_play.h" #include "screen_client.h" +#include "options.h" #include @@ -42,20 +43,24 @@ static struct screen_browser browser; static char *current_path; static void -screen_file_paint(void); - -static void -screen_file_repaint(void) +screen_file_load_list(struct mpdclient *c, struct filelist *filelist) { - screen_file_paint(); - wrefresh(browser.lw->w); + 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 (mpdclient_finish_command(c)) + filelist_sort_dir_play(filelist, compare_filelist_entry_path); } static void screen_file_reload(struct mpdclient *c) { - struct mpd_connection *connection; - if (browser.filelist != NULL) filelist_free(browser.filelist); @@ -64,19 +69,10 @@ screen_file_reload(struct mpdclient *c) /* add a dummy entry for ./.. */ filelist_append(browser.filelist, NULL); - if (!mpdclient_is_connected(c)) - return; + screen_file_load_list(c, browser.filelist); - connection = mpdclient_get_connection(c); - - mpd_send_list_meta(connection, current_path); - filelist_recv(browser.filelist, connection); - - if (mpd_response_finish(connection)) - filelist_sort_dir_play(browser.filelist, - compare_filelist_entry_path); - else - mpdclient_handle_error(c); + list_window_set_length(browser.lw, + filelist_length(browser.filelist)); } /** @@ -90,9 +86,7 @@ change_directory(struct mpdclient *c, const char *new_path) screen_file_reload(c); -#ifndef NCMPC_MINI screen_browser_sync_highlights(browser.filelist, &c->playlist); -#endif list_window_reset(browser.lw); @@ -106,20 +100,16 @@ static bool change_to_parent(struct mpdclient *c) { char *parent = g_path_get_dirname(current_path); - char *old_path; - int idx; - bool success; - if (strcmp(parent, ".") == 0) parent[0] = '\0'; - old_path = current_path; + char *old_path = current_path; current_path = NULL; - success = change_directory(c, parent); + bool success = change_directory(c, parent); g_free(parent); - idx = success + int idx = success ? filelist_find_directory(browser.filelist, old_path) : -1; g_free(old_path); @@ -127,8 +117,7 @@ change_to_parent(struct mpdclient *c) if (success && idx >= 0) { /* set the cursor on the previous working directory */ list_window_set_cursor(browser.lw, idx); - list_window_center(browser.lw, - filelist_length(browser.filelist), idx); + list_window_center(browser.lw, idx); } return success; @@ -162,21 +151,19 @@ screen_file_handle_enter(struct mpdclient *c) 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) { @@ -187,35 +174,30 @@ handle_save(struct mpdclient *c) } } + char *defaultname_utf8 = NULL; 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 mpd_connection *connection = mpdclient_get_connection(c); - struct filelist_entry *entry; - 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); + + if (connection == NULL) + return; + + struct list_window_range range; + 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; - entity = entry->entity; + struct mpd_entity *entity = entry->entity; if (mpd_entity_get_type(entity) != MPD_ENTITY_TYPE_PLAYLIST) { /* translators: the "delete" command is only possible @@ -226,16 +208,17 @@ handle_delete(struct mpdclient *c) continue; } - playlist = mpd_entity_get_playlist(entity); - str = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist))); - buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO); + const struct mpd_playlist *playlist = mpd_entity_get_playlist(entity); + char *str = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist))); + char *buf = g_strdup_printf(_("Delete playlist %s?"), str); g_free(str); - key = tolower(screen_getch(buf)); + bool delete = screen_get_yesno(buf, false); g_free(buf); - if( key != YES[0] ) { + + if (!delete) { /* translators: a dialog was aborted by the user */ screen_status_printf(_("Aborted")); - return 0; + return; } if (!mpd_run_rm(connection, mpd_playlist_get_path(playlist))) { @@ -249,22 +232,21 @@ handle_delete(struct mpdclient *c) user */ screen_status_printf(_("Playlist deleted")); } - return 0; } static void -screen_file_init(WINDOW *w, int cols, int rows) +screen_file_init(WINDOW *w, unsigned cols, unsigned rows) { current_path = g_strdup(""); browser.lw = list_window_init(w, cols, rows); + browser.song_format = options.list_format; } static void -screen_file_resize(int cols, int rows) +screen_file_resize(unsigned cols, unsigned rows) { - browser.lw->cols = cols; - browser.lw->rows = rows; + list_window_resize(browser.lw, cols, rows); } static void @@ -281,13 +263,13 @@ static void screen_file_open(struct mpdclient *c) { screen_file_reload(c); + screen_browser_sync_highlights(browser.filelist, &c->playlist); } static const char * screen_file_get_title(char *str, size_t size) { const char *path = NULL, *prev = NULL, *slash = current_path; - char *path_locale; /* determine the last 2 parts of the path */ while ((slash = strchr(slash, '/')) != NULL) { @@ -299,7 +281,7 @@ screen_file_get_title(char *str, size_t size) /* fall back to full path */ path = current_path; - path_locale = utf8_to_locale(path); + char *path_locale = utf8_to_locale(path); g_snprintf(str, size, "%s: %s", /* translators: caption of the browser screen */ _("Browse"), path_locale); @@ -310,7 +292,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 @@ -319,22 +301,16 @@ 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 - if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST | - MPD_IDLE_PLAYLIST)) - screen_browser_sync_highlights(browser.filelist, &c->playlist); -#endif - if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST #ifndef NCMPC_MINI - | MPD_IDLE_PLAYLIST + | MPD_IDLE_QUEUE #endif - )) - screen_file_repaint(); + )) { + screen_browser_sync_highlights(browser.filelist, &c->playlist); + screen_file_paint(); + } } static bool @@ -343,7 +319,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) switch(cmd) { case CMD_PLAY: if (screen_file_handle_enter(c)) { - screen_file_repaint(); + screen_file_paint(); return true; } @@ -351,11 +327,11 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) case CMD_GO_ROOT_DIRECTORY: change_directory(c, ""); - screen_file_repaint(); + screen_file_paint(); return true; case CMD_GO_PARENT_DIRECTORY: change_to_parent(c); - screen_file_repaint(); + screen_file_paint(); return true; case CMD_LOCATE: @@ -366,12 +342,8 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) 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(); + screen_file_paint(); return false; default: @@ -380,7 +352,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) if (browser_cmd(&browser, c, cmd)) { if (screen_is_visible(&screen_browse)) - screen_file_repaint(); + screen_file_paint(); return true; } @@ -390,7 +362,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) switch(cmd) { case CMD_DELETE: handle_delete(c); - screen_file_repaint(); + screen_file_paint(); break; case CMD_SAVE_PLAYLIST: @@ -424,8 +396,6 @@ screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song) { const char *uri, *slash, *parent; char *allocated = NULL; - bool ret; - int i; assert(song != NULL); @@ -443,14 +413,14 @@ screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song) else parent = ""; - ret = change_directory(c, parent); + bool ret = change_directory(c, parent); g_free(allocated); if (!ret) return false; /* select the specified song */ - i = filelist_find_song(browser.filelist, song); + int i = filelist_find_song(browser.filelist, song); if (i < 0) i = 0;