![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_file.c b/src/screen_file.c
index 8b7577fdfde71c5a4cefe41b0a1dc4b0342edf10..5a81e8fb8c0eccaeaf79f83acfee22d2736da4a4 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
-/*
- * $Id$
- *
+/*
* (c) 2004 by Kalle Wallin <kaw@linux.se>
*
* This program is free software; you can redistribute it and/or modify
*
*/
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-#include <ncurses.h>
-
#include "config.h"
-#include "ncmpc.h"
-#include "support.h"
-#include "libmpdclient.h"
-#include "mpc.h"
+#include "i18n.h"
+#include "options.h"
+#include "charset.h"
+#include "mpdclient.h"
#include "command.h"
#include "screen.h"
#include "screen_utils.h"
+#include "screen_browser.h"
#include "screen_play.h"
-#include "screen_file.h"
+#include "gcc.h"
-#define BUFSIZE 1024
-#define TITLESIZE 256
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
-#define USE_OLD_LAYOUT
+static struct screen_browser browser;
-static list_window_t *lw;
-static mpd_client_t *mpc = NULL;
+static void
+browse_paint(void);
-static char *
-list_callback(int index, int *highlight, void *data)
+static void
+file_repaint(void)
{
- static char buf[BUFSIZE];
- mpd_client_t *c = (mpd_client_t *) data;
- filelist_entry_t *entry;
- mpd_InfoEntity *entity;
-
- *highlight = 0;
- if( (entry=(filelist_entry_t *) g_list_nth_data(c->filelist, index))==NULL )
- return NULL;
-
- entity = entry->entity;
- *highlight = entry->selected;
-
- if( entity == NULL )
- {
-#ifdef USE_OLD_LAYOUT
- return "[..]";
-#else
- return "d ..";
-#endif
- }
- if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY )
- {
- mpd_Directory *dir = entity->info.directory;
- char *dirname = utf8_to_locale(basename(dir->path));
-
-#ifdef USE_OLD_LAYOUT
- snprintf(buf, BUFSIZE, "[%s]", dirname);
-#else
- snprintf(buf, BUFSIZE, "d %s", dirname);
-#endif
- g_free(dirname);
- return buf;
- }
- else if( entity->type==MPD_INFO_ENTITY_TYPE_SONG )
- {
- mpd_Song *song = entity->info.song;
-
-#ifdef USE_OLD_LAYOUT
- return mpc_get_song_name(song);
-#else
- snprintf(buf, BUFSIZE, "m %s", mpc_get_song_name(song));
- return buf;
-#endif
-
- }
- else if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE )
- {
- mpd_PlaylistFile *plf = entity->info.playlistFile;
- char *filename = utf8_to_locale(basename(plf->path));
-
-#ifdef USE_OLD_LAYOUT
- snprintf(buf, BUFSIZE, "*%s*", filename);
-#else
- snprintf(buf, BUFSIZE, "p %s", filename);
-#endif
- g_free(filename);
- return buf;
- }
- return "Error: Unknow entry!";
+ browse_paint();
+ wrefresh(browser.lw->w);
}
-static int
-change_directory(screen_t *screen, mpd_client_t *c, filelist_entry_t *entry)
+static void
+file_repaint_if_active(void)
{
- mpd_InfoEntity *entity = entry->entity;
-
- if( entity==NULL )
- {
- char *parent = g_path_get_dirname(c->cwd);
-
- if( strcmp(parent,".") == 0 )
- {
- parent[0] = '\0';
- }
- if( c->cwd )
- g_free(c->cwd);
- c->cwd = parent;
- }
- else
- if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY)
- {
- mpd_Directory *dir = entity->info.directory;
- if( c->cwd )
- g_free(c->cwd);
- c->cwd = g_strdup(dir->path);
- }
- else
- return -1;
-
- mpc_update_filelist(c);
- list_window_reset(lw);
- return 0;
+ if (screen_is_visible(&screen_browse))
+ file_repaint();
}
-static int
-load_playlist(screen_t *screen, mpd_client_t *c, filelist_entry_t *entry)
+/* the db have changed -> update the filelist */
+static void
+file_changed_callback(mpdclient_t *c, mpd_unused int event,
+ mpd_unused gpointer data)
{
- mpd_InfoEntity *entity = entry->entity;
- mpd_PlaylistFile *plf = entity->info.playlistFile;
- char *filename = utf8_to_locale(basename(plf->path));
-
- mpd_sendLoadCommand(c->connection, plf->path);
- mpd_finishCommand(c->connection);
+ browser.filelist = mpdclient_filelist_update(c, browser.filelist);
+#ifndef NCMPC_MINI
+ sync_highlights(c, browser.filelist);
+#endif
+ list_window_check_selected(browser.lw, filelist_length(browser.filelist));
- screen_status_printf(_("Loading playlist %s..."), filename);
- g_free(filename);
- return 0;
+ file_repaint_if_active();
}
-static int
-handle_delete(screen_t *screen, mpd_client_t *c)
+#ifndef NCMPC_MINI
+/* the playlist have been updated -> fix highlights */
+static void
+playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
{
- filelist_entry_t *entry;
- mpd_InfoEntity *entity;
- mpd_PlaylistFile *plf;
- char *str, buf[BUFSIZE];
- int key;
-
- entry = ( filelist_entry_t *) g_list_nth_data(c->filelist, 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!"));
- beep();
- return -1;
- }
-
- plf = entity->info.playlistFile;
- str = utf8_to_locale(basename(plf->path));
- snprintf(buf, BUFSIZE, _("Delete playlist %s [y/n] ? "), str);
- g_free(str);
- key = tolower(screen_getch(screen->status_window.w, buf));
- if( key==KEY_RESIZE )
- screen_resize();
- if( key!='y' )
- {
- screen_status_printf(_("Aborted!"));
- return 0;
- }
-
- mpd_sendRmCommand(c->connection, plf->path);
- mpd_finishCommand(c->connection);
- if( mpc_error(c))
- {
- str = utf8_to_locale(mpc_error_str(c));
- screen_status_printf("Error: %s", str);
- g_free(str);
- beep();
- return -1;
- }
- screen_status_printf(_("Playlist deleted!"));
- mpc_update_filelist(c);
- list_window_check_selected(lw, c->filelist_length);
- return 0;
-}
-
+ browser_playlist_changed(&browser, c, event, data);
-static int
-handle_play_cmd(screen_t *screen, mpd_client_t *c)
-{
- filelist_entry_t *entry;
- mpd_InfoEntity *entity;
-
- entry = ( filelist_entry_t *) g_list_nth_data(c->filelist, lw->selected);
- if( entry==NULL )
- return -1;
-
- entity = entry->entity;
- if( entity==NULL || entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY )
- return change_directory(screen, c, entry);
- else if( entity->type==MPD_INFO_ENTITY_TYPE_PLAYLISTFILE )
- return load_playlist(screen, c, entry);
- return -1;
+ file_repaint_if_active();
}
+#endif
static int
-add_directory(mpd_client_t *c, char *dir)
+handle_save(mpdclient_t *c)
{
- mpd_InfoEntity *entity;
- GList *subdir_list = NULL;
- GList *list = NULL;
- char *dirname;
-
- dirname = utf8_to_locale(dir);
- screen_status_printf(_("Adding directory %s...\n"), dirname);
- doupdate();
- g_free(dirname);
- dirname = NULL;
-
- mpd_sendLsInfoCommand(c->connection, dir);
- mpd_sendCommandListBegin(c->connection);
- while( (entity=mpd_getNextInfoEntity(c->connection)) )
- {
- if( entity->type==MPD_INFO_ENTITY_TYPE_SONG )
- {
- mpd_Song *song = entity->info.song;
- mpd_sendAddCommand(c->connection, song->file);
- mpd_freeInfoEntity(entity);
- }
- else if( entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY )
- {
- subdir_list = g_list_append(subdir_list, (gpointer) entity);
+ filelist_entry_t *entry;
+ char *defaultname = NULL;
+
+ if (browser.lw->selected >= filelist_length(browser.filelist))
+ return -1;
+
+ entry = filelist_get(browser.filelist, 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;
+ }
}
- else
- mpd_freeInfoEntity(entity);
- }
- mpd_sendCommandListEnd(c->connection);
- mpd_finishCommand(c->connection);
-
- list = g_list_first(subdir_list);
- while( list!=NULL )
- {
- mpd_Directory *dir;
-
- entity = list->data;
- dir = entity->info.directory;
- add_directory(c, dir->path);
- mpd_freeInfoEntity(entity);
- list->data=NULL;
- list=list->next;
- }
- g_list_free(subdir_list);
- return 0;
+
+ return playlist_save(c, NULL, defaultname);
}
static int
-handle_select(screen_t *screen, mpd_client_t *c)
+handle_delete(mpdclient_t *c)
{
- filelist_entry_t *entry;
+ filelist_entry_t *entry;
+ mpd_InfoEntity *entity;
+ mpd_PlaylistFile *plf;
+ char *str, *buf;
+ int key;
- entry = ( filelist_entry_t *) g_list_nth_data(c->filelist, lw->selected);
- if( entry==NULL || entry->entity==NULL)
- return -1;
+ if (browser.lw->selected >= filelist_length(browser.filelist))
+ return -1;
- if( entry->entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY )
- {
- mpd_Directory *dir = entry->entity->info.directory;
- add_directory(c, dir->path);
- return 0;
- }
+ entry = filelist_get(browser.filelist, browser.lw->selected);
+ if( entry==NULL || entry->entity==NULL )
+ return -1;
- if( entry->entity->type!=MPD_INFO_ENTITY_TYPE_SONG )
- return -1;
+ entity = entry->entity;
- entry->selected = !entry->selected;
+ if( entity->type!=MPD_INFO_ENTITY_TYPE_PLAYLISTFILE ) {
+ screen_status_printf(_("You can only delete playlists!"));
+ screen_bell();
+ return -1;
+ }
- if( entry->selected )
- {
- if( entry->entity->type==MPD_INFO_ENTITY_TYPE_SONG )
- {
- mpd_Song *song = entry->entity->info.song;
+ plf = entity->info.playlistFile;
+ str = utf8_to_locale(g_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 != YES[0] ) {
+ screen_status_printf(_("Aborted!"));
+ return 0;
+ }
- playlist_add_song(c, song);
+ if( mpdclient_cmd_delete_playlist_utf8(c, plf->path) )
+ return -1;
- screen_status_printf(_("Adding \'%s\' to playlist\n"),
- mpc_get_song_name(song));
- }
- }
- else
- {
- /* remove song from playlist */
- if( entry->entity->type==MPD_INFO_ENTITY_TYPE_SONG )
- {
- mpd_Song *song = entry->entity->info.song;
-
- if( song )
- {
- int index = mpc_playlist_get_song_index(c, song->file);
-
- while( (index=mpc_playlist_get_song_index(c, song->file))>=0 )
- playlist_delete_song(c, index);
- }
- }
- }
- return 0;
+ screen_status_printf(_("Playlist deleted!"));
+ return 0;
}
static void
-file_init(WINDOW *w, int cols, int rows)
+browse_init(WINDOW *w, int cols, int rows)
{
- lw = list_window_init(w, cols, rows);
+ browser.lw = list_window_init(w, cols, rows);
}
static void
-file_resize(int cols, int rows)
+browse_resize(int cols, int rows)
{
- lw->cols = cols;
- lw->rows = rows;
+ browser.lw->cols = cols;
+ browser.lw->rows = rows;
}
static void
-file_exit(void)
+browse_exit(void)
{
- list_window_free(lw);
-}
-
-static void
-file_open(screen_t *screen, mpd_client_t *c)
-{
- if( c->filelist == NULL )
- {
- mpc_update_filelist(c);
- }
- mpc = c;
+ if (browser.filelist)
+ filelist_free(browser.filelist);
+ list_window_free(browser.lw);
}
static void
-file_close(void)
+browse_open(mpd_unused mpdclient_t *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);
+ }
}
-static char *
-file_title(char *str, size_t size)
-{
- char *tmp;
-
- tmp = utf8_to_locale(basename(mpc->cwd));
- snprintf(str, size, _("Browse: %s"), tmp);
- g_free(tmp);
-
- return str;
-}
-
-static void
-file_paint(screen_t *screen, mpd_client_t *c)
-{
- lw->clear = 1;
-
- list_window_paint(lw, list_callback, (void *) c);
- wnoutrefresh(lw->w);
-}
-
-static void
-file_update(screen_t *screen, mpd_client_t *c)
+static const char *
+browse_title(char *str, size_t size)
{
- if( c->filelist_updated )
- {
- file_paint(screen, c);
- c->filelist_updated = 0;
- return;
- }
- list_window_paint(lw, list_callback, (void *) c);
- wnoutrefresh(lw->w);
-}
+ char *dirname, *parentdir;
+ dirname = g_path_get_dirname(browser.filelist->path);
+ parentdir = g_path_get_basename(dirname);
-static int
-file_cmd(screen_t *screen, mpd_client_t *c, command_t cmd)
-{
- switch(cmd)
- {
- case CMD_PLAY:
- handle_play_cmd(screen, c);
- return 1;
- case CMD_SELECT:
- if( handle_select(screen, c) == 0 )
- {
- /* continue and select next item... */
- cmd = CMD_LIST_NEXT;
+ if( parentdir[0] == '.' && strlen(parentdir) == 1 ) {
+ parentdir = NULL;
}
- break;
- case CMD_DELETE:
- handle_delete(screen, c);
- break;
- case CMD_SCREEN_UPDATE:
- mpc_update_filelist(c);
- list_window_check_selected(lw, c->filelist_length);
- screen_status_printf(_("Screen updated!"));
- return 1;
- case CMD_LIST_FIND:
- case CMD_LIST_RFIND:
- case CMD_LIST_FIND_NEXT:
- case CMD_LIST_RFIND_NEXT:
- return screen_find(screen, c,
- lw, c->filelist_length,
- cmd, list_callback);
- default:
- break;
- }
- return list_window_cmd(lw, c->filelist_length, cmd);
-}
-
-list_window_t *
-get_filelist_window()
-{
- return lw;
+ g_snprintf(str, size, _("Browse: %s%s%s"),
+ parentdir ? parentdir : "",
+ parentdir ? "/" : "",
+ g_basename(browser.filelist->path));
+ free(dirname);
+ free(parentdir);
+ return str;
}
-
-void
-file_clear_highlights(mpd_client_t *c)
+static void
+browse_paint(void)
{
- GList *list = g_list_first(c->filelist);
-
- while( list )
- {
- filelist_entry_t *entry = list->data;
-
- entry->selected = 0;
- list = list->next;
- }
+ list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
}
-void
-file_set_highlight(mpd_client_t *c, mpd_Song *song, int highlight)
+static int
+browse_cmd(mpdclient_t *c, command_t cmd)
{
- GList *list = g_list_first(c->filelist);
-
- if( !song )
- return;
-
- while( list )
- {
- filelist_entry_t *entry = list->data;
- mpd_InfoEntity *entity = entry->entity;
-
- if( entity && entity->type==MPD_INFO_ENTITY_TYPE_SONG )
- {
- mpd_Song *song2 = entity->info.song;
+ switch(cmd) {
+ case CMD_GO_ROOT_DIRECTORY:
+ browser_change_directory(&browser, c, NULL, "");
+ file_repaint();
+ return 1;
+ case CMD_GO_PARENT_DIRECTORY:
+ browser_change_directory(&browser, c, NULL, "..");
+ file_repaint();
+ return 1;
+
+ case CMD_DELETE:
+ handle_delete(c);
+ file_repaint();
+ break;
+ case CMD_SAVE_PLAYLIST:
+ handle_save(c);
+ break;
+ case CMD_SCREEN_UPDATE:
+ browser.filelist = mpdclient_filelist_update(c, browser.filelist);
+#ifndef NCMPC_MINI
+ sync_highlights(c, browser.filelist);
+#endif
+ list_window_check_selected(browser.lw,
+ filelist_length(browser.filelist));
+ file_repaint();
+
+ screen_status_printf(_("Screen updated!"));
+ return 0;
+
+ 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;
+
+ default:
+ break;
+ }
- if( strcmp(song->file, song2->file) == 0 )
- {
- entry->selected = highlight;
- }
+ if (browser_cmd(&browser, c, cmd)) {
+ file_repaint();
+ return 1;
}
- list = list->next;
- }
-}
-screen_functions_t *
-get_screen_file(void)
-{
- static screen_functions_t functions;
-
- memset(&functions, 0, sizeof(screen_functions_t));
- functions.init = file_init;
- functions.exit = file_exit;
- functions.open = file_open;
- functions.close = file_close;
- functions.resize = file_resize;
- functions.paint = file_paint;
- functions.update = file_update;
- functions.cmd = file_cmd;
- functions.get_lw = get_filelist_window;
- functions.get_title = file_title;
-
- return &functions;
+ return 0;
}
+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,
+};