screen_song: make Path a proper label

[ncmpc.git] / src / screen_artist.c

diff --git a/src/screen_artist.c b/src/screen_artist.c
index 450914b056e3c01f97addbb0f6a105f05355f8c3..0b460a186cde08b68434749061f53d9e8321b624 100644 (file)
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
@@ -1,5 +1,5 @@
 /* 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
@@ -41,6 +41,7 @@ static artist_mode_t mode = LIST_ARTISTS;
 static GPtrArray *artist_list, *album_list;
 static char *artist = NULL;
 static char *album  = NULL;
+static char ALL_TRACKS[] = "";
 
 static struct screen_browser browser;
 
@@ -161,8 +162,7 @@ load_artist_list(struct mpdclient *c)
                mpd_search_commit(connection);
                recv_tag_values(connection, MPD_TAG_ARTIST, artist_list);
 
-               if (!mpd_response_finish(connection))
-                       mpdclient_handle_error(c);
+               mpdclient_finish_command(c);
        }
 
        /* sort list */
@@ -192,8 +192,7 @@ load_album_list(struct mpdclient *c)
 
                recv_tag_values(connection, MPD_TAG_ALBUM, album_list);
 
-               if (!mpd_response_finish(connection))
-                       mpdclient_handle_error(c);
+               mpdclient_finish_command(c);
        }
 
        /* sort list */
@@ -220,15 +219,14 @@ load_song_list(struct mpdclient *c)
                mpd_search_db_songs(connection, true);
                mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
                                              MPD_TAG_ARTIST, artist);
-               if (album[0] != 0)
+               if (album != ALL_TRACKS)
                        mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
                                                      MPD_TAG_ALBUM, album);
                mpd_search_commit(connection);
 
                filelist_recv(browser.filelist, connection);
 
-               if (!mpd_response_finish(connection))
-                       mpdclient_handle_error(c);
+               mpdclient_finish_command(c);
        }
 
        /* fix highlights */
@@ -240,7 +238,8 @@ static void
 free_state(void)
 {
        g_free(artist);
-       g_free(album);
+       if (album != ALL_TRACKS)
+               g_free(album);
        artist = NULL;
        album = NULL;
 
@@ -407,14 +406,17 @@ screen_artist_get_title(char *str, size_t size)
 
        case LIST_SONGS:
                s1 = utf8_to_locale(artist);
-               if (*album != 0) {
-                       s2 = utf8_to_locale(album);
+
+               if (album == ALL_TRACKS)
                        g_snprintf(str, size,
-                                  _("Album: %s - %s"), s1, s2);
+                                  _("All tracks of artist: %s"), s1);
+               else if (*album != 0) {
+                       s2 = utf8_to_locale(album);
+                       g_snprintf(str, size, _("Album: %s - %s"), s1, s2);
                        g_free(s2);
                } else
                        g_snprintf(str, size,
-                                  _("All tracks of artist: %s"), s1);
+                                  _("Tracks of no album of artist: %s"), s1);
                g_free(s1);
                break;
        }
@@ -443,36 +445,41 @@ screen_artist_update(struct mpdclient *c)
                artist_repaint();
 }
 
+/* add_query - Add all songs satisfying specified criteria.
+   _artist is actually only used in the ALBUM case to distinguish albums with
+   the same name from different artists. */
 static void
-add_query(struct mpdclient *c, enum mpd_tag_type table, char *_filter)
+add_query(struct mpdclient *c, enum mpd_tag_type table, const char *_filter,
+         const char *_artist)
 {
        struct mpd_connection *connection = mpdclient_get_connection(c);
        char *str;
        struct filelist *addlist;
 
-       assert(filter != NULL);
+       assert(_filter != NULL);
 
        if (connection == NULL)
                return;
 
        str = utf8_to_locale(_filter);
        if (table == MPD_TAG_ALBUM)
-               screen_status_printf("Adding album %s...", str);
+               screen_status_printf(_("Adding album %s..."), str);
        else
-               screen_status_printf("Adding %s...", str);
+               screen_status_printf(_("Adding %s..."), str);
        g_free(str);
 
        mpd_search_db_songs(connection, true);
        mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
                                      table, _filter);
+       if (table == MPD_TAG_ALBUM)
+               mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
+                                             MPD_TAG_ARTIST, _artist);
        mpd_search_commit(connection);
 
        addlist = filelist_new_recv(connection);
 
-       if (mpd_response_finish(connection))
+       if (mpdclient_finish_command(c))
                mpdclient_filelist_add_all(c, addlist);
-       else
-               mpdclient_handle_error(c);
 
        filelist_free(addlist);
 }
@@ -512,6 +519,7 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd)
        struct list_window_range range;
        char *selected;
        char *old;
+       char *old_ptr;
        int idx;
 
        switch(cmd) {
@@ -546,7 +554,7 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd)
                                }
                        } else if (browser.lw->selected == album_list->len + 1) {
                                /* handle "show all" */
-                               open_song_list(c, g_strdup(artist), g_strdup("\0"));
+                               open_song_list(c, g_strdup(artist), ALL_TRACKS);
                                list_window_reset(browser.lw);
                        } else {
                                /* select album */
@@ -563,11 +571,12 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd)
                        if (browser.lw->selected == 0) {
                                /* handle ".." */
                                old = g_strdup(album);
+                               old_ptr = album;
 
                                open_album_list(c, g_strdup(artist));
                                list_window_reset(browser.lw);
                                /* restore previous list window state */
-                               idx = *old == 0
+                               idx = old_ptr == ALL_TRACKS
                                        ? (int)album_list->len
                                        : string_array_find(album_list, old);
                                g_free(old);
@@ -609,11 +618,12 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd)
 
                case LIST_SONGS:
                        old = g_strdup(album);
+                       old_ptr = album;
 
                        open_album_list(c, g_strdup(artist));
                        list_window_reset(browser.lw);
                        /* restore previous list window state */
-                       idx = *old == 0
+                       idx = old_ptr == ALL_TRACKS
                                ? (int)album_list->len
                                : string_array_find(album_list, old);
                        g_free(old);
@@ -656,7 +666,7 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd)
                        list_window_get_range(browser.lw, &range);
                        for (unsigned i = range.start; i < range.end; ++i) {
                                selected = g_ptr_array_index(artist_list, i);
-                               add_query(c, MPD_TAG_ARTIST, selected);
+                               add_query(c, MPD_TAG_ARTIST, selected, NULL);
                                cmd = CMD_LIST_NEXT; /* continue and select next item... */
                        }
                        break;
@@ -665,12 +675,12 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd)
                        list_window_get_range(browser.lw, &range);
                        for (unsigned i = range.start; i < range.end; ++i) {
                                if(i == album_list->len + 1)
-                                       add_query(c, MPD_TAG_ARTIST, artist);
+                                       add_query(c, MPD_TAG_ARTIST, artist, NULL);
                                else if (i > 0)
                                {
                                        selected = g_ptr_array_index(album_list,
                                                                     browser.lw->selected - 1);
-                                       add_query(c, MPD_TAG_ALBUM, selected);
+                                       add_query(c, MPD_TAG_ALBUM, selected, artist);
                                        cmd = CMD_LIST_NEXT; /* continue and select next item... */
                                }
                        }