diff --git a/src/screen_file.c b/src/screen_file.c
index f9325c092631ac3ffec83ee4b167eb0525ed2d1d..7fe55876c321b1d8795eb65f062c20f428df6f8f 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+
#include "config.h"
#include "i18n.h"
#include "options.h"
#include "charset.h"
#include "mpdclient.h"
+#include "filelist.h"
#include "command.h"
#include "screen.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>
#include <glib.h>
static struct screen_browser browser;
+static char *current_path;
static void
browse_paint(void);
}
static void
-file_repaint_if_active(void)
+file_reload(struct mpdclient *c)
{
- if (screen_is_visible(&screen_browse))
- file_repaint();
+ if (browser.filelist != NULL)
+ filelist_free(browser.filelist);
+
+ browser.filelist = mpdclient_filelist_get(c, current_path);
+ if (browser.filelist == NULL)
+ browser.filelist = filelist_new();
+
+ if (*current_path != 0)
+ /* add a dummy entry for ./.. */
+ filelist_prepend(browser.filelist, NULL);
}
-/* the db have changed -> update the filelist */
-static void
-file_changed_callback(mpdclient_t *c, G_GNUC_UNUSED int event,
- G_GNUC_UNUSED gpointer data)
+/**
+ * Change to the specified absolute directory.
+ */
+static bool
+file_change_directory(struct mpdclient *c, const char *new_path)
{
- browser.filelist = mpdclient_filelist_update(c, browser.filelist);
+ g_free(current_path);
+ current_path = g_strdup(new_path);
+
+ file_reload(c);
+
#ifndef NCMPC_MINI
sync_highlights(c, browser.filelist);
#endif
- list_window_check_selected(browser.lw, filelist_length(browser.filelist));
- file_repaint_if_active();
+ list_window_reset(browser.lw);
+
+ return browser.filelist != NULL;
}
-#ifndef NCMPC_MINI
-/* the playlist have been updated -> fix highlights */
-static void
-playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
+/**
+ * Change to the parent directory of the current directory.
+ */
+static bool
+file_change_to_parent(struct mpdclient *c)
{
- browser_playlist_changed(&browser, c, event, data);
+ 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;
+ current_path = NULL;
+
+ success = file_change_directory(c, parent);
+ g_free(parent);
+
+ 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_selected(browser.lw, idx);
+ list_window_center(browser.lw,
+ filelist_length(browser.filelist), idx);
+ }
- file_repaint_if_active();
+ return success;
+}
+
+/**
+ * Change to the directory referred by the specified #filelist_entry
+ * object.
+ */
+static bool
+file_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 (mpd_entity_get_type(entry->entity) == MPD_ENTITY_TYPE_DIRECTORY)
+ return file_change_directory(c, mpd_directory_get_path(mpd_entity_get_directory(entry->entity)));
+ else
+ return false;
+}
+
+static bool
+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);
}
-#endif
static int
-handle_save(mpdclient_t *c)
+handle_save(struct mpdclient *c)
{
- filelist_entry_t *entry;
- char *defaultname = NULL;
+ struct filelist_entry *entry;
+ const char *defaultname = NULL;
+ char *defaultname_utf8 = NULL;
int ret;
unsigned selected;
{
entry = filelist_get(browser.filelist, 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;
+ 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);
}
}
}
- defaultname = utf8_to_locale(defaultname);
- ret = playlist_save(c, NULL, defaultname);
- g_free(defaultname);
+ if(defaultname)
+ defaultname_utf8 = utf8_to_locale(defaultname);
+ ret = playlist_save(c, NULL, defaultname_utf8);
+ g_free(defaultname_utf8);
return ret;
}
static int
-handle_delete(mpdclient_t *c)
+handle_delete(struct mpdclient *c)
{
- filelist_entry_t *entry;
- mpd_InfoEntity *entity;
- mpd_PlaylistFile *plf;
+ struct filelist_entry *entry;
+ struct mpd_entity *entity;
+ const struct mpd_playlist *playlist;
char *str, *buf;
int key;
unsigned selected;
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 */
return 0;
}
- if( mpdclient_cmd_delete_playlist(c, plf->path) )
+ if (mpdclient_cmd_delete_playlist(c, mpd_playlist_get_path(playlist)))
continue;
/* translators: MPD deleted the playlist, as requested by the
static void
browse_init(WINDOW *w, int cols, int rows)
{
+ current_path = g_strdup("");
+
browser.lw = list_window_init(w, cols, rows);
}
if (browser.filelist)
filelist_free(browser.filelist);
list_window_free(browser.lw);
+
+ g_free(current_path);
}
static void
-browse_open(G_GNUC_UNUSED mpdclient_t *c)
+browse_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);
- }
+ file_reload(c);
}
static const char *
browse_title(char *str, size_t size)
{
- const char *path = NULL, *prev = NULL, *slash = browser.filelist->path;
+ const char *path = NULL, *prev = NULL, *slash = current_path;
char *path_locale;
/* determine the last 2 parts of the path */
if (path == NULL)
/* fall back to full path */
- path = browser.filelist->path;
+ path = current_path;
path_locale = utf8_to_locale(path);
g_snprintf(str, size, "%s: %s",
list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
}
+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 */
+ 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);
+#endif
+
+ if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST
+#ifndef NCMPC_MINI
+ | MPD_IDLE_PLAYLIST
+#endif
+ ))
+ file_repaint();
+}
+
static bool
-browse_cmd(mpdclient_t *c, command_t cmd)
+browse_cmd(struct mpdclient *c, command_t cmd)
{
switch(cmd) {
+ case CMD_PLAY:
+ if (file_handle_enter(c)) {
+ file_repaint();
+ return true;
+ }
+
+ break;
+
case CMD_GO_ROOT_DIRECTORY:
- browser_change_directory(&browser, c, NULL, "");
+ file_change_directory(c, "");
file_repaint();
return true;
case CMD_GO_PARENT_DIRECTORY:
- browser_change_directory(&browser, c, NULL, "..");
+ file_change_to_parent(c);
file_repaint();
return true;
handle_save(c);
break;
case CMD_SCREEN_UPDATE:
- browser.filelist = mpdclient_filelist_update(c, browser.filelist);
+ file_reload(c);
#ifndef NCMPC_MINI
sync_highlights(c, browser.filelist);
#endif
if (c->status == NULL)
return true;
- if (!c->status->updatingDb) {
- if (mpdclient_cmd_db_update(c, browser.filelist->path) == 0) {
- if (strcmp(browser.filelist->path, "")) {
- char *path_locale =
- utf8_to_locale(browser.filelist->path);
- screen_status_printf(_("Database update of %s started"),
- path_locale);
- g_free(path_locale);
- } 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..."));
+ screen_database_update(c, current_path);
return true;
default:
.open = browse_open,
.resize = browse_resize,
.paint = browse_paint,
+ .update = screen_file_update,
.cmd = browse_cmd,
.get_title = browse_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 = browser_change_directory(&browser, c, NULL, parent);
+ ret = file_change_directory(c, parent);
g_free(allocated);
if (!ret)
return false;