![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_file.c b/src/screen_file.c
index ea20f950695677780bfd1c6dc8f95e2e80e40803..5399c85d3bfe5c7fed1aea468321e2b8a23e813e 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
-/*
- * $Id$
- *
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
+/* ncmpc (Ncurses MPD Client)
+ * (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
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
+ * 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_status.h"
+#include "screen_queue.h"
+#include "screen.h"
#include "config.h"
-#include "ncmpc.h"
-#include "options.h"
-#include "support.h"
+#include "i18n.h"
+#include "charset.h"
#include "mpdclient.h"
-#include "command.h"
-#include "screen.h"
+#include "filelist.h"
#include "screen_utils.h"
-#include "screen_browser.h"
-#include "screen_play.h"
-#include "gcc.h"
+#include "screen_client.h"
+#include "options.h"
+
+#include <mpd/client.h>
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <ncurses.h>
static struct screen_browser browser;
+static char *current_path;
-/* the db have changed -> update the filelist */
static void
-file_changed_callback(mpdclient_t *c, mpd_unused int event,
- mpd_unused gpointer data)
+screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
{
- D("screen_file.c> filelist_callback() [%d]\n", event);
- browser.filelist = mpdclient_filelist_update(c, browser.filelist);
- sync_highlights(c, browser.filelist);
- list_window_check_selected(browser.lw, browser.filelist->length);
+ 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);
}
-/* the playlist have been updated -> fix highlights */
static void
-playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
+screen_file_reload(struct mpdclient *c)
{
- browser_playlist_changed(&browser, c, event, data);
+ if (browser.filelist != NULL)
+ filelist_free(browser.filelist);
+
+ browser.filelist = filelist_new();
+ if (*current_path != 0)
+ /* add a dummy entry for ./.. */
+ filelist_append(browser.filelist, NULL);
+
+ screen_file_load_list(c, browser.filelist);
+
+ list_window_set_length(browser.lw,
+ filelist_length(browser.filelist));
}
-static int
-handle_save(screen_t *screen, mpdclient_t *c)
+/**
+ * Change to the specified absolute directory.
+ */
+static bool
+change_directory(struct mpdclient *c, const char *new_path)
{
- filelist_entry_t *entry;
- char *defaultname = NULL;
-
- entry = g_list_nth_data(browser.filelist->list, browser.lw->selected);
- if( entry && entry->entity ) {
- mpd_InfoEntity *entity = entry->entity;
- if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
- mpd_PlaylistFile *plf = entity->info.playlistFile;
- defaultname = plf->path;
- }
- }
+ g_free(current_path);
+ current_path = g_strdup(new_path);
+
+ screen_file_reload(c);
+
+ screen_browser_sync_highlights(browser.filelist, &c->playlist);
- return playlist_save(screen, c, NULL, defaultname);
+ list_window_reset(browser.lw);
+
+ return browser.filelist != NULL;
}
-static int
-handle_delete(screen_t *screen, mpdclient_t *c)
+/**
+ * Change to the parent directory of the current directory.
+ */
+static bool
+change_to_parent(struct mpdclient *c)
{
- filelist_entry_t *entry;
- mpd_InfoEntity *entity;
- mpd_PlaylistFile *plf;
- char *str, *buf;
- int key;
-
- entry = g_list_nth_data(browser.filelist->list,browser. lw->selected);
- if( entry==NULL || entry->entity==NULL )
- return -1;
-
- entity = entry->entity;
-
- if( entity->type!=MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
- screen_status_printf(_("You can only delete playlists!"));
- screen_bell();
- return -1;
+ char *parent = g_path_get_dirname(current_path);
+ if (strcmp(parent, ".") == 0)
+ parent[0] = '\0';
+
+ char *old_path = current_path;
+ current_path = NULL;
+
+ bool success = change_directory(c, parent);
+ g_free(parent);
+
+ int idx = success
+ ? filelist_find_directory(browser.filelist, old_path)
+ : -1;
+ g_free(old_path);
+
+ if (success && idx >= 0) {
+ /* set the cursor on the previous working directory */
+ list_window_set_cursor(browser.lw, idx);
+ list_window_center(browser.lw, idx);
}
- plf = entity->info.playlistFile;
- str = utf8_to_locale(basename(plf->path));
- buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO);
- g_free(str);
- key = tolower(screen_getch(screen->status_window.w, buf));
- g_free(buf);
- if( key==KEY_RESIZE )
- screen_resize();
- if( key != YES[0] ) {
- screen_status_printf(_("Aborted!"));
- return 0;
+ return success;
+}
+
+/**
+ * Change to the directory referred by the specified #filelist_entry
+ * object.
+ */
+static bool
+change_to_entry(struct mpdclient *c, const struct filelist_entry *entry)
+{
+ assert(entry != NULL);
+
+ if (entry->entity == NULL)
+ return change_to_parent(c);
+ else if (mpd_entity_get_type(entry->entity) == MPD_ENTITY_TYPE_DIRECTORY)
+ return change_directory(c, mpd_directory_get_path(mpd_entity_get_directory(entry->entity)));
+ else
+ return false;
+}
+
+static bool
+screen_file_handle_enter(struct mpdclient *c)
+{
+ const struct filelist_entry *entry = browser_get_selected_entry(&browser);
+
+ if (entry == NULL)
+ return false;
+
+ return change_to_entry(c, entry);
+}
+
+static void
+handle_save(struct mpdclient *c)
+{
+ struct list_window_range range;
+ const char *defaultname = NULL;
+
+ list_window_get_range(browser.lw, &range);
+ if (range.start == range.end)
+ return;
+
+ 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) {
+ const struct mpd_playlist *playlist =
+ mpd_entity_get_playlist(entity);
+ defaultname = mpd_playlist_get_path(playlist);
+ }
+ }
}
- if( mpdclient_cmd_delete_playlist_utf8(c, plf->path) )
- return -1;
+ char *defaultname_utf8 = NULL;
+ if(defaultname)
+ defaultname_utf8 = utf8_to_locale(defaultname);
+ playlist_save(c, NULL, defaultname_utf8);
+ g_free(defaultname_utf8);
+}
+
+static void
+handle_delete(struct mpdclient *c)
+{
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+
+ if (connection == NULL)
+ return;
- screen_status_printf(_("Playlist deleted!"));
- return 0;
+ 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;
+
+ struct mpd_entity *entity = entry->entity;
+
+ if (mpd_entity_get_type(entity) != MPD_ENTITY_TYPE_PLAYLIST) {
+ /* translators: the "delete" command is only possible
+ for playlists; the user attempted to delete a song
+ or a directory or something else */
+ screen_status_printf(_("Deleting this item is not possible"));
+ screen_bell();
+ continue;
+ }
+
+ 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 [%s/%s] ? "), str, YES, NO);
+ g_free(str);
+ bool delete = screen_get_yesno(buf, false);
+ g_free(buf);
+
+ if (!delete) {
+ /* translators: a dialog was aborted by the user */
+ screen_status_printf(_("Aborted"));
+ return;
+ }
+
+ 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"));
+ }
}
static void
-browse_init(WINDOW *w, int cols, int rows)
+screen_file_init(WINDOW *w, int cols, int rows)
{
+ current_path = g_strdup("");
+
browser.lw = list_window_init(w, cols, rows);
- browser.lw_state = list_window_init_state();
+ browser.song_format = options.list_format;
}
static void
-browse_resize(int cols, int rows)
+screen_file_resize(int cols, int rows)
{
- browser.lw->cols = cols;
- browser.lw->rows = rows;
+ list_window_resize(browser.lw, cols, rows);
}
static void
-browse_exit(void)
+screen_file_exit(void)
{
if (browser.filelist)
- mpdclient_filelist_free(browser.filelist);
+ filelist_free(browser.filelist);
list_window_free(browser.lw);
- list_window_free_state(browser.lw_state);
+
+ g_free(current_path);
}
static void
-browse_open(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
+screen_file_open(struct mpdclient *c)
{
- if (browser.filelist == NULL) {
- browser.filelist = mpdclient_filelist_get(c, "");
- mpdclient_install_playlist_callback(c, playlist_changed_callback);
- mpdclient_install_browse_callback(c, file_changed_callback);
- }
+ screen_file_reload(c);
+ screen_browser_sync_highlights(browser.filelist, &c->playlist);
}
static const char *
-browse_title(char *str, size_t size)
+screen_file_get_title(char *str, size_t size)
{
- char *pathcopy;
- char *parentdir;
+ const char *path = NULL, *prev = NULL, *slash = current_path;
- pathcopy = strdup(browser.filelist->path);
- parentdir = dirname(pathcopy);
- parentdir = basename(parentdir);
-
- if( parentdir[0] == '.' && strlen(parentdir) == 1 ) {
- parentdir = NULL;
+ /* determine the last 2 parts of the path */
+ while ((slash = strchr(slash, '/')) != NULL) {
+ path = prev;
+ prev = ++slash;
}
- g_snprintf(str, size, _("Browse: %s%s%s"),
- parentdir ? parentdir : "",
- parentdir ? "/" : "",
- basename(browser.filelist->path));
- free(pathcopy);
+ if (path == NULL)
+ /* fall back to full path */
+ path = current_path;
+
+ char *path_locale = utf8_to_locale(path);
+ g_snprintf(str, size, "%s: %s",
+ /* translators: caption of the browser screen */
+ _("Browse"), path_locale);
+ g_free(path_locale);
return str;
}
static void
-browse_paint(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c)
+screen_file_paint(void)
{
- browser.lw->clear = 1;
-
- list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
- wnoutrefresh(browser.lw->w);
+ screen_browser_paint(&browser);
}
static void
-browse_update(screen_t *screen, mpdclient_t *c)
+screen_file_update(struct mpdclient *c)
{
- if (browser.filelist->updated) {
- browse_paint(screen, c);
- browser.filelist->updated = FALSE;
- return;
+ if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST)) {
+ /* the db has changed -> update the filelist */
+ screen_file_reload(c);
}
- list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
- wnoutrefresh(browser.lw->w);
+ if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST
+#ifndef NCMPC_MINI
+ | MPD_IDLE_QUEUE
+#endif
+ )) {
+ screen_browser_sync_highlights(browser.filelist, &c->playlist);
+ screen_file_paint();
+ }
}
-static int
-browse_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
+static bool
+screen_file_cmd(struct mpdclient *c, command_t cmd)
{
switch(cmd) {
case CMD_PLAY:
- browser_handle_enter(&browser, c);
- return 1;
- case CMD_GO_ROOT_DIRECTORY:
- return browser_change_directory(&browser, c, NULL, "");
+ if (screen_file_handle_enter(c)) {
+ screen_file_paint();
+ return true;
+ }
+
break;
+
+ case CMD_GO_ROOT_DIRECTORY:
+ change_directory(c, "");
+ screen_file_paint();
+ return true;
case CMD_GO_PARENT_DIRECTORY:
- return browser_change_directory(&browser, c, NULL, "..");
- break;
- case CMD_SELECT:
- if (browser_handle_select(&browser, c) == 0) {
- /* continue and select next item... */
- cmd = CMD_LIST_NEXT;
- }
+ change_to_parent(c);
+ screen_file_paint();
+ return true;
+
+ case CMD_LOCATE:
+ /* don't let browser_cmd() evaluate the locate command
+ - it's a no-op, and by the way, leads to a
+ segmentation fault in the current implementation */
+ return false;
+
+ case CMD_SCREEN_UPDATE:
+ screen_file_reload(c);
+ screen_browser_sync_highlights(browser.filelist, &c->playlist);
+ screen_file_paint();
+ return false;
+
+ default:
break;
+ }
+
+ if (browser_cmd(&browser, c, cmd)) {
+ if (screen_is_visible(&screen_browse))
+ screen_file_paint();
+ return true;
+ }
+
+ if (!mpdclient_is_connected(c))
+ return false;
+
+ switch(cmd) {
case CMD_DELETE:
- handle_delete(screen, c);
+ handle_delete(c);
+ screen_file_paint();
break;
+
case CMD_SAVE_PLAYLIST:
- handle_save(screen, c);
+ handle_save(c);
break;
- case CMD_SCREEN_UPDATE:
- screen->painted = 0;
- browser.lw->clear = 1;
- browser.lw->repaint = 1;
- browser.filelist = mpdclient_filelist_update(c, browser.filelist);
- list_window_check_selected(browser.lw,
- browser.filelist->length);
- screen_status_printf(_("Screen updated!"));
- return 1;
+
case CMD_DB_UPDATE:
- if (c->status == NULL)
- return 1;
-
- if (!c->status->updatingDb) {
- if (mpdclient_cmd_db_update_utf8(c, browser.filelist->path) == 0) {
- if (strcmp(browser.filelist->path, ""))
- screen_status_printf(_("Database update of %s started!"),
- browser.filelist->path);
- else
- screen_status_printf(_("Database update started!"));
-
- /* set updatingDb to make shure the browse callback gets called
- * even if the updated has finished before status is updated */
- c->status->updatingDb = 1;
- }
- } else
- screen_status_printf(_("Database update running..."));
- return 1;
- case CMD_LIST_FIND:
- case CMD_LIST_RFIND:
- case CMD_LIST_FIND_NEXT:
- case CMD_LIST_RFIND_NEXT:
- return screen_find(screen,
- browser.lw, browser.filelist->length,
- cmd, browser_lw_callback,
- browser.filelist);
- case CMD_MOUSE_EVENT:
- return browser_handle_mouse_event(&browser, c);
+ screen_database_update(c, current_path);
+ return true;
+
default:
break;
}
- return list_window_cmd(browser.lw, browser.filelist->length, cmd);
+ return false;
}
const struct screen_functions screen_browse = {
- .init = browse_init,
- .exit = browse_exit,
- .open = browse_open,
- .resize = browse_resize,
- .paint = browse_paint,
- .update = browse_update,
- .cmd = browse_cmd,
- .get_title = browse_title,
+ .init = screen_file_init,
+ .exit = screen_file_exit,
+ .open = screen_file_open,
+ .resize = screen_file_resize,
+ .paint = screen_file_paint,
+ .update = screen_file_update,
+ .cmd = screen_file_cmd,
+ .get_title = screen_file_get_title,
};
+bool
+screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song)
+{
+ const char *uri, *slash, *parent;
+ char *allocated = NULL;
+
+ assert(song != NULL);
+
+ uri = mpd_song_get_uri(song);
+
+ if (strstr(uri, "//") != NULL)
+ /* an URL? */
+ return false;
+
+ /* determine the song's parent directory and go there */
+
+ slash = strrchr(uri, '/');
+ if (slash != NULL)
+ parent = allocated = g_strndup(uri, slash - uri);
+ else
+ parent = "";
+
+ bool ret = change_directory(c, parent);
+ g_free(allocated);
+ if (!ret)
+ return false;
+
+ /* select the specified song */
+
+ int i = filelist_find_song(browser.filelist, song);
+ if (i < 0)
+ i = 0;
+
+ list_window_set_cursor(browser.lw, i);
+
+ /* finally, switch to the file screen */
+ screen_switch(&screen_browse, c);
+ return true;
+}