Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix duplicating albums in media library

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-03-05 18:55:11 +01:00
parent 556d0f7a3c
commit 1b74324e68
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/media_library.cpp
View File

@@ -19,6 +19,7 @@
***************************************************************************/
#include <algorithm>
#include <map>
#include "charset.h"
#include "display.h"
@@ -150,7 +151,7 @@ void MediaLibrary::Update()
{
Albums->Reset();
TagList list;
std::vector< std::pair<std::string, SearchConstraints> > maplist;
std::map<std::string, SearchConstraints, CaseInsensitiveSorting> maplist;
locale_to_utf(Artists->Current());
if (Config.media_lib_primary_tag == MPD_TAG_ITEM_ARTIST)
Mpd->GetAlbums(Artists->Current(), list);
@@ -177,6 +178,8 @@ void MediaLibrary::Update()
for (TagList::iterator it = list.begin(); it != list.end(); it++)
{
if (it->empty())
continue;
SongList l;
Mpd->StartSearch(1);
Mpd->AddSearch(Config.media_lib_primary_tag, Artists->Current());
@@ -184,25 +187,21 @@ void MediaLibrary::Update()
Mpd->CommitSearch(l);
sort(l.begin(), l.end(), SortSongsByYear);
for (SongList::const_iterator j = l.begin(); j != l.end(); j++)
{
if (!(*j)->GetAlbum().empty() && (maplist.empty() || (*j)->GetYear() != maplist.back().second.Year || (*j)->GetAlbum() != maplist.back().second.Album))
{
utf_to_locale(*it);
(*j)->Localize();
maplist.push_back(make_pair((*j)->toString(Config.media_lib_album_format), SearchConstraints(*it, (*j)->GetYear())));
}
maplist[(*j)->toString(Config.media_lib_album_format)] = SearchConstraints(*it, (*j)->GetYear());
}
FreeSongList(l);
}
utf_to_locale(Artists->Current());
sort(maplist.begin(), maplist.end(), CaseInsensitiveSorting());
for (std::vector< std::pair<std::string, SearchConstraints> >::const_iterator it = maplist.begin(); it != maplist.end(); it++)
Albums->AddOption(*it);
for (std::map<std::string, SearchConstraints>::const_iterator it = maplist.begin(); it != maplist.end(); it++)
Albums->AddOption(make_pair(it->first, it->second));
Albums->Window::Clear();
Albums->Refresh();
}
if (!Artists->Empty() && myScreen->Cmp() == Albums && Albums->Empty())
if (!Artists->Empty() && w == Albums && Albums->Empty())
{
Albums->HighlightColor(Config.main_highlight_color);
Artists->HighlightColor(Config.active_column_color);

1
src/media_library.h
View File

@@ -28,6 +28,7 @@ class MediaLibrary : public Screen<Window>
{
struct SearchConstraints
{
SearchConstraints() { }
SearchConstraints(const std::string &album, const std::string &year) : Album(album), Year(year) { }
std::string Album;

9
src/tag_editor.cpp
View File

@@ -416,7 +416,7 @@ void TagEditor::Update()
TagList list;
if (Config.albums_in_tag_editor)
{
std::vector<string_pair> maplist;
std::map<string, string, CaseInsensitiveSorting> maplist;
*Albums << XY(0, 0) << "Fetching albums' list...";
Albums->Window::Refresh();
Mpd->GetAlbums("", list);
@@ -429,13 +429,12 @@ void TagEditor::Update()
if (!l.empty())
{
l[0]->Localize();
maplist.push_back(make_pair(l[0]->toString(Config.tag_editor_album_format), *it));
maplist[l[0]->toString(Config.tag_editor_album_format)] = *it;
}
FreeSongList(l);
}
sort(maplist.begin(), maplist.end(), CaseInsensitiveSorting());
for (std::vector<string_pair>::const_iterator it = maplist.begin(); it != maplist.end(); it++)
Albums->AddOption(*it);
for (std::map<string, string>::const_iterator it = maplist.begin(); it != maplist.end(); it++)
Albums->AddOption(make_pair(it->first, it->second));
}
else
{