![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_file.c b/src/screen_file.c
index 18abcecac11fac45e8529e9e0f2f25638228fe64..4eb8943d1810effaa6cb1ef1c33610acb631e2ce 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 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_status.h"
+#include "screen_queue.h"
+#include "screen.h"
#include "config.h"
#include "i18n.h"
-#include "options.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 "screen_client.h"
+
+#include <mpd/client.h>
#include <ctype.h>
#include <stdlib.h>
static char *current_path;
static void
-browse_paint(void);
+screen_file_paint(void);
static void
-file_repaint(void)
+screen_file_repaint(void)
{
- browse_paint();
+ screen_file_paint();
wrefresh(browser.lw->w);
}
static void
-file_repaint_if_active(void)
+screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
{
- if (screen_is_visible(&screen_browse))
- file_repaint();
-}
+ struct mpd_connection *connection;
-static void
-file_reload(struct mpdclient *c)
-{
- if (browser.filelist != NULL)
- filelist_free(browser.filelist);
+ connection = mpdclient_get_connection(c);
+ if (connection == NULL)
+ return;
- browser.filelist = mpdclient_filelist_get(c, current_path);
+ 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 db has changed -> update the filelist */
static void
-file_changed_callback(mpdclient_t *c, G_GNUC_UNUSED int event,
- G_GNUC_UNUSED gpointer data)
+screen_file_reload(struct mpdclient *c)
{
- file_reload(c);
-
-#ifndef NCMPC_MINI
- sync_highlights(c, browser.filelist);
-#endif
- list_window_check_selected(browser.lw, filelist_length(browser.filelist));
+ if (browser.filelist != NULL)
+ filelist_free(browser.filelist);
- file_repaint_if_active();
-}
+ browser.filelist = filelist_new();
+ if (*current_path != 0)
+ /* add a dummy entry for ./.. */
+ filelist_append(browser.filelist, NULL);
-#ifndef NCMPC_MINI
-/* the playlist has been updated -> fix highlights */
-static void
-playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
-{
- browser_playlist_changed(&browser, c, event, data);
+ screen_file_load_list(c, browser.filelist);
- file_repaint_if_active();
+ list_window_set_length(browser.lw,
+ filelist_length(browser.filelist));
}
-#endif
/**
* Change to the specified absolute directory.
*/
static bool
-file_change_directory(mpdclient_t *c, const char *new_path)
+change_directory(struct mpdclient *c, const char *new_path)
{
g_free(current_path);
current_path = g_strdup(new_path);
- file_reload(c);
+ screen_file_reload(c);
-#ifndef NCMPC_MINI
- sync_highlights(c, browser.filelist);
-#endif
+ screen_browser_sync_highlights(browser.filelist, &c->playlist);
list_window_reset(browser.lw);
* Change to the parent directory of the current directory.
*/
static bool
-file_change_to_parent(mpdclient_t *c)
+change_to_parent(struct mpdclient *c)
{
char *parent = g_path_get_dirname(current_path);
char *old_path;
old_path = current_path;
current_path = NULL;
- success = file_change_directory(c, parent);
+ success = change_directory(c, parent);
g_free(parent);
idx = success
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;
}
/**
- * Change to the directory referred by the specified filelist_entry_t
+ * Change to the directory referred by the specified #filelist_entry
* object.
*/
static bool
-file_change_to_entry(mpdclient_t *c, const filelist_entry_t *entry)
+change_to_entry(struct mpdclient *c, const struct filelist_entry *entry)
{
assert(entry != NULL);
if (entry->entity == NULL)
- return file_change_to_parent(c);
- else if (entry->entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY)
- return file_change_directory(c, entry->entity->info.directory->path);
+ 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
-file_handle_enter(struct mpdclient *c)
+screen_file_handle_enter(struct mpdclient *c)
{
const struct filelist_entry *entry = browser_get_selected_entry(&browser);
if (entry == NULL)
return false;
- return file_change_to_entry(c, entry);
+ return change_to_entry(c, entry);
}
-static int
-handle_save(mpdclient_t *c)
+static void
+handle_save(struct mpdclient *c)
{
- filelist_entry_t *entry;
- char *defaultname = NULL;
- int ret;
- unsigned selected;
+ struct list_window_range range;
+ const char *defaultname = NULL;
+ char *defaultname_utf8 = NULL;
- 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 ) {
- mpd_InfoEntity *entity = entry->entity;
- if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
- mpd_PlaylistFile *plf = entity->info.playlistFile;
- defaultname = plf->path;
+ 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(defaultname)
- defaultname = utf8_to_locale(defaultname);
- ret = playlist_save(c, NULL, defaultname);
- g_free(defaultname);
-
- return ret;
+ defaultname_utf8 = utf8_to_locale(defaultname);
+ playlist_save(c, NULL, defaultname_utf8);
+ g_free(defaultname_utf8);
}
-static int
-handle_delete(mpdclient_t *c)
+static void
+handle_delete(struct mpdclient *c)
{
- filelist_entry_t *entry;
- mpd_InfoEntity *entity;
- mpd_PlaylistFile *plf;
+ 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;
entity = entry->entity;
- if( entity->type!=MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
+ 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 */
continue;
}
- plf = entity->info.playlistFile;
- str = utf8_to_locale(g_basename(plf->path));
+ 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);
g_free(str);
- key = tolower(screen_getch(screen.status_window.w, buf));
+ key = tolower(screen_getch(buf));
g_free(buf);
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, plf->path) )
- 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
-browse_init(WINDOW *w, int cols, int rows)
+screen_file_init(WINDOW *w, int cols, int rows)
{
current_path = g_strdup("");
}
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)
filelist_free(browser.filelist);
}
static void
-browse_open(G_GNUC_UNUSED mpdclient_t *c)
+screen_file_open(struct mpdclient *c)
{
- if (browser.filelist == NULL) {
- browser.filelist = mpdclient_filelist_get(c, "");
-#ifndef NCMPC_MINI
- mpdclient_install_playlist_callback(c, playlist_changed_callback);
-#endif
- 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)
{
const char *path = NULL, *prev = NULL, *slash = current_path;
char *path_locale;
}
static void
-browse_paint(void)
+screen_file_paint(void)
{
- list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
+ screen_browser_paint(&browser);
+}
+
+static void
+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);
+ }
+
+ 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_repaint();
+ }
}
static bool
-browse_cmd(mpdclient_t *c, command_t cmd)
+screen_file_cmd(struct mpdclient *c, command_t cmd)
{
switch(cmd) {
case CMD_PLAY:
- if (file_handle_enter(c)) {
- file_repaint();
+ if (screen_file_handle_enter(c)) {
+ screen_file_repaint();
return true;
}
break;
case CMD_GO_ROOT_DIRECTORY:
- file_change_directory(c, "");
- file_repaint();
+ change_directory(c, "");
+ screen_file_repaint();
return true;
case CMD_GO_PARENT_DIRECTORY:
- file_change_to_parent(c);
- file_repaint();
+ change_to_parent(c);
+ screen_file_repaint();
return true;
case CMD_LOCATE:
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_repaint();
+ return false;
+
+ default:
+ break;
+ }
+
+ if (browser_cmd(&browser, c, cmd)) {
+ if (screen_is_visible(&screen_browse))
+ screen_file_repaint();
+ return true;
+ }
+
+ if (!mpdclient_is_connected(c))
+ return false;
+
+ switch(cmd) {
case CMD_DELETE:
handle_delete(c);
- file_repaint();
+ screen_file_repaint();
break;
+
case CMD_SAVE_PLAYLIST:
handle_save(c);
break;
- case CMD_SCREEN_UPDATE:
- file_reload(c);
-#ifndef NCMPC_MINI
- sync_highlights(c, browser.filelist);
-#endif
- list_window_check_selected(browser.lw,
- filelist_length(browser.filelist));
- file_repaint();
- return false;
case CMD_DB_UPDATE:
- if (c->status == NULL)
- return true;
-
- if (!c->status->updatingDb) {
- if (mpdclient_cmd_db_update(c, current_path) == 0) {
- if (strcmp(current_path, "") != 0) {
- char *path_locale =
- utf8_to_locale(current_path);
- screen_status_printf(_("Database update of %s started"),
- path_locale);
- g_free(path_locale);
- } else
- screen_status_printf(_("Database update started"));
- }
- } else
- screen_status_printf(_("Database update running..."));
+ screen_database_update(c, current_path);
return true;
default:
break;
}
- if (browser_cmd(&browser, c, cmd)) {
- if (screen_is_visible(&screen_browse))
- file_repaint();
- return true;
- }
-
return false;
}
const struct screen_functions screen_browse = {
- .init = browse_init,
- .exit = browse_exit,
- .open = browse_open,
- .resize = browse_resize,
- .paint = browse_paint,
- .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 *slash, *parent;
+ const char *uri, *slash, *parent;
char *allocated = NULL;
bool ret;
int i;
assert(song != NULL);
- assert(song->file != NULL);
- if (strstr(song->file, "//") != 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(song->file, '/');
+ slash = strrchr(uri, '/');
if (slash != NULL)
- parent = allocated = g_strndup(song->file, slash - song->file);
+ parent = allocated = g_strndup(uri, slash - uri);
else
parent = "";
- ret = file_change_directory(c, parent);
+ ret = change_directory(c, parent);
g_free(allocated);
if (!ret)
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);